diff options
| author | Brad King <brad.king@kitware.com> | 2019-05-24 07:15:31 -0400 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2019-05-24 07:15:31 -0400 |
| commit | 2b6f832bf52bf59241cd8de742bf95dbb4269c88 (patch) | |
| tree | a352fb6867f8c25f44e0b09da6564c7647c7f584 | |
| parent | fffb5f1a75ee4d2c909209e68a822596606f90a4 (diff) | |
| parent | b915a4258550917cadb7cdd2f522b6e488b4db59 (diff) | |
| download | cmake-2b6f832bf52bf59241cd8de742bf95dbb4269c88.tar.gz | |
Merge branch 'FindBoost-contract-requires-compile-features' into release-3.14
Merge-request: !3368
| -rw-r--r-- | Modules/FindBoost.cmake | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake index 552c2fd6f9..6a59dffc80 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() |