diff options
| author | Brad King <brad.king@kitware.com> | 2019-04-30 18:26:42 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2019-04-30 18:26:42 (GMT) |
| commit | d4a79a6ab3c8c0ca8c968f4d220b2540cb1f7f30 (patch) | |
| tree | bbb530082ec5181fced6309596e294652da4f831 | |
| parent | b947113b429b80bd6b3b14a62d2123718308e14a (diff) | |
| parent | f06bf0fa5740a82a4205b95a5de3e2a0e4eb865a (diff) | |
| download | CMake-d4a79a6ab3c8c0ca8c968f4d220b2540cb1f7f30.zip CMake-d4a79a6ab3c8c0ca8c968f4d220b2540cb1f7f30.tar.gz CMake-d4a79a6ab3c8c0ca8c968f4d220b2540cb1f7f30.tar.bz2 | |
Merge branch 'FindBoost-fix-fiber-compiler-features' into release-3.14
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 b5cc4cf..552c2fd 100644 --- a/Modules/FindBoost.cmake +++ b/Modules/FindBoost.cmake @@ -1048,11 +1048,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 @@ -1066,6 +1072,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) |