[patch] Patch to make cmake properly set python-related variables

libopensync-plugin-python-cmake-python2.6.patch (text/plain), 1.32 KB, created by Gef on 2009-08-02 17:56:07 UTC

diff -ur libopensync-plugin-python-0.36.orig/cmake/modules/FindPythonLibs.cmake libopensync-plugin-python-0.36/cmake/modules/FindPythonLibs.cmake
--- libopensync-plugin-python-0.36.orig/cmake/modules/FindPythonLibs.cmake	2008-01-26 18:03:13.000000000 +0100
+++ libopensync-plugin-python-0.36/cmake/modules/FindPythonLibs.cmake	2009-08-02 19:50:58.962890218 +0200
@@ -39,7 +39,8 @@
 ENDIF(WIN32)
 
 FIND_LIBRARY(PYTHON_LIBRARY ${PREFERRED_PYTHON_VERSION}
-  NAMES python25 python2.5
+  NAMES python26 python2.6
+        python25 python2.5
         python24 python2.4
         python23 python2.3
         python22 python2.2
@@ -59,6 +60,7 @@
     [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\1.5\\InstallPath]/libs
 
   PATH_SUFFIXES
+    python2.6/config
     python2.5/config
     python2.4/config
     python2.3/config
@@ -77,7 +79,7 @@
 SET(PYTHON_FRAMEWORK_INCLUDES)
 IF(Python_FRAMEWORKS)
   IF(NOT PYTHON_INCLUDE_PATH)
-    FOREACH(version 2.5 2.4 2.3 2.2 2.1 2.0 1.6 1.5)
+    FOREACH(version 2.6 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})
@@ -102,6 +104,7 @@
 
   PATH_SUFFIXES
     ${PREFERRED_PYTHON_VERSION}
+    python2.6
     python2.5
     python2.4
     python2.3