SHA256
3
0
forked from pool/cmake
cmake/cmake-support-new-python.diff

27 lines
1.4 KiB
Diff

Index: cmake-2.8.2/Modules/FindPythonInterp.cmake
===================================================================
--- cmake-2.8.2.orig/Modules/FindPythonInterp.cmake 2010-06-28 17:15:57.000000000 +0200
+++ cmake-2.8.2/Modules/FindPythonInterp.cmake 2010-09-07 10:56:37.825385191 +0200
@@ -20,7 +20,7 @@
# License text for the above reference.)
FIND_PROGRAM(PYTHON_EXECUTABLE
- NAMES python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5 python
+ NAMES python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5 python
PATHS
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.6\\InstallPath]
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.5\\InstallPath]
Index: cmake-2.8.2/Modules/FindPythonLibs.cmake
===================================================================
--- cmake-2.8.2.orig/Modules/FindPythonLibs.cmake 2010-06-28 17:15:57.000000000 +0200
+++ cmake-2.8.2/Modules/FindPythonLibs.cmake 2010-09-07 11:48:34.313260226 +0200
@@ -27,7 +27,7 @@ INCLUDE(CMakeFindFrameworks)
# Search for the python framework on Apple.
CMAKE_FIND_FRAMEWORKS(Python)
-FOREACH(_CURRENT_VERSION 2.6 2.5 2.4 2.3 2.2 2.1 2.0 1.6 1.5)
+FOREACH(_CURRENT_VERSION 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0 1.6 1.5)
STRING(REPLACE "." "" _CURRENT_VERSION_NO_DOTS ${_CURRENT_VERSION})
IF(WIN32)
FIND_LIBRARY(PYTHON_DEBUG_LIBRARY