[Cmake-commits] CMake branch, master, updated. v3.14.4-1109-g540640f

[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  540640fc0aca7f181098b0270fb1cae1cd684791 (commit)
       via  b915a4258550917cadb7cdd2f522b6e488b4db59 (commit)
      from  e13b18e2c70f42c23ed7e7fddb93557ce19b7359 (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=540640fc0aca7f181098b0270fb1cae1cd684791
commit 540640fc0aca7f181098b0270fb1cae1cd684791
Merge: e13b18e b915a42
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue May 28 15:42:02 2019 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Tue May 28 11:42:12 2019 -0400

    Merge topic 'FindBoost-contract-requires-compile-features'
    
    b915a42585 FindBoost: Add compiler features for Boost Contract library
    
    Acked-by: Kitware Robot <kwrobot at kitware.com>
    Merge-request: !3368


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b915a4258550917cadb7cdd2f522b6e488b4db59
commit b915a4258550917cadb7cdd2f522b6e488b4db59
Author:     Alex Turbov <i.zaufi at gmail.com>
AuthorDate: Fri May 24 19:12:44 2019 +0900
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri May 24 07:13:56 2019 -0400

    FindBoost: Add compiler features for Boost Contract library

diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake
index 552c2fd..6a59dff 100644
--- a/Modules/FindBoost.cmake
+++ b/Modules/FindBoost.cmake
@@ -1075,6 +1075,16 @@ function(_Boost_COMPILER_FEATURES component _ret)
     # Compiler feature for `context` same as for `fiber`.
     set(_Boost_CONTEXT_COMPILER_FEATURES ${_Boost_FIBER_COMPILER_FEATURES})
   endif()
+
+  # Boost Contract library available in >= 1.67
+  if(NOT Boost_VERSION_STRING VERSION_LESS 1.67.0)
+    # From `libs/contract/build/boost_contract_build.jam`
+    set(_Boost_CONTRACT_COMPILER_FEATURES
+        cxx_lambdas
+        cxx_variadic_templates
+    )
+  endif()
+
   string(TOUPPER ${component} uppercomponent)
   set(${_ret} ${_Boost_${uppercomponent}_COMPILER_FEATURES} PARENT_SCOPE)
 endfunction()

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

Summary of changes:
 Modules/FindBoost.cmake | 10 ++++++++++
 1 file changed, 10 insertions(+)


hooks/post-receive
-- 
CMake