[cmake-commits] alex committed FindPythonInterp.cmake 1.9 1.10 FindPythonLibs.cmake 1.38 1.39

cmake-commits at cmake.org cmake-commits at cmake.org
Thu Aug 30 13:35:56 EDT 2007


Update of /cvsroot/CMake/CMake/Modules
In directory public:/mounts/ram/cvs-serv31730

Modified Files:
	FindPythonInterp.cmake FindPythonLibs.cmake 
Log Message:

ENH: add support for the next python release, python 2.6

Alex


Index: FindPythonLibs.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindPythonLibs.cmake,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- FindPythonLibs.cmake	16 Aug 2007 19:03:31 -0000	1.38
+++ FindPythonLibs.cmake	30 Aug 2007 17:35:54 -0000	1.39
@@ -13,7 +13,7 @@
 # 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

Index: FindPythonInterp.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindPythonInterp.cmake,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- FindPythonInterp.cmake	23 Jul 2007 15:22:14 -0000	1.9
+++ FindPythonInterp.cmake	30 Aug 2007 17:35:54 -0000	1.10
@@ -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]



More information about the Cmake-commits mailing list