Blob Blame History Raw
diff -ur player-release-3-1-0/client_libs/libplayerc/bindings/python/CMakeLists.txt player-release-3-1-0.find-python-version/client_libs/libplayerc/bindings/python/CMakeLists.txt
--- player-release-3-1-0/client_libs/libplayerc/bindings/python/CMakeLists.txt	2017-04-08 18:05:52.000000000 +0100
+++ player-release-3-1-0.find-python-version/client_libs/libplayerc/bindings/python/CMakeLists.txt	2018-10-07 13:43:24.568755916 +0100
@@ -1,9 +1,11 @@
 INCLUDE (FindPythonInterp)
+INCLUDE (FindPythonLibs)
 IF (PYTHONINTERP_FOUND)
     OPTION (BUILD_PYTHONC_BINDINGS "Build the Python bindings for the C client library" ON)
 
     IF (BUILD_PYTHONC_BINDINGS)
         FIND_PACKAGE (SWIG)
+        FIND_PACKAGE (PythonInterp)
         FIND_PACKAGE (PythonLibs)
         IF (SWIG_FOUND AND PYTHONLIBS_FOUND)
             MESSAGE (STATUS "Python bindings for C client library will be built")
@@ -49,11 +51,7 @@
             IF (PYTHON_OS_WIN)
                 GET_FILENAME_COMPONENT (playercpyInstallDir ${PYTHON_EXECUTABLE} PATH)
             ELSE (PYTHON_OS_WIN)
-                # Get the Python version
-                EXECUTE_PROCESS (COMMAND ${PYTHON_EXECUTABLE} -V
-                                 ERROR_VARIABLE pythonVersionString
-                                 ERROR_STRIP_TRAILING_WHITESPACE)
-                STRING (REGEX REPLACE "^Python ([0-9]+\\.[0-9]+).*" "\\1" pythonVersion ${pythonVersionString})
+                SET (pythonVersion "${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}")
                 SET (playercpyInstallDir ${PLAYER_LIBRARY_INSTALL_DIR}/python${pythonVersion}/site-packages)
             ENDIF (PYTHON_OS_WIN)
             SET (PYTHON_BINDINGS_INSTALL_DIR ${playercpyInstallDir} CACHE PATH "Python bindings installation directory under $prefix")
diff -ur player-release-3-1-0/client_libs/libplayerc++/bindings/python/CMakeLists.txt player-release-3-1-0.find-python-version/client_libs/libplayerc++/bindings/python/CMakeLists.txt
--- player-release-3-1-0/client_libs/libplayerc++/bindings/python/CMakeLists.txt	2017-04-08 18:05:52.000000000 +0100
+++ player-release-3-1-0.find-python-version/client_libs/libplayerc++/bindings/python/CMakeLists.txt	2018-10-07 13:28:54.311008792 +0100
@@ -1,4 +1,5 @@
 INCLUDE (FindPythonInterp)
+INCLUDE (FindPythonLibs)
 
 IF(BUILD_PLAYERCC)
     IF (PYTHONINTERP_FOUND)
@@ -6,6 +7,7 @@
 
         IF (BUILD_PYTHONCPP_BINDINGS)
             FIND_PACKAGE (SWIG)
+            FIND_PACKAGE (PythonInterp)
             FIND_PACKAGE (PythonLibs)
             IF (SWIG_FOUND AND PYTHONLIBS_FOUND)
                 MESSAGE (STATUS "Python bindings for C++ client library will be built")
@@ -29,11 +31,7 @@
                 IF (PYTHON_OS_WIN)
                     GET_FILENAME_COMPONENT (playercpyInstallDir ${PYTHON_EXECUTABLE} PATH)
                 ELSE (PYTHON_OS_WIN)
-                    # Get the Python version
-                    EXECUTE_PROCESS (COMMAND ${PYTHON_EXECUTABLE} -V
-                                    ERROR_VARIABLE pythonVersionString
-                                    ERROR_STRIP_TRAILING_WHITESPACE)
-                    STRING (REGEX REPLACE "^Python ([0-9]+\\.[0-9]+).*" "\\1" pythonVersion ${pythonVersionString})
+                    SET (pythonVersion "${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}")
                     SET (playercpppyInstallDir ${PLAYER_LIBRARY_INSTALL_DIR}/python${pythonVersion}/site-packages)
                 ENDIF (PYTHON_OS_WIN)
                 SET (PYTHON_BINDINGS_INSTALL_DIR ${playercpppyInstallDir} CACHE PATH "Python bindings installation directory under $prefix")