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 | ||||
| @@ -872,7 +873,7 @@ function(_Boost_COMPONENT_HEADERS component _hdrs) | |||||
| set(_Boost_ATOMIC_HEADERS "boost/atomic.hpp") | |||||
| set(_Boost_CHRONO_HEADERS "boost/chrono.hpp") | |||||
| set(_Boost_CONTAINER_HEADERS "boost/container/container_fwd.hpp") | |||||
| - set(_Boost_CONTEXT_HEADERS "boost/context/all.hpp") | |||||
| + set(_Boost_CONTEXT_HEADERS "boost/context/flags.hpp") | |||||
| set(_Boost_COROUTINE_HEADERS "boost/coroutine/all.hpp") | |||||
| set(_Boost_DATE_TIME_HEADERS "boost/date_time/date.hpp") | |||||
| set(_Boost_EXCEPTION_HEADERS "boost/exception/exception.hpp") | |||||
| @@ -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}") | ||||