summaryrefslogtreecommitdiff
path: root/dev-util/cmake/files/cmake-FindPythonLibs.patch
diff options
context:
space:
mode:
authorAndreas K. Huettel (dilfridge) <mail@akhuettel.de>2010-06-27 20:59:35 +0200
committerTheo Chatzimichos <tampakrap@gentoo.org>2010-06-28 15:39:17 +0300
commit24809f5ecafa63aee6541fa450766a74bf1b5467 (patch)
tree4db35207f0bba30ba3f0f5f98452f27322de4ffc /dev-util/cmake/files/cmake-FindPythonLibs.patch
parent094f28b78ae614dcfdb9c83d0ac0ac7d6f42878e (diff)
downloadkde-24809f5ecafa63aee6541fa450766a74bf1b5467.tar.gz
kde-24809f5ecafa63aee6541fa450766a74bf1b5467.tar.bz2
kde-24809f5ecafa63aee6541fa450766a74bf1b5467.zip
[dev-util/cmake] Fix java detection, should resolve bug 315229. Please test.
Diffstat (limited to 'dev-util/cmake/files/cmake-FindPythonLibs.patch')
-rw-r--r--dev-util/cmake/files/cmake-FindPythonLibs.patch13
1 files changed, 13 insertions, 0 deletions
diff --git a/dev-util/cmake/files/cmake-FindPythonLibs.patch b/dev-util/cmake/files/cmake-FindPythonLibs.patch
new file mode 100644
index 00000000000..d7f4f627be4
--- /dev/null
+++ b/dev-util/cmake/files/cmake-FindPythonLibs.patch
@@ -0,0 +1,13 @@
+--- Modules/FindPythonLibs.cmake
++++ Modules/FindPythonLibs.cmake
+@@ -14,7 +14,9 @@
+ # 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)
++EXECUTE_PROCESS(COMMAND python -c "import sys; sys.stdout.write('.'.join([str(x) for x in sys.version_info[:2]]))"
++ OUTPUT_VARIABLE _PYTHON_VERSION)
++FOREACH(_CURRENT_VERSION ${_PYTHON_VERSION})
+ STRING(REPLACE "." "" _CURRENT_VERSION_NO_DOTS ${_CURRENT_VERSION})
+ IF(WIN32)
+ FIND_LIBRARY(PYTHON_DEBUG_LIBRARY