Merge branch 'master' of newgeom:newgeom.git into BR_PORTING_CENTOS_6_3

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

diff --git a/CMakeCommon/FindPython.cmake b/CMakeCommon/FindPython.cmake
index 364fc028b0920080d2500a38c506d25faa494d9c..0a63c5b9d367161861d0f0da85ae23e04ec53ed9 100644 (file)
--- a/CMakeCommon/FindPython.cmake
+++ b/CMakeCommon/FindPython.cmake
@@ -1,17 +1,18 @@
 
 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_LIB_DIR}/${PYTHON_LIBRARY_FILE}" PYTHON_LIBRARY)
 FILE(TO_CMAKE_PATH $ENV{PYTHON_INC_DIR} PYTHON_INCLUDE_DIR)
-
 FIND_PACKAGE(PythonLibs)
 
-INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_DIRS})
+INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_DIR})
+MESSAGE(STATUS "PYTHON_LIBRARIES: " ${PYTHON_LIBRARIES})
+MESSAGE(STATUS "PYTHON_INCLUDE_DIR: " ${PYTHON_INCLUDE_DIR})