X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=CMakeCommon%2FFindPython.cmake;h=d48364e6797550c9b3aa2e5c7f2ebb3d2fbf4376;hb=c12ee55abef606ed03fcc101d47b906bd5b52a5f;hp=42bfeeabfd853d0093a0d73fe77ff415bc258dd9;hpb=a793636ae5265326796c7b5a26a5000041567d43;p=modules%2Fshaper.git

diff --git a/CMakeCommon/FindPython.cmake b/CMakeCommon/FindPython.cmake
index 42bfeeabf..d48364e67 100644
--- a/CMakeCommon/FindPython.cmake
+++ b/CMakeCommon/FindPython.cmake
@@ -1,12 +1,29 @@
-IF(CMAKE_BUILD_TYPE STREQUAL "Debug")
-  SET(PYTHON_LIBRARY_DLL "python27_d.lib")
+## Copyright (C) 2014-20xx CEA/DEN, EDF R&D
+
+UNSET(PYTHON_INCLUDE_DIRS)
+UNSET(PYTHON_LIBRARIES)
+
+IF(WIN32)
+    IF(CMAKE_BUILD_TYPE STREQUAL "Debug")
+      SET(PYTHON_LIBRARY_FILE "python27_d.lib")
+    ElSE()
+      SET(PYTHON_LIBRARY_FILE "python27.lib")
+    ENDIF()
+ElSE()
+    SET(PYTHON_LIBRARY_FILE "libpython2.7.so")
+ENDIF()
+
+IF(WIN32)
+  FILE(TO_CMAKE_PATH "$ENV{PYTHONHOME}/libs/${PYTHON_LIBRARY_FILE}" PATH_PYTHON_LIBRARY)
 ElSE()
-  SET(PYTHON_LIBRARY_DLL "python27.lib")
+  FILE(TO_CMAKE_PATH "$ENV{PYTHONHOME}/lib/${PYTHON_LIBRARY_FILE}" PATH_PYTHON_LIBRARY)
 ENDIF()
+FILE(TO_CMAKE_PATH $ENV{PYTHON_INCLUDE} PATH_PYTHON_INCLUDE_DIR)
 
-FILE(TO_CMAKE_PATH "$ENV{PYTHON_LIB_DIR}/${PYTHON_LIBRARY_DLL}" PYTHON_LIBRARY)
-FILE(TO_CMAKE_PATH $ENV{PYTHON_INC_DIR} PYTHON_INCLUDE_DIR)
+SET(PYTHON_INCLUDE_DIR ${PATH_PYTHON_INCLUDE_DIR} CACHE PATH "path to where Python.h is found" FORCE)
+SET(PYTHON_LIBRARY ${PATH_PYTHON_LIBRARY} CACHE FILEPATH "path to the python library" FORCE)
 
-FIND_PACKAGE(PythonLibs)
+FIND_PACKAGE(PythonLibs REQUIRED)
+FIND_PACKAGE(PythonInterp REQUIRED)
 
-INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_DIRS})
+INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_DIR})