diff options
| author | Stephen Kelly <steveire@gmail.com> | 2014-04-06 11:40:11 +0200 |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2014-04-16 15:16:23 +0200 |
| commit | a36b957fc4594264965a86b54e5eab40520cf79d (patch) | |
| tree | 08a5c7468d8095e5ccb34e1942d778303414e648 /Modules/CMakeDetermineCompileFeatures.cmake | |
| parent | 8472ef243ffc9988ea8fb83cbc7acdf3f0daa239 (diff) | |
| download | cmake-a36b957fc4594264965a86b54e5eab40520cf79d.tar.gz | |
Features: Add cxx_template_template_parameters.
Extend the existing feature infrastructure as needed to support
both C++11 and C++98 features.
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 40aa9d6fa4..583ff8dfac 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") |