X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=CMakeCommon%2FFindPython.cmake;h=c5352896e0d9e5e832066302ec65e80cb588b372;hb=68420e410a9846ec7dcb2f4645030455bc374288;hp=364fc028b0920080d2500a38c506d25faa494d9c;hpb=10c74b99318f5265c9a60a178932b03f69adfee5;p=modules%2Fshaper.git

diff --git a/CMakeCommon/FindPython.cmake b/CMakeCommon/FindPython.cmake
index 364fc028b..c5352896e 100644
--- a/CMakeCommon/FindPython.cmake
+++ b/CMakeCommon/FindPython.cmake
@@ -1,17 +1,26 @@
+## Copyright (C) 2014-20xx CEA/DEN, EDF R&D
+
 
 IF(WIN32)
     IF(CMAKE_BUILD_TYPE STREQUAL "Debug")
-      SET(PYTHON_LIBRARY_DLL "python27_d.lib")
+      SET(PYTHON_LIBRARY_FILE "python27_d.lib")
     ElSE()
-      SET(PYTHON_LIBRARY_DLL "python27.lib")
+      SET(PYTHON_LIBRARY_FILE "python27.lib")
     ENDIF()
 ElSE()
-    SET(PYTHON_LIBRARY_DLL "libpython27.so")
+    SET(PYTHON_LIBRARY_FILE "libpython2.7.so")
 ENDIF()
 
-FILE(TO_CMAKE_PATH "$ENV{PYTHON_LIB_DIR}/${PYTHON_LIBRARY_DLL}" PYTHON_LIBRARY)
-FILE(TO_CMAKE_PATH $ENV{PYTHON_INC_DIR} PYTHON_INCLUDE_DIR)
+IF(WIN32)
+  FILE(TO_CMAKE_PATH "$ENV{PYTHONHOME}/libs/${PYTHON_LIBRARY_FILE}" PYTHON_LIBRARY)
+ElSE()
+  FILE(TO_CMAKE_PATH "$ENV{PYTHONHOME}/lib/${PYTHON_LIBRARY_FILE}" PYTHON_LIBRARY)
+ENDIF()
 
-FIND_PACKAGE(PythonLibs)
+FILE(TO_CMAKE_PATH $ENV{PYTHON_INCLUDE} PYTHON_INCLUDE_DIR)
+FIND_PACKAGE(PythonLibs REQUIRED)
+FIND_PACKAGE(PythonInterp REQUIRED)
 
-INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_DIRS})
+INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_DIR})
+#MESSAGE(STATUS "PYTHON_LIBRARIES: " ${PYTHON_LIBRARIES})
+#MESSAGE(STATUS "PYTHON_INCLUDE_DIR: " ${PYTHON_INCLUDE_DIR})