Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Bill Hoffman
CMake
Commits
384c3f9e
Commit
384c3f9e
authored
Jul 12, 2018
by
Brad King
Browse files
Merge branch 'boost-1.68-beta1' into release-3.12
Merge-request: !2204
parents
730c8b87
b76b93c7
Changes
1
Hide whitespace changes
Inline
Side-by-side
Modules/FindBoost.cmake
View file @
384c3f9e
...
...
@@ -806,10 +806,28 @@ function(_Boost_COMPONENT_DEPENDENCIES component _ret)
set
(
_Boost_TIMER_DEPENDENCIES chrono system
)
set
(
_Boost_WAVE_DEPENDENCIES filesystem system serialization thread chrono date_time atomic
)
set
(
_Boost_WSERIALIZATION_DEPENDENCIES serialization
)
elseif
(
NOT Boost_VERSION VERSION_LESS 106700 AND Boost_VERSION VERSION_LESS 106800
)
set
(
_Boost_CHRONO_DEPENDENCIES system
)
set
(
_Boost_CONTEXT_DEPENDENCIES thread chrono system date_time
)
set
(
_Boost_COROUTINE_DEPENDENCIES context system
)
set
(
_Boost_FIBER_DEPENDENCIES context thread chrono system date_time
)
set
(
_Boost_FILESYSTEM_DEPENDENCIES system
)
set
(
_Boost_IOSTREAMS_DEPENDENCIES regex
)
set
(
_Boost_LOG_DEPENDENCIES date_time log_setup system filesystem thread regex chrono atomic
)
set
(
_Boost_MATH_DEPENDENCIES math_c99 math_c99f math_c99l math_tr1 math_tr1f math_tr1l atomic
)
set
(
_Boost_MPI_DEPENDENCIES serialization
)
set
(
_Boost_MPI_PYTHON_DEPENDENCIES python
${
component_python_version
}
mpi serialization
)
set
(
_Boost_NUMPY_DEPENDENCIES python
${
component_python_version
}
)
set
(
_Boost_RANDOM_DEPENDENCIES system
)
set
(
_Boost_THREAD_DEPENDENCIES chrono system date_time atomic
)
set
(
_Boost_TIMER_DEPENDENCIES chrono system
)
set
(
_Boost_WAVE_DEPENDENCIES filesystem system serialization thread chrono date_time atomic
)
set
(
_Boost_WSERIALIZATION_DEPENDENCIES serialization
)
else
()
if
(
NOT Boost_VERSION VERSION_LESS 106
7
00
)
if
(
NOT Boost_VERSION VERSION_LESS 106
8
00
)
set
(
_Boost_CHRONO_DEPENDENCIES system
)
set
(
_Boost_CONTEXT_DEPENDENCIES thread chrono system date_time
)
set
(
_Boost_CONTRACT_DEPENDENCIES thread chrono system date_time
)
set
(
_Boost_COROUTINE_DEPENDENCIES context system
)
set
(
_Boost_FIBER_DEPENDENCIES context thread chrono system date_time
)
set
(
_Boost_FILESYSTEM_DEPENDENCIES system
)
...
...
@@ -825,7 +843,7 @@ function(_Boost_COMPONENT_DEPENDENCIES component _ret)
set
(
_Boost_WAVE_DEPENDENCIES filesystem system serialization thread chrono date_time atomic
)
set
(
_Boost_WSERIALIZATION_DEPENDENCIES serialization
)
endif
()
if
(
NOT Boost_VERSION VERSION_LESS 106
8
00
)
if
(
NOT Boost_VERSION VERSION_LESS 106
9
00
)
message
(
WARNING
"New Boost version may have incorrect or missing dependencies and imported targets"
)
endif
()
endif
()
...
...
@@ -862,7 +880,8 @@ 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_CONTRACT_HEADERS
"boost/contract.hpp"
)
set
(
_Boost_CONTEXT_HEADERS
"boost/context/detail/fcontext.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"
)
...
...
@@ -1062,7 +1081,7 @@ else()
# _Boost_COMPONENT_HEADERS. See the instructions at the top of
# _Boost_COMPONENT_DEPENDENCIES.
set
(
_Boost_KNOWN_VERSIONS
${
Boost_ADDITIONAL_VERSIONS
}
"1.67.0"
"1.67"
"1.66.0"
"1.66"
"1.65.1"
"1.65.0"
"1.65"
"1.68.0"
"1.68"
"1.67.0"
"1.67"
"1.66.0"
"1.66"
"1.65.1"
"1.65.0"
"1.65"
"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"
"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"
"1.54.0"
"1.54"
"1.53.0"
"1.53"
"1.52.0"
"1.52"
"1.51.0"
"1.51"
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment