summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorAlexander Neundorf <neundorf@kde.org>2007-08-30 17:35:54 (GMT)
committerAlexander Neundorf <neundorf@kde.org>2007-08-30 17:35:54 (GMT)
commit52bf51b42538a013358a58a8550c7a8253579486 (patch)
treec2159775a776d16c2c9becab1e8e78e97a349364 /Modules
parentae94a76b24f4aae3db6d56bc9a4835f2ba94e352 (diff)
downloadCMake-52bf51b42538a013358a58a8550c7a8253579486.zip
CMake-52bf51b42538a013358a58a8550c7a8253579486.tar.gz
CMake-52bf51b42538a013358a58a8550c7a8253579486.tar.bz2
ENH: add support for the next python release, python 2.6
Alex
Diffstat (limited to 'Modules')
-rw-r--r--Modules/FindPythonInterp.cmake2
-rw-r--r--Modules/FindPythonLibs.cmake2
2 files changed, 2 insertions, 2 deletions
diff --git a/Modules/FindPythonInterp.cmake b/Modules/FindPythonInterp.cmake
index e360565..5074c69 100644
--- a/Modules/FindPythonInterp.cmake
+++ b/Modules/FindPythonInterp.cmake
@@ -7,7 +7,7 @@
#
FIND_PROGRAM(PYTHON_EXECUTABLE
- NAMES python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5 python
+ NAMES 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.5\\InstallPath]
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.4\\InstallPath]
diff --git a/Modules/FindPythonLibs.cmake b/Modules/FindPythonLibs.cmake
index e7eac31..a9cf89e 100644
--- a/Modules/FindPythonLibs.cmake
+++ b/Modules/FindPythonLibs.cmake
@@ -13,7 +13,7 @@ INCLUDE(CMakeFindFrameworks)
# Search for the python framework on Apple.
CMAKE_FIND_FRAMEWORKS(Python)
-FOREACH(_CURRENT_VERSION 2.5 2.4 2.3 2.2 2.1 2.0 1.6 1.5)
+FOREACH(_CURRENT_VERSION 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