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

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

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.1 - (show annotations) (download)
Sun Apr 14 17:41:44 2013 UTC (18 months, 1 week ago) by kensington
Branch: MAIN
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 diff --git a/Modules/FindPythonLibs.cmake b/Modules/FindPythonLibs.cmake
2 index bffa9fb..8fc90ee 100644
3 --- a/Modules/FindPythonLibs.cmake
4 +++ b/Modules/FindPythonLibs.cmake
5 @@ -74,6 +74,19 @@ set(_Python_VERSIONS
6 ${_PYTHON_FIND_OTHER_VERSIONS}
7 )
8
9 +# Gentoo portage requires that you use exactly the given python version
10 +if (CMAKE_BUILD_TYPE STREQUAL Gentoo)
11 + execute_process(COMMAND python -c "import sys; sys.stdout.write('.'.join([str(x) for x in sys.version_info[:2]]))"
12 + OUTPUT_VARIABLE _Gentoo_Python_VERSION)
13 + list(FIND _Python_VERSIONS "${_Gentoo_Python_VERSION}" _Gentoo_Python_INDEX)
14 + if (_Gentoo_Python_INDEX EQUAL -1)
15 + # the current Gentoo python version is not compatible with what is requested
16 + set(_Python_VERSIONS)
17 + else ()
18 + set(_Python_VERSIONS "${_Gentoo_Python_VERSION}")
19 + endif ()
20 +endif()
21 +
22 unset(_PYTHON_FIND_OTHER_VERSIONS)
23 unset(_PYTHON1_VERSIONS)
24 unset(_PYTHON2_VERSIONS)

  ViewVC Help
Powered by ViewVC 1.1.20