Changeset View
Changeset View
Standalone View
Standalone View
devel/cmake/files/patch-Modules_FindBoost.cmake
- This file was added.
| --- Modules/FindBoost.cmake.orig 2018-03-28 11:16:49 UTC | |||||
| +++ Modules/FindBoost.cmake | |||||
| @@ -55,6 +55,7 @@ | |||||
| # (or BOOSTROOT) | |||||
| # BOOST_INCLUDEDIR - Preferred include directory e.g. <prefix>/include | |||||
| # BOOST_LIBRARYDIR - Preferred library directory e.g. <prefix>/lib | |||||
| +# BOOST_PYTHON_SUFFIX - Preferred Python version | |||||
| # Boost_NO_SYSTEM_PATHS - Set to ON to disable searching in locations not | |||||
| # specified by these hint variables. Default is OFF. | |||||
| # Boost_ADDITIONAL_VERSIONS | |||||
| @@ -1663,10 +1664,10 @@ foreach(COMPONENT ${Boost_FIND_COMPONENTS}) | |||||
| # Handle Python version suffixes | |||||
| unset(COMPONENT_PYTHON_VERSION_MAJOR) | |||||
| unset(COMPONENT_PYTHON_VERSION_MINOR) | |||||
| - if(${COMPONENT} 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_PYTHON_VERSION_MAJOR "${CMAKE_MATCH_2}") | |||||
| - 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])\$") | |||||
| set(COMPONENT_UNVERSIONED "${CMAKE_MATCH_1}") | |||||
| set(COMPONENT_PYTHON_VERSION_MAJOR "${CMAKE_MATCH_2}") | |||||
| set(COMPONENT_PYTHON_VERSION_MINOR "${CMAKE_MATCH_3}") | |||||