X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=CMakeCommon%2FFindPython.cmake;h=bee7f9fec9a4ced44771f86330ccc09f87eec9a1;hb=80bda53bbcc350bdb7b6b5f4c25ab8e817f565d7;hp=0a63c5b9d367161861d0f0da85ae23e04ec53ed9;hpb=a1d3e85f42aebdcf8b570ab99f5f4558612573e7;p=modules%2Fshaper.git

diff --git a/CMakeCommon/FindPython.cmake b/CMakeCommon/FindPython.cmake
index 0a63c5b9d..bee7f9fec 100644
--- a/CMakeCommon/FindPython.cmake
+++ b/CMakeCommon/FindPython.cmake
@@ -1,18 +1,57 @@
+# Copyright (C) 2014-2020  CEA/DEN, EDF R&D
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
+
+UNSET(PYTHON_INCLUDE_DIRS)
+UNSET(PYTHON_LIBRARIES)
 
 IF(WIN32)
     IF(CMAKE_BUILD_TYPE STREQUAL "Debug")
-      SET(PYTHON_LIBRARY_FILE "python27_d.lib")
+      SET(PYTHON_LIBRARY_FILE "python36_d.lib")
     ElSE()
-      SET(PYTHON_LIBRARY_FILE "python27.lib")
+      SET(PYTHON_LIBRARY_FILE "python36.lib")
     ENDIF()
 ElSE()
-    SET(PYTHON_LIBRARY_FILE "libpython2.7.so")
+    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()
+
+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()
 
-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)
+FIND_PACKAGE(PythonInterp REQUIRED)
+FIND_PACKAGE(PythonLibs REQUIRED)
 
-INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_DIR})
-MESSAGE(STATUS "PYTHON_LIBRARIES: " ${PYTHON_LIBRARIES})
-MESSAGE(STATUS "PYTHON_INCLUDE_DIR: " ${PYTHON_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_DIR})
\ No newline at end of file