X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=CMakeCommon%2FFindPython.cmake;h=da2a36152e70def816363c3e38da7ed3481dc027;hb=63ad1862738f5cce24761fe82d8ac1f7c0fe3cb9;hp=543d830ada048fd32345d8d085271ded7ab764ca;hpb=499d70af8b5a0301b1d1260dc19455dc4fab7978;p=modules%2Fshaper.git

diff --git a/CMakeCommon/FindPython.cmake b/CMakeCommon/FindPython.cmake
index 543d830ad..da2a36152 100644
--- a/CMakeCommon/FindPython.cmake
+++ b/CMakeCommon/FindPython.cmake
@@ -1,14 +1,40 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8.11)
+## Copyright (C) 2014-20xx CEA/DEN, EDF R&D
 
-IF(CMAKE_BUILD_TYPE STREQUAL "Debug")
-  SET(PYTHON_LIBRARY_DLL "python27_d.lib")
+UNSET(PYTHON_INCLUDE_DIRS)
+UNSET(PYTHON_LIBRARIES)
+
+IF(WIN32)
+    IF(CMAKE_BUILD_TYPE STREQUAL "Debug")
+      SET(PYTHON_LIBRARY_FILE "python36_d.lib")
+    ElSE()
+      SET(PYTHON_LIBRARY_FILE "python36.lib")
+    ENDIF()
 ElSE()
-  SET(PYTHON_LIBRARY_DLL "python27.lib")
+    SET(PYTHON_LIBRARY_FILE "libpython3.6.so")
+ENDIF()
+
+IF(DEFINED ENV{PYTHONHOME})
+  IF(WIN32)
+    FILE(TO_CMAKE_PATH "$ENV{PYTHONHOME}/libs/${PYTHON_LIBRARY_FILE}" PATH_PYTHON_LIBRARY)
+  ElSE()
+    FILE(TO_CMAKE_PATH "$ENV{PYTHONHOME}/lib/${PYTHON_LIBRARY_FILE}" PATH_PYTHON_LIBRARY)
+  ENDIF()
+  SET(PYTHON_LIBRARY ${PATH_PYTHON_LIBRARY} CACHE FILEPATH "path to the python library" FORCE)
 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(DEFINED ENV{PYTHON_INCLUDE})
+  FILE(TO_CMAKE_PATH $ENV{PYTHON_INCLUDE} PATH_PYTHON_INCLUDE_DIR)
+  SET(PYTHON_INCLUDE_DIR ${PATH_PYTHON_INCLUDE_DIR} CACHE PATH "path to where Python.h is found" FORCE)
+ELSE()
+  IF(WIN32)
+    IF(DEFINED ENV{PYTHON_ROOT_DIR})
+     SET(PYTHON_ROOT_DIR $ENV{PYTHON_ROOT_DIR})
+     SET(PYTHON_INCLUDE_DIR ${PYTHON_ROOT_DIR} CACHE PATH "path to where Python.h is found" FORCE)
+    ENDIF()
+  ENDIF()
+ENDIF()
 
-FIND_PACKAGE(PythonLibs)
+FIND_PACKAGE(PythonInterp REQUIRED)
+FIND_PACKAGE(PythonLibs REQUIRED)
 
-INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_DIRS})
+INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_DIR})
\ No newline at end of file