bugfix for libSketchSolver.so: paths for some CAS' toolkits defined explicitly

[modules/shaper.git] / CMakeCommon / FindPython.cmake

diff --git a/CMakeCommon/FindPython.cmake b/CMakeCommon/FindPython.cmake
index 543d830ada048fd32345d8d085271ded7ab764ca..dc990bfb42a54bcfd4f0d2ebcb329461eba0450d 100644 (file)
--- a/CMakeCommon/FindPython.cmake
+++ b/CMakeCommon/FindPython.cmake
@@ -1,14 +1,23 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8.11)
 
-IF(CMAKE_BUILD_TYPE STREQUAL "Debug")
-  SET(PYTHON_LIBRARY_DLL "python27_d.lib")
+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_DLL "python27.lib")
+    SET(PYTHON_LIBRARY_FILE "libpython2.7.so")
+ENDIF()
+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()
 
-FILE(TO_CMAKE_PATH "$ENV{PYTHON_LIB_DIR}/${PYTHON_LIBRARY_DLL}" PYTHON_LIBRARY)
-FILE(TO_CMAKE_PATH $ENV{PYTHON_INC_DIR} PYTHON_INCLUDE_DIR)
-
-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})