diff options
| author |   Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> | 2009-07-28 16:30:34 +0000 |
|---|---|---|
| committer | Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> | 2009-07-28 16:30:34 +0000 |
| commit | 80a7dd0236f23583f514c1d911071ef0f48494f3 (patch) | |
| tree | 55dd405c98048a5cbb88d7983717f36e38283be9 /dev-util/cmake/files | |
| parent | Adjust mask for ati-drivers to mask also ati-drivers-extra (diff) | |
| download | gentoo-2-80a7dd0236f23583f514c1d911071ef0f48494f3.tar.gz gentoo-2-80a7dd0236f23583f514c1d911071ef0f48494f3.tar.bz2 gentoo-2-80a7dd0236f23583f514c1d911071ef0f48494f3.zip | |
Add "python3" USE flag.
(Portage version: 13851-svn/cvs/Linux x86_64)
Diffstat (limited to 'dev-util/cmake/files')
| -rw-r--r-- | dev-util/cmake/files/cmake-FindPythonInterp.patch | 2 | ||||
| -rw-r--r-- | dev-util/cmake/files/cmake-FindPythonLibs.patch | 2 | ||||
| -rw-r--r-- | dev-util/cmake/files/cmake-python-3.patch | 22 |
3 files changed, 24 insertions, 2 deletions
diff --git a/dev-util/cmake/files/cmake-FindPythonInterp.patch b/dev-util/cmake/files/cmake-FindPythonInterp.patch index 91ecc6fe5a5e..2e4c47d6806f 100644 --- a/dev-util/cmake/files/cmake-FindPythonInterp.patch +++ b/dev-util/cmake/files/cmake-FindPythonInterp.patch @@ -5,7 +5,7 @@ FIND_PROGRAM(PYTHON_EXECUTABLE - NAMES python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5 python -+ 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 ++ NAMES python 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.5\\InstallPath] [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.4\\InstallPath] diff --git a/dev-util/cmake/files/cmake-FindPythonLibs.patch b/dev-util/cmake/files/cmake-FindPythonLibs.patch index 433ba31c5a70..7981140296da 100644 --- a/dev-util/cmake/files/cmake-FindPythonLibs.patch +++ b/dev-util/cmake/files/cmake-FindPythonLibs.patch @@ -5,7 +5,7 @@ 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) -+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) ++FOREACH(_CURRENT_VERSION 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 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 000000000000..0fdcd0ca1922 --- /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 |