/[gentoo-x86]/dev-util/cmake/files/cmake-2.8.12.2-FindBoost-python.patch
Gentoo

Contents of /dev-util/cmake/files/cmake-2.8.12.2-FindBoost-python.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.1 - (show annotations) (download)
Tue May 6 12:21:42 2014 UTC (3 months, 2 weeks ago) by johu
Branch: MAIN
CVS Tags: HEAD
Revision bump adds patch to find the correct version libboost_python outside of portage by Christoph Junghans <ottxor@gentoo.org>, bug #500442.

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key F3CFD2BD)

1 --- Modules/FindBoost.cmake
2 +++ Modules/FindBoost.cmake
3 @@ -905,6 +905,15 @@
4
5 set( _boost_docstring_release "Boost ${COMPONENT} library (release)")
6 set( _boost_docstring_debug "Boost ${COMPONENT} library (debug)")
7 + if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python")
8 + # Get version of Python.
9 + if (NOT PYTHON_EXECUTABLE)
10 + #if a certain version of python was detected by cmake before use that one
11 + set(PYTHON_EXECUTABLE "python")
12 + endif (NOT PYTHON_EXECUTABLE)
13 + execute_process(COMMAND "${PYTHON_EXECUTABLE}" -c "import sys; sys.stdout.write('.'.join(str(x) for x in sys.version_info[:2]))" OUTPUT_VARIABLE _python_version)
14 + endif()
15 +
16
17 #
18 # Find RELEASE libraries
19 @@ -915,6 +924,14 @@
20 ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION}
21 ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}
22 ${Boost_LIB_PREFIX}boost_${COMPONENT} )
23 + if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python")
24 + list(APPEND _boost_RELEASE_NAMES
25 + ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION}
26 + ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}
27 + ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION}
28 + ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}
29 + ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version} )
30 + endif()
31 if(_boost_STATIC_RUNTIME_WORKAROUND)
32 set(_boost_RELEASE_STATIC_ABI_TAG "-s${_boost_RELEASE_ABI_TAG}")
33 list(APPEND _boost_RELEASE_NAMES
34 @@ -922,6 +939,13 @@
35 ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}
36 ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
37 ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} )
38 + if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python")
39 + list(APPEND _boost_RELEASE_NAMES
40 + ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
41 + ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}
42 + ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
43 + ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} )
44 + endif()
45 endif()
46 if(Boost_THREADAPI AND ${COMPONENT} STREQUAL "thread")
47 _Boost_PREPEND_LIST_WITH_THREADAPI(_boost_RELEASE_NAMES ${_boost_RELEASE_NAMES})
48 @@ -951,6 +975,15 @@
49 ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}
50 ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}
51 ${Boost_LIB_PREFIX}boost_${COMPONENT} )
52 + if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python")
53 + list(APPEND _boost_DEBUG_NAMES
54 + ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}-${Boost_LIB_VERSION}
55 + ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}
56 + ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}-${Boost_LIB_VERSION}
57 + ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}
58 + ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}
59 + ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version} )
60 + endif()
61 if(_boost_STATIC_RUNTIME_WORKAROUND)
62 set(_boost_DEBUG_STATIC_ABI_TAG "-s${_boost_DEBUG_ABI_TAG}")
63 list(APPEND _boost_DEBUG_NAMES
64 @@ -958,6 +991,13 @@
65 ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}
66 ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
67 ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} )
68 + if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python")
69 + list(APPEND _boost_DEBUG_NAMES
70 + ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
71 + ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}
72 + ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
73 + ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} )
74 + endif()
75 endif()
76 if(Boost_THREADAPI AND ${COMPONENT} STREQUAL "thread")
77 _Boost_PREPEND_LIST_WITH_THREADAPI(_boost_DEBUG_NAMES ${_boost_DEBUG_NAMES})

  ViewVC Help
Powered by ViewVC 1.1.20