Changeset View
Changeset View
Standalone View
Standalone View
devel/cmake/files/patch-Modules_FindBoost.cmake
| --- Modules/FindBoost.cmake.orig 2018-03-28 11:16:49 UTC | --- Modules/FindBoost.cmake.orig 2018-03-28 11:16:49 UTC | ||||
| +++ Modules/FindBoost.cmake | +++ Modules/FindBoost.cmake | ||||
| @@ -55,6 +55,7 @@ | @@ -55,6 +55,7 @@ | ||||
| # (or BOOSTROOT) | # (or BOOSTROOT) | ||||
| # BOOST_INCLUDEDIR - Preferred include directory e.g. <prefix>/include | # BOOST_INCLUDEDIR - Preferred include directory e.g. <prefix>/include | ||||
| # BOOST_LIBRARYDIR - Preferred library directory e.g. <prefix>/lib | # BOOST_LIBRARYDIR - Preferred library directory e.g. <prefix>/lib | ||||
| +# BOOST_PYTHON_SUFFIX - Preferred Python version | +# BOOST_PYTHON_SUFFIX - Preferred Python version | ||||
| # Boost_NO_SYSTEM_PATHS - Set to ON to disable searching in locations not | # Boost_NO_SYSTEM_PATHS - Set to ON to disable searching in locations not | ||||
| # specified by these hint variables. Default is OFF. | # specified by these hint variables. Default is OFF. | ||||
| # Boost_ADDITIONAL_VERSIONS | # Boost_ADDITIONAL_VERSIONS | ||||
| @@ -240,6 +241,9 @@ | |||||
| cmake_policy(PUSH) | |||||
| cmake_policy(SET CMP0057 NEW) # if IN_LIST | |||||
| +# https://gitlab.kitware.com/cmake/cmake/issues/18865 | |||||
| +set(Boost_NO_BOOST_CMAKE ON CACHE BOOL "Disable the search for boost-cmake") | |||||
| + | |||||
| #------------------------------------------------------------------------------- | |||||
| # Before we go searching, check whether boost-cmake is available, unless the | |||||
| # user specifically asked NOT to search for boost-cmake. | |||||
| @@ -1663,10 +1664,10 @@ foreach(COMPONENT ${Boost_FIND_COMPONENTS}) | @@ -1663,10 +1664,10 @@ foreach(COMPONENT ${Boost_FIND_COMPONENTS}) | ||||
| # Handle Python version suffixes | # Handle Python version suffixes | ||||
| unset(COMPONENT_PYTHON_VERSION_MAJOR) | unset(COMPONENT_PYTHON_VERSION_MAJOR) | ||||
| unset(COMPONENT_PYTHON_VERSION_MINOR) | unset(COMPONENT_PYTHON_VERSION_MINOR) | ||||
| - if(${COMPONENT} MATCHES "^(python|mpi_python|numpy)([0-9])\$") | - if(${COMPONENT} MATCHES "^(python|mpi_python|numpy)([0-9])\$") | ||||
| + if(${COMPONENT}${BOOST_PYTHON_SUFFIX} MATCHES "^(python|mpi_python|numpy)([0-9])\$") | + if(${COMPONENT}${BOOST_PYTHON_SUFFIX} MATCHES "^(python|mpi_python|numpy)([0-9])\$") | ||||
| set(COMPONENT_UNVERSIONED "${CMAKE_MATCH_1}") | set(COMPONENT_UNVERSIONED "${CMAKE_MATCH_1}") | ||||
| set(COMPONENT_PYTHON_VERSION_MAJOR "${CMAKE_MATCH_2}") | set(COMPONENT_PYTHON_VERSION_MAJOR "${CMAKE_MATCH_2}") | ||||
| - elseif(${COMPONENT} MATCHES "^(python|mpi_python|numpy)([0-9])\\.?([0-9])\$") | - elseif(${COMPONENT} MATCHES "^(python|mpi_python|numpy)([0-9])\\.?([0-9])\$") | ||||
| + elseif(${COMPONENT}${BOOST_PYTHON_SUFFIX} MATCHES "^(python|mpi_python|numpy)([0-9])\\.?([0-9])\$") | + elseif(${COMPONENT}${BOOST_PYTHON_SUFFIX} MATCHES "^(python|mpi_python|numpy)([0-9])\\.?([0-9])\$") | ||||
| set(COMPONENT_UNVERSIONED "${CMAKE_MATCH_1}") | set(COMPONENT_UNVERSIONED "${CMAKE_MATCH_1}") | ||||
| set(COMPONENT_PYTHON_VERSION_MAJOR "${CMAKE_MATCH_2}") | set(COMPONENT_PYTHON_VERSION_MAJOR "${CMAKE_MATCH_2}") | ||||
| set(COMPONENT_PYTHON_VERSION_MINOR "${CMAKE_MATCH_3}") | set(COMPONENT_PYTHON_VERSION_MINOR "${CMAKE_MATCH_3}") | ||||