date:20060926

python 2.5 support in cmake

2006-09-26 Thread Dirk Mueller


Hi, 

it seems cmake misses python 2.5 support - something like the patch below 
should do I guess.. can this be added to CMake? its not in 2.4 CVS branch so 
far. 


Thanks,
Dirk
--- Modules/FindPythonLibs.cmake
+++ Modules/FindPythonLibs.cmake
@@ -12,8 +12,10 @@
 
 IF(WIN32)
   FIND_LIBRARY(PYTHON_DEBUG_LIBRARY
-NAMES python24_d python23_d python22_d python21_d python20_d python
+NAMES python25_d python24_d python23_d python22_d python21_d python20_d python
 PATHS
+[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.5\\InstallPath]/libs/Debug
+[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.5\\InstallPath]/libs
 [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.4\\InstallPath]/libs/Debug
 [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.4\\InstallPath]/libs
 [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.3\\InstallPath]/libs/Debug
@@ -32,7 +34,8 @@
 ENDIF(WIN32)
 
 FIND_LIBRARY(PYTHON_LIBRARY
-  NAMES python24 python2.4
+  NAMES python25 python25.
+python24 python2.4
 python23 python2.3
 python22 python2.2
 python21 python2.1
@@ -41,6 +44,7 @@
 python15 python1.5
 
   PATHS
+[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.5\\InstallPath]/libs
 [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.4\\InstallPath]/libs
 [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.3\\InstallPath]/libs
 [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.2\\InstallPath]/libs
@@ -50,6 +54,7 @@
 [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\1.5\\InstallPath]/libs
 
   PATH_SUFFIXES
+python2.5/config
 python2.4/config
 python2.3/config
 python2.2/config
@@ -67,7 +72,7 @@
 SET(PYTHON_FRAMEWORK_INCLUDES)
 IF(Python_FRAMEWORKS)
   IF(NOT PYTHON_INCLUDE_PATH)
-FOREACH(version 2.4 2.3 2.2 2.1 2.0 1.6 1.5)
+FOREACH(version 2.5 2.4 2.3 2.2 2.1 2.0 1.6 1.5)
   FOREACH(dir ${Python_FRAMEWORKS})
 SET(PYTHON_FRAMEWORK_INCLUDES ${PYTHON_FRAMEWORK_INCLUDES}
   ${dir}/Versions/${version}/include/python${version})
@@ -81,6 +86,7 @@
 
   PATHS
 ${PYTHON_FRAMEWORK_INCLUDES}
+[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.5\\InstallPath]/include
 [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.4\\InstallPath]/include
 [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.3\\InstallPath]/include
 [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.2\\InstallPath]/include
@@ -90,6 +96,7 @@
 [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\1.5\\InstallPath]/include
 
   PATH_SUFFIXES
+python2.5
 python2.4
 python2.3
 python2.2
___
Kde-buildsystem mailing list
Kde-buildsystem@kde.org
https://mail.kde.org/mailman/listinfo/kde-buildsystem

Re: python 2.5 support in cmake

2006-09-26 Thread Alexander Neundorf

Am Dienstag 26 September 2006 20:02 schrieb Dirk Mueller:
 Hi,

 it seems cmake misses python 2.5 support - something like the patch below
 should do I guess.. can this be added to CMake? its not in 2.4 CVS branch
 so far.

Sure, but not today :-)
Kennedy's is already waiting...

Alex
___
Kde-buildsystem mailing list
Kde-buildsystem@kde.org
https://mail.kde.org/mailman/listinfo/kde-buildsystem

Re: python 2.5 support in cmake

2006-09-26 Thread Dirk Mueller

On Tuesday, 26. September 2006 20:02, Dirk Mueller wrote:

 it seems cmake misses python 2.5 support - something like the patch below
 should do I guess.. can this be added to CMake? its not in 2.4 CVS branch
 so far.

a bit more complete patch. 

--- Modules/FindPythonInterp.cmake
+++ Modules/FindPythonInterp.cmake
@@ -7,8 +7,9 @@
 #
 
 FIND_PROGRAM(PYTHON_EXECUTABLE
-  NAMES python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5 python
+  NAMES 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]
   [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.3\\InstallPath]
   [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.2\\InstallPath]
--- Modules/FindPythonLibs.cmake
+++ Modules/FindPythonLibs.cmake
@@ -12,8 +12,10 @@
 
 IF(WIN32)
   FIND_LIBRARY(PYTHON_DEBUG_LIBRARY
-NAMES python24_d python23_d python22_d python21_d python20_d python
+NAMES python25_d python24_d python23_d python22_d python21_d python20_d python
 PATHS
+[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.5\\InstallPath]/libs/Debug
+[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.5\\InstallPath]/libs
 [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.4\\InstallPath]/libs/Debug
 [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.4\\InstallPath]/libs
 [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.3\\InstallPath]/libs/Debug
@@ -32,7 +34,8 @@
 ENDIF(WIN32)
 
 FIND_LIBRARY(PYTHON_LIBRARY
-  NAMES python24 python2.4
+  NAMES python25 python2.5
+python24 python2.4
 python23 python2.3
 python22 python2.2
 python21 python2.1
@@ -41,6 +44,7 @@
 python15 python1.5
 
   PATHS
+[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.5\\InstallPath]/libs
 [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.4\\InstallPath]/libs
 [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.3\\InstallPath]/libs
 [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.2\\InstallPath]/libs
@@ -50,6 +54,7 @@
 [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\1.5\\InstallPath]/libs
 
   PATH_SUFFIXES
+python2.5/config
 python2.4/config
 python2.3/config
 python2.2/config
@@ -67,7 +72,7 @@
 SET(PYTHON_FRAMEWORK_INCLUDES)
 IF(Python_FRAMEWORKS)
   IF(NOT PYTHON_INCLUDE_PATH)
-FOREACH(version 2.4 2.3 2.2 2.1 2.0 1.6 1.5)
+FOREACH(version 2.5 2.4 2.3 2.2 2.1 2.0 1.6 1.5)
   FOREACH(dir ${Python_FRAMEWORKS})
 SET(PYTHON_FRAMEWORK_INCLUDES ${PYTHON_FRAMEWORK_INCLUDES}
   ${dir}/Versions/${version}/include/python${version})
@@ -81,6 +86,7 @@
 
   PATHS
 ${PYTHON_FRAMEWORK_INCLUDES}
+[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.5\\InstallPath]/include
 [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.4\\InstallPath]/include
 [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.3\\InstallPath]/include
 [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.2\\InstallPath]/include
@@ -90,6 +96,7 @@
 [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\1.5\\InstallPath]/include
 
   PATH_SUFFIXES
+python2.5
 python2.4
 python2.3
 python2.2
___
Kde-buildsystem mailing list
Kde-buildsystem@kde.org
https://mail.kde.org/mailman/listinfo/kde-buildsystem

python 2.5 support in cmake

Re: python 2.5 support in cmake

Re: python 2.5 support in cmake

3 matches

Site Navigation

Mail list logo

Footer information