From 442ec331cdbbf605821aab9fbf02b0fa4a91918c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Sun, 27 Sep 2009 21:06:27 +0200 Subject: Initial commit for new cmake. For god sake do not test cause it is not ready. Whats needed to be done: - check 2.6 patches and apply those that are still relevant. - CMakeLists got rewritten so new options are around Also probably new dep (optional): JNI-H -- i bet it is something javist. In this verison it uses system curses form library not internal YAY :] Also it reports that it wants CURSES_EXTRA_LIBRARY=NOT-FOUND, so find out what the heck it is. --- dev-util/cmake/files/cmake-python-3.patch | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 dev-util/cmake/files/cmake-python-3.patch (limited to 'dev-util/cmake/files/cmake-python-3.patch') diff --git a/dev-util/cmake/files/cmake-python-3.patch b/dev-util/cmake/files/cmake-python-3.patch new file mode 100644 index 00000000000..0fdcd0ca192 --- /dev/null +++ b/dev-util/cmake/files/cmake-python-3.patch @@ -0,0 +1,22 @@ +--- Modules/FindPythonInterp.cmake ++++ Modules/FindPythonInterp.cmake +@@ -7,7 +7,7 @@ + # + + FIND_PROGRAM(PYTHON_EXECUTABLE +- NAMES python python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5 ++ NAMES python python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5 + PATHS + [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.6\\InstallPath] + [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.5\\InstallPath] +--- Modules/FindPythonLibs.cmake ++++ Modules/FindPythonLibs.cmake +@@ -13,7 +13,7 @@ + # Search for the python framework on Apple. + CMAKE_FIND_FRAMEWORKS(Python) + +-FOREACH(_CURRENT_VERSION 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0 1.6 1.5) ++FOREACH(_CURRENT_VERSION 3.2 3.1 3.0 2.7 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 -- cgit v1.2.3