|
Lines 1-4
Link Here
|
| 1 |
--- Modules/FindBoost.cmake.orig 2021-07-14 14:10:23 UTC |
1 |
--- Modules/FindBoost.cmake.orig 2022-01-25 13:45:06 UTC |
| 2 |
+++ Modules/FindBoost.cmake |
2 |
+++ Modules/FindBoost.cmake |
| 3 |
@@ -135,6 +135,9 @@ This module reads hints about search locations from va |
3 |
@@ -135,6 +135,9 @@ This module reads hints about search locations from va |
| 4 |
``BOOST_LIBRARYDIR`` |
4 |
``BOOST_LIBRARYDIR`` |
|
Lines 20-26
Link Here
|
| 20 |
#------------------------------------------------------------------------------- |
20 |
#------------------------------------------------------------------------------- |
| 21 |
# Before we go searching, check whether a boost cmake package is available, unless |
21 |
# Before we go searching, check whether a boost cmake package is available, unless |
| 22 |
# the user specifically asked NOT to search for one. |
22 |
# the user specifically asked NOT to search for one. |
| 23 |
@@ -2132,10 +2138,10 @@ foreach(COMPONENT ${Boost_FIND_COMPONENTS}) |
23 |
@@ -2162,10 +2168,10 @@ foreach(COMPONENT ${Boost_FIND_COMPONENTS}) |
| 24 |
# Handle Python version suffixes |
24 |
# Handle Python version suffixes |
| 25 |
unset(COMPONENT_PYTHON_VERSION_MAJOR) |
25 |
unset(COMPONENT_PYTHON_VERSION_MAJOR) |
| 26 |
unset(COMPONENT_PYTHON_VERSION_MINOR) |
26 |
unset(COMPONENT_PYTHON_VERSION_MINOR) |
|
Lines 28-35
Link Here
|
| 28 |
+ if(${COMPONENT}${BOOST_PYTHON_SUFFIX} MATCHES "^(python|mpi_python|numpy)([0-9])\$") |
28 |
+ if(${COMPONENT}${BOOST_PYTHON_SUFFIX} MATCHES "^(python|mpi_python|numpy)([0-9])\$") |
| 29 |
set(COMPONENT_UNVERSIONED "${CMAKE_MATCH_1}") |
29 |
set(COMPONENT_UNVERSIONED "${CMAKE_MATCH_1}") |
| 30 |
set(COMPONENT_PYTHON_VERSION_MAJOR "${CMAKE_MATCH_2}") |
30 |
set(COMPONENT_PYTHON_VERSION_MAJOR "${CMAKE_MATCH_2}") |
| 31 |
- elseif(${COMPONENT} MATCHES "^(python|mpi_python|numpy)([0-9])\\.?([0-9])\$") |
31 |
- elseif(${COMPONENT} MATCHES "^(python|mpi_python|numpy)([0-9])\\.?([0-9]+)\$") |
| 32 |
+ elseif(${COMPONENT}${BOOST_PYTHON_SUFFIX} MATCHES "^(python|mpi_python|numpy)([0-9])\\.?([0-9])\$") |
32 |
+ elseif(${COMPONENT}${BOOST_PYTHON_SUFFIX} MATCHES "^(python|mpi_python|numpy)([0-9]+)\$") |
| 33 |
set(COMPONENT_UNVERSIONED "${CMAKE_MATCH_1}") |
33 |
set(COMPONENT_UNVERSIONED "${CMAKE_MATCH_1}") |
| 34 |
set(COMPONENT_PYTHON_VERSION_MAJOR "${CMAKE_MATCH_2}") |
34 |
set(COMPONENT_PYTHON_VERSION_MAJOR "${CMAKE_MATCH_2}") |
| 35 |
set(COMPONENT_PYTHON_VERSION_MINOR "${CMAKE_MATCH_3}") |
35 |
set(COMPONENT_PYTHON_VERSION_MINOR "${CMAKE_MATCH_3}") |