From: adam <adam>
Date: Thu, 14 Oct 2010 09:26:58 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: V5_1_5rc1~10
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=0e1d26a8ed13db3adf5485c9a97cd6d3e75e460a;p=modules%2Fkernel.git

*** empty log message ***
---

diff --git a/salome_adm/cmake_files/FindPYTHON.cmake b/salome_adm/cmake_files/FindPYTHON.cmake
index 9c4bfeb4e..dc643da1c 100644
--- a/salome_adm/cmake_files/FindPYTHON.cmake
+++ b/salome_adm/cmake_files/FindPYTHON.cmake
@@ -201,6 +201,7 @@ ENDIF(PYTHON_STATUS)
 
 IF(PYTHON_STATUS)
   SET(PYTHON_CPPFLAGS ${PYTHON_INCLUDES})
+  SET(PYLOGLEVEL WARNING)
 ELSE(PYTHON_STATUS)
   IF(PYTHON_IS_MANDATORY)
     MESSAGE(FATAL_ERROR "python not found ... mandatory ... abort")
diff --git a/salome_adm/cmake_files/am2cmake.py b/salome_adm/cmake_files/am2cmake.py
index 8adaf1525..28d1de121 100644
--- a/salome_adm/cmake_files/am2cmake.py
+++ b/salome_adm/cmake_files/am2cmake.py
@@ -1481,26 +1481,29 @@ class CMakeFile(object):
             resdir = self.hxxmodule
             pass
         d = {
-            "salomeadmux_DATA"            :  "salome_adm/unix",
-            "dist_salomeadmux_DATA"       :  "salome_adm/unix",
-            "dist_salome_cmake_DATA"      :  "salome_adm/cmake_files",
-            "dist_salomem4_DATA"          :  "salome_adm/unix/config_files",
-            "dist_salome4depr_DATA"       :  "salome_adm/unix/config_files/DEPRECATED",
-            "dist_admlocalm4_DATA"        :  "adm_local/unix/config_files",
-            "dist_admlocal_cmake_DATA"    :  "adm_local/cmake_files",
-            "salomeinclude_DATA"          :  "include/salome",
-            "salomeinclude_HEADERS"       :  "include/salome",
-            "dist_salomeres_DATA"         :  "share/salome/resources/%s"%(resdir),
-            "nodist_salomeres_DATA"       :  "share/salome/resources/%s"%(resdir),
-            "nodist_salomeres_SCRIPTS"    :  "share/salome/resources/%s"%(resdir),
-            "dist_salomescript_SCRIPTS"   :  "bin/salome",
-            "dist_salomescript_DATA"      :  "bin/salome",
-            "dist_salomescript_PYTHON"    :  "bin/salome",
-            "nodist_salomescript_DATA"    :  "bin/salome",
-            "salomepython_PYTHON"         :  "lib/python${PYTHON_VERSION}/site-packages/salome",
-            "nodist_salomepython_PYTHON"  :  "lib/python${PYTHON_VERSION}/site-packages/salome",
-            "dist_salomepython_DATA"      :  "lib/python${PYTHON_VERSION}/site-packages/salome",
-            "sharedpkgpython_PYTHON"      :  "lib/python${PYTHON_VERSION}/site-packages/salome/shared_modules",
+            "salomeadmux_DATA"                 :  "salome_adm/unix",
+            "dist_salomeadmux_DATA"            :  "salome_adm/unix",
+            "dist_salome_cmake_DATA"           :  "salome_adm/cmake_files",
+            "dist_salomem4_DATA"               :  "salome_adm/unix/config_files",
+            "dist_salome4depr_DATA"            :  "salome_adm/unix/config_files/DEPRECATED",
+            "dist_admlocalm4_DATA"             :  "adm_local/unix/config_files",
+            "dist_admlocal_cmake_DATA"         :  "adm_local/cmake_files",
+            "salomeinclude_DATA"               :  "include/salome",
+            "salomeinclude_HEADERS"            :  "include/salome",
+            "nodist_salomeinclude_HEADERS"     :  "include/salome",
+            "dist_salomeres_DATA"              :  "share/salome/resources/%s"%(resdir),
+            "nodist_salomeres_DATA"            :  "share/salome/resources/%s"%(resdir),
+            "nodist_salomeres_SCRIPTS"         :  "share/salome/resources/%s"%(resdir),
+            "dist_salomescript_SCRIPTS"        :  "bin/salome",
+            "dist_salomescript_DATA"           :  "bin/salome",
+            "dist_salomescript_PYTHON"         :  "bin/salome",
+            "nodist_salomescript_DATA"         :  "bin/salome",
+            "salomepython_PYTHON"              :  "lib/python${PYTHON_VERSION}/site-packages/salome",
+            "nodist_salomepython_PYTHON"       :  "lib/python${PYTHON_VERSION}/site-packages/salome",
+            "dist_salomepython_DATA"           :  "lib/python${PYTHON_VERSION}/site-packages/salome",
+            "sharedpkgpython_PYTHON"           :  "lib/python${PYTHON_VERSION}/site-packages/salome/shared_modules",
+            "salomepypkg_PYTHON"               :  "lib/python${PYTHON_VERSION}/site-packages/salome/salome",
+            "mypkgpython_PYTHON"               :  "lib/python${PYTHON_VERSION}/site-packages/salome/salome/kernel",
             }
         if self.module == "medfile":
             d = {