[Cmake-commits] CMake branch, master, updated. v3.12.1-555-gcb800eb

[Kitware Robot]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  cb800ebb83646ef4ef2b2e2950d90837bc5c14a7 (commit)
       via  9a800c12fcf357b0eeb585a973a6f61790687795 (commit)
      from  cc5bac458b85081f813a2c169fda104f59233c37 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cb800ebb83646ef4ef2b2e2950d90837bc5c14a7
commit cb800ebb83646ef4ef2b2e2950d90837bc5c14a7
Merge: cc5bac4 9a800c1
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Sep 5 18:32:20 2018 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Wed Sep 5 14:32:27 2018 -0400

    Merge topic 'FindBoost-old-context'
    
    9a800c12fc FindBoost: Fix context discovery for 1.60 and below
    
    Acked-by: Kitware Robot <kwrobot at kitware.com>
    Merge-request: !2348


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9a800c12fcf357b0eeb585a973a6f61790687795
commit 9a800c12fcf357b0eeb585a973a6f61790687795
Author:     Igor Kostenko <igor_kostenko at prqa.com>
AuthorDate: Tue Sep 4 15:12:23 2018 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Sep 4 12:41:36 2018 -0400

    FindBoost: Fix context discovery for 1.60 and below
    
    * `all.hpp` was removed in 1.68:
      https://github.com/boostorg/context/commit/2e37599461912cc1679f106a25456a493f7f0b27
    * `fcontext.hpp` was moved to detail in 1.61:
      https://github.com/boostorg/context/commit/c2f0dfdf2608c1ebaa2229fa6f358fe6aa103561
    
    Fixes: #18126

diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake
index 4e5c45d..d5e7011 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")

-----------------------------------------------------------------------

Summary of changes:
 Modules/FindBoost.cmake | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake