summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2018-09-05 18:32:20 (GMT)
committerKitware Robot <kwrobot@kitware.com>2018-09-05 18:32:27 (GMT)
commitcb800ebb83646ef4ef2b2e2950d90837bc5c14a7 (patch)
treedb111bcd6bfcfb0986a00f353d1a527283eb73b8 /Modules
parentcc5bac458b85081f813a2c169fda104f59233c37 (diff)
parent9a800c12fcf357b0eeb585a973a6f61790687795 (diff)
downloadCMake-cb800ebb83646ef4ef2b2e2950d90837bc5c14a7.zip
CMake-cb800ebb83646ef4ef2b2e2950d90837bc5c14a7.tar.gz
CMake-cb800ebb83646ef4ef2b2e2950d90837bc5c14a7.tar.bz2
Merge topic 'FindBoost-old-context'
9a800c12fc FindBoost: Fix context discovery for 1.60 and below Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2348
Diffstat (limited to 'Modules')
-rw-r--r--Modules/FindBoost.cmake6
1 files changed, 5 insertions, 1 deletions
diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake
index c14e402..f65a493 100644
--- a/Modules/FindBoost.cmake
+++ b/Modules/FindBoost.cmake
@@ -881,7 +881,11 @@ function(_Boost_COMPONENT_HEADERS component _hdrs)
set(_Boost_CHRONO_HEADERS "boost/chrono.hpp")
set(_Boost_CONTAINER_HEADERS "boost/container/container_fwd.hpp")
set(_Boost_CONTRACT_HEADERS "boost/contract.hpp")
- set(_Boost_CONTEXT_HEADERS "boost/context/detail/fcontext.hpp")
+ if(Boost_VERSION VERSION_LESS 106100)
+ set(_Boost_CONTEXT_HEADERS "boost/context/all.hpp")
+ else()
+ set(_Boost_CONTEXT_HEADERS "boost/context/detail/fcontext.hpp")
+ endif()
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")