Corrections in the environment

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

diff --git a/CMakeCommon/FindPython.cmake b/CMakeCommon/FindPython.cmake
index 6af6239ebb9bbdd399238bcb06bc629f2b4e69a0..dc990bfb42a54bcfd4f0d2ebcb329461eba0450d 100644 (file)
--- a/CMakeCommon/FindPython.cmake
+++ b/CMakeCommon/FindPython.cmake
@@ -8,10 +8,14 @@ IF(WIN32)
 ElSE()
     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_FILE}" 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_DIR})