diff options
| author | Brad King <brad.king@kitware.com> | 2019-05-01 16:00:26 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-05-01 16:00:54 (GMT) |
| commit | a1709057ef6fa557d9106bac0da54899952d5cba (patch) | |
| tree | db7cb93cbb56742f222c6cc970abd9730d12969b | |
| parent | 24e7554e15f12233b6e2fd294b9be4c1f8c24a06 (diff) | |
| parent | f06bf0fa5740a82a4205b95a5de3e2a0e4eb865a (diff) | |
| download | CMake-a1709057ef6fa557d9106bac0da54899952d5cba.zip CMake-a1709057ef6fa557d9106bac0da54899952d5cba.tar.gz CMake-a1709057ef6fa557d9106bac0da54899952d5cba.tar.bz2 | |
Merge topic 'FindBoost-fix-fiber-compiler-features'
f06bf0fa57 FindBoost: Fix compiler features for `fiber` and `context`
684338aff6 FindBoost: Record compiler features for Boost 1.67 and above
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3266
| -rw-r--r-- | Modules/FindBoost.cmake | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake index 7325eca..023cc8d 100644 --- a/Modules/FindBoost.cmake +++ b/Modules/FindBoost.cmake @@ -1054,11 +1054,17 @@ endfunction() # Some boost libraries may require particular set of compler features. # The very first one was `boost::fiber` introduced in Boost 1.62. # One can check required compiler features of it in -# `${Boost_ROOT}/libs/fiber/build/Jamfile.v2`. +# - `${Boost_ROOT}/libs/fiber/build/Jamfile.v2`; +# - `${Boost_ROOT}/libs/context/build/Jamfile.v2`. +# +# TODO (Re)Check compiler features on (every?) release ??? +# One may use the following command to get the files to check: +# +# $ find . -name Jamfile.v2 | grep build | xargs grep -l cxx1 # function(_Boost_COMPILER_FEATURES component _ret) - # Boost >= 1.62 and < 1.67 - if(NOT Boost_VERSION VERSION_LESS 106200 AND Boost_VERSION VERSION_LESS 106700) + # Boost >= 1.62 + if(NOT Boost_VERSION VERSION_LESS 106200) set(_Boost_FIBER_COMPILER_FEATURES cxx_alias_templates cxx_auto_type @@ -1072,6 +1078,8 @@ function(_Boost_COMPILER_FEATURES component _ret) cxx_thread_local cxx_variadic_templates ) + # Compiler feature for `context` same as for `fiber`. + set(_Boost_CONTEXT_COMPILER_FEATURES ${_Boost_FIBER_COMPILER_FEATURES}) endif() string(TOUPPER ${component} uppercomponent) set(${_ret} ${_Boost_${uppercomponent}_COMPILER_FEATURES} PARENT_SCOPE) |