/[gentoo-x86]/dev-util/cmake/files/cmake-2.8.10.2-FindPythonInterp.patch
Gentoo

Contents of /dev-util/cmake/files/cmake-2.8.10.2-FindPythonInterp.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.1 - (show annotations) (download)
Sun Apr 14 17:41:44 2013 UTC (17 months ago) by kensington
Branch: MAIN
CVS Tags: HEAD
Revision bump to fix detection of python (bug #405181) and newer imagemagic (bug #465898).

(Portage version: 2.1.11.62/cvs/Linux x86_64, signed Manifest commit with key 675D0D2C)

1 --- Modules/FindPythonInterp.cmake
2 +++ Modules/FindPythonInterp.cmake
3 @@ -60,6 +60,10 @@
4
5 list(APPEND _Python_NAMES python)
6
7 +if (CMAKE_BUILD_TYPE STREQUAL Gentoo)
8 + set(_Python_NAMES python)
9 +endif()
10 +
11 # Search for the current active python version first
12 find_program(PYTHON_EXECUTABLE NAMES ${_Python_NAMES})
13
14 @@ -76,7 +80,7 @@
15 unset(_PYTHON3_VERSIONS)
16
17 # Search for newest python version if python executable isn't found
18 -if(NOT PYTHON_EXECUTABLE)
19 +if(NOT PYTHON_EXECUTABLE AND NOT CMAKE_BUILD_TYPE STREQUAL Gentoo)
20 foreach(_CURRENT_VERSION ${_Python_VERSIONS})
21 set(_Python_NAMES python${_CURRENT_VERSION})
22 if(WIN32)

  ViewVC Help
Powered by ViewVC 1.1.20