diff options
| author | Brad King <brad.king@kitware.com> | 2014-04-30 13:42:00 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-04-30 13:42:00 (GMT) |
| commit | 8535d4cf5dbe1f48a7da7bece7e435a2bd412eee (patch) | |
| tree | 1d777bb9a49e9a8f95efff1e8ab36aba1e3f7ec8 /Modules/CMakeDetermineCompileFeatures.cmake | |
| parent | a676ced3464cb7bea7b26f9f2bf235f0e70c4145 (diff) | |
| parent | a36b957fc4594264965a86b54e5eab40520cf79d (diff) | |
| download | CMake-8535d4cf5dbe1f48a7da7bece7e435a2bd412eee.zip CMake-8535d4cf5dbe1f48a7da7bece7e435a2bd412eee.tar.gz CMake-8535d4cf5dbe1f48a7da7bece7e435a2bd412eee.tar.bz2 | |
Merge topic 'cxx98-features'
a36b957f Features: Add cxx_template_template_parameters.
Diffstat (limited to 'Modules/CMakeDetermineCompileFeatures.cmake')
| -rw-r--r-- | Modules/CMakeDetermineCompileFeatures.cmake | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/Modules/CMakeDetermineCompileFeatures.cmake b/Modules/CMakeDetermineCompileFeatures.cmake index 40aa9d6..583ff8d 100644 --- a/Modules/CMakeDetermineCompileFeatures.cmake +++ b/Modules/CMakeDetermineCompileFeatures.cmake @@ -17,6 +17,7 @@ function(cmake_determine_compile_features lang) if(lang STREQUAL CXX AND COMMAND cmake_record_cxx_compile_features) message(STATUS "Detecting ${lang} compile features") + set(CMAKE_CXX98_COMPILE_FEATURES) set(CMAKE_CXX11_COMPILE_FEATURES) include("${CMAKE_ROOT}/Modules/Internal/FeatureTesting.cmake") @@ -28,13 +29,19 @@ function(cmake_determine_compile_features lang) return() endif() + if (CMAKE_CXX98_COMPILE_FEATURES) + list(REMOVE_ITEM CMAKE_CXX11_COMPILE_FEATURES ${CMAKE_CXX98_COMPILE_FEATURES}) + endif() + if(NOT CMAKE_CXX_COMPILE_FEATURES) set(CMAKE_CXX_COMPILE_FEATURES + ${CMAKE_CXX98_COMPILE_FEATURES} ${CMAKE_CXX11_COMPILE_FEATURES} ) endif() set(CMAKE_CXX_COMPILE_FEATURES ${CMAKE_CXX_COMPILE_FEATURES} PARENT_SCOPE) + set(CMAKE_CXX98_COMPILE_FEATURES ${CMAKE_CXX98_COMPILE_FEATURES} PARENT_SCOPE) set(CMAKE_CXX11_COMPILE_FEATURES ${CMAKE_CXX11_COMPILE_FEATURES} PARENT_SCOPE) message(STATUS "Detecting ${lang} compile features - done") |