diff options
| author | Michael Palimaka <kensington@gentoo.org> | 2015-04-10 03:47:48 +1000 |
|---|---|---|
| committer | Michael Palimaka <kensington@gentoo.org> | 2015-04-10 03:47:48 +1000 |
| commit | b5c52ea43e2581f642ad800eccaa4db30e7e7e84 (patch) | |
| tree | 4f34a18c9fa6e4e5cdd3c33227f0b4bacdbd0641 /dev-util/cmake/files/cmake-3.1.0-FindPythonInterp.patch | |
| parent | fad9487cf6add477cd65250ac25c227813f9897e (diff) | |
| download | kde-b5c52ea43e2581f642ad800eccaa4db30e7e7e84.tar.gz kde-b5c52ea43e2581f642ad800eccaa4db30e7e7e84.tar.bz2 kde-b5c52ea43e2581f642ad800eccaa4db30e7e7e84.zip | |
[dev-util/cmake] Moved to main tree.
Diffstat (limited to 'dev-util/cmake/files/cmake-3.1.0-FindPythonInterp.patch')
| -rw-r--r-- | dev-util/cmake/files/cmake-3.1.0-FindPythonInterp.patch | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/dev-util/cmake/files/cmake-3.1.0-FindPythonInterp.patch b/dev-util/cmake/files/cmake-3.1.0-FindPythonInterp.patch deleted file mode 100644 index 78f622d886a..00000000000 --- a/dev-util/cmake/files/cmake-3.1.0-FindPythonInterp.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- Modules/FindPythonInterp.cmake.orig 2015-01-06 11:50:03.376357898 +0100 -+++ Modules/FindPythonInterp.cmake 2015-01-06 12:25:48.614989290 +0100 -@@ -75,6 +75,11 @@ - else() - set(_PYTHON_FIND_OTHER_VERSIONS ${_PYTHON3_VERSIONS} ${_PYTHON2_VERSIONS} ${_PYTHON1_VERSIONS}) - endif() -+ -+if (CMAKE_BUILD_TYPE STREQUAL Gentoo) -+ set(_Python_NAMES python) -+endif() -+ - find_program(PYTHON_EXECUTABLE NAMES ${_Python_NAMES}) - - # Set up the versions we know about, in the order we will search. Always add -@@ -99,12 +104,13 @@ - unset(_PYTHON3_VERSIONS) - - # Search for newest python version if python executable isn't found --if(NOT PYTHON_EXECUTABLE) -+if(NOT PYTHON_EXECUTABLE AND NOT CMAKE_BUILD_TYPE STREQUAL Gentoo) - foreach(_CURRENT_VERSION IN LISTS _Python_VERSIONS) - set(_Python_NAMES python${_CURRENT_VERSION}) - if(WIN32) - list(APPEND _Python_NAMES python) - endif() -+ - find_program(PYTHON_EXECUTABLE - NAMES ${_Python_NAMES} - PATHS [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}\\InstallPath] |