ngompa / rpms / cmake

Forked from rpms/cmake 4 years ago
Clone
949600
diff -rupN cmake/Modules/FindPythonLibs.cmake new/Modules/FindPythonLibs.cmake
949600
--- cmake/Modules/FindPythonLibs.cmake	2013-04-12 14:09:08.470669049 -0500
949600
+++ new/Modules/FindPythonLibs.cmake	2013-04-12 15:41:15.789496153 -0500
949600
@@ -69,10 +69,21 @@ endif()
949600
 
949600
 # Set up the versions we know about, in the order we will search. Always add
949600
 # the user supplied additional versions to the front.
949600
-set(_Python_VERSIONS
949600
-  ${Python_ADDITIONAL_VERSIONS}
949600
-  ${_PYTHON_FIND_OTHER_VERSIONS}
949600
-  )
949600
+# If FindPythonInterp has already found the major and minor version, 
949600
+# insert that version between the user supplied versions and the stock
949600
+# version list. 
949600
+if(DEFINED PYTHON_VERSION_MAJOR AND DEFINED PYTHON_VERSION_MINOR)
949600
+  set(_Python_VERSIONS
949600
+    ${Python_ADDITIONAL_VERSIONS}
949600
+    ${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}
949600
+    ${_PYTHON_FIND_OTHER_VERSIONS}
949600
+    )
949600
+else()
949600
+  set(_Python_VERSIONS
949600
+    ${Python_ADDITIONAL_VERSIONS}
949600
+    ${_PYTHON_FIND_OTHER_VERSIONS}
949600
+    )
949600
+endif()
949600
 
949600
 unset(_PYTHON_FIND_OTHER_VERSIONS)
949600
 unset(_PYTHON1_VERSIONS)