[patch] replacement patch for cmake-2.8.4-FindPythonLibs.patch

cmake-2.8.8-FindPythonLibs.patch (text/plain), 1.40 KB, created by Rolf Eike Beer on 2012-04-23 16:40:30 UTC

diff --git a/Modules/FindPythonLibs.cmake b/Modules/FindPythonLibs.cmake
index 591b3e6..8fcf286 100644
--- a/Modules/FindPythonLibs.cmake
+++ b/Modules/FindPythonLibs.cmake
@@ -50,10 +50,14 @@ IF(PythonLibs_FIND_VERSION)
         UNSET(_PYTHON_FIND_MAJ_MIN)
         UNSET(_PYTHON_FIND_MAJ)
     ELSE(PythonLibs_FIND_VERSION MATCHES "^[0-9]+\\.[0-9]+(\\.[0-9]+.*)?$")
-        SET(_PYTHON_FIND_OTHER_VERSIONS ${_PYTHON${PythonLibs_FIND_VERSION}_VERSIONS})
+        EXECUTE_PROCESS(COMMAND python${PythonLibs_FIND_VERSION} -c "import sys; sys.stdout.write('.'.join([str(x) for x in sys.version_info[:2]]))"
+                        OUTPUT_VARIABLE _PYTHON_FIND_OTHER_VERSIONS)
+        SET(_PYTHON_FIND_OTHER_VERSIONS ${_PYTHON_FIND_OTHER_VERSIONS} ${_PYTHON${PythonLibs_FIND_VERSION}_VERSIONS})
     ENDIF(PythonLibs_FIND_VERSION MATCHES "^[0-9]+\\.[0-9]+(\\.[0-9]+.*)?$")
 ELSE(PythonLibs_FIND_VERSION)
-    SET(_PYTHON_FIND_OTHER_VERSIONS ${_PYTHON3_VERSIONS} ${_PYTHON2_VERSIONS} ${_PYTHON1_VERSIONS})
+    EXECUTE_PROCESS(COMMAND python -c "import sys; sys.stdout.write('.'.join([str(x) for x in sys.version_info[:2]]))"
+                    OUTPUT_VARIABLE _PYTHON_FIND_OTHER_VERSIONS)
+    SET(_PYTHON_FIND_OTHER_VERSIONS ${_PYTHON_FIND_OTHER_VERSIONS} ${_PYTHON3_VERSIONS} ${_PYTHON2_VERSIONS} ${_PYTHON1_VERSIONS})
 ENDIF(PythonLibs_FIND_VERSION)
 
 # Set up the versions we know about, in the order we will search. Always add