Lines 1-72
Link Here
|
1 |
From ee1f8903322b443b263ec9638ab4851e7e5edf21 Mon Sep 17 00:00:00 2001 |
|
|
2 |
From: Roger Leigh <rleigh@dundee.ac.uk> |
3 |
Date: Wed, 6 Sep 2017 21:11:47 +0100 |
4 |
Subject: [PATCH] FindBoost: Add support for Boost 1.65.0 and 1.65.1 to CMake |
5 |
3.9 |
6 |
|
7 |
Backport the changes from commit fa114e7d70 (FindBoost: Add Boost 1.65 |
8 |
dependencies, 2017-08-22) and commit dbba53a5aa (FindBoost: Add version |
9 |
1.65.1, 2017-09-06) to CMake 3.9. |
10 |
|
11 |
Fixes: #17289 |
12 |
|
13 |
--- Modules/FindBoost.cmake.orig 2017-09-07 16:10:58 UTC |
14 |
+++ Modules/FindBoost.cmake |
15 |
@@ -550,7 +550,10 @@ function(_Boost_COMPONENT_DEPENDENCIES component _ret) |
16 |
# The addition of a new release should only require it to be run |
17 |
# against the new release. |
18 |
set(_Boost_IMPORTED_TARGETS TRUE) |
19 |
- if(NOT Boost_VERSION VERSION_LESS 103300 AND Boost_VERSION VERSION_LESS 103500) |
20 |
+ if(Boost_VERSION VERSION_LESS 103300) |
21 |
+ message(WARNING "Imported targets and dependency information not available for Boost version ${Boost_VERSION} (all versions older than 1.33)") |
22 |
+ set(_Boost_IMPORTED_TARGETS FALSE) |
23 |
+ elseif(NOT Boost_VERSION VERSION_LESS 103300 AND Boost_VERSION VERSION_LESS 103500) |
24 |
set(_Boost_IOSTREAMS_DEPENDENCIES regex thread) |
25 |
set(_Boost_REGEX_DEPENDENCIES thread) |
26 |
set(_Boost_WAVE_DEPENDENCIES filesystem thread) |
27 |
@@ -764,8 +767,27 @@ function(_Boost_COMPONENT_DEPENDENCIES component _ret) |
28 |
set(_Boost_WAVE_DEPENDENCIES filesystem system serialization thread chrono date_time atomic) |
29 |
set(_Boost_WSERIALIZATION_DEPENDENCIES serialization) |
30 |
else() |
31 |
- message(WARNING "Imported targets not available for Boost version ${Boost_VERSION}") |
32 |
- set(_Boost_IMPORTED_TARGETS FALSE) |
33 |
+ if(NOT Boost_VERSION VERSION_LESS 106500) |
34 |
+ set(_Boost_CHRONO_DEPENDENCIES system) |
35 |
+ set(_Boost_CONTEXT_DEPENDENCIES thread chrono system date_time) |
36 |
+ set(_Boost_COROUTINE_DEPENDENCIES context system) |
37 |
+ set(_Boost_FIBER_DEPENDENCIES context thread chrono system date_time) |
38 |
+ set(_Boost_FILESYSTEM_DEPENDENCIES system) |
39 |
+ set(_Boost_IOSTREAMS_DEPENDENCIES regex) |
40 |
+ set(_Boost_LOG_DEPENDENCIES date_time log_setup system filesystem thread regex chrono atomic) |
41 |
+ set(_Boost_MATH_DEPENDENCIES math_c99 math_c99f math_c99l math_tr1 math_tr1f math_tr1l atomic) |
42 |
+ set(_Boost_MPI_DEPENDENCIES serialization) |
43 |
+ set(_Boost_MPI_PYTHON_DEPENDENCIES python mpi serialization) |
44 |
+ set(_Boost_NUMPY_DEPENDENCIES python) |
45 |
+ set(_Boost_RANDOM_DEPENDENCIES system) |
46 |
+ set(_Boost_THREAD_DEPENDENCIES chrono system date_time atomic) |
47 |
+ set(_Boost_WAVE_DEPENDENCIES filesystem system serialization thread chrono date_time atomic) |
48 |
+ set(_Boost_WSERIALIZATION_DEPENDENCIES serialization) |
49 |
+ endif() |
50 |
+ if(NOT Boost_VERSION VERSION_LESS 106600) |
51 |
+ message(WARNING "New Boost version may have incorrect or missing dependencies and imported targets") |
52 |
+ set(_Boost_IMPORTED_TARGETS FALSE) |
53 |
+ endif() |
54 |
endif() |
55 |
|
56 |
string(TOUPPER ${component} uppercomponent) |
57 |
@@ -815,6 +837,7 @@ function(_Boost_COMPONENT_HEADERS component _hdrs) |
58 |
set(_Boost_MATH_TR1L_HEADERS "boost/math/tr1.hpp") |
59 |
set(_Boost_MPI_HEADERS "boost/mpi.hpp") |
60 |
set(_Boost_MPI_PYTHON_HEADERS "boost/mpi/python/config.hpp") |
61 |
+ set(_Boost_NUMPY_HEADERS "boost/python/numpy.hpp") |
62 |
set(_Boost_PRG_EXEC_MONITOR_HEADERS "boost/test/prg_exec_monitor.hpp") |
63 |
set(_Boost_PROGRAM_OPTIONS_HEADERS "boost/program_options.hpp") |
64 |
set(_Boost_PYTHON_HEADERS "boost/python.hpp") |
65 |
@@ -998,6 +1021,7 @@ else() |
66 |
# _Boost_COMPONENT_HEADERS. See the instructions at the top of |
67 |
# _Boost_COMPONENT_DEPENDENCIES. |
68 |
set(_Boost_KNOWN_VERSIONS ${Boost_ADDITIONAL_VERSIONS} |
69 |
+ "1.65.1" "1.65.0" "1.65" |
70 |
"1.64.0" "1.64" "1.63.0" "1.63" "1.62.0" "1.62" "1.61.0" "1.61" "1.60.0" "1.60" |
71 |
"1.59.0" "1.59" "1.58.0" "1.58" "1.57.0" "1.57" "1.56.0" "1.56" "1.55.0" "1.55" |
72 |
"1.54.0" "1.54" "1.53.0" "1.53" "1.52.0" "1.52" "1.51.0" "1.51" |