diff options
| author | Brad King <brad.king@kitware.com> | 2016-11-30 20:25:39 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-12-02 16:22:46 (GMT) |
| commit | 24e29d4190e5ec87021cc11e7bc787b7245bb50b (patch) | |
| tree | 83e77add4f67cfb50df7495692b77da210cc5423 /Modules/Compiler | |
| parent | ae1a6815b6e2c0a45df51e994b75f9005e1794fe (diff) | |
| download | CMake-24e29d4190e5ec87021cc11e7bc787b7245bb50b.zip CMake-24e29d4190e5ec87021cc11e7bc787b7245bb50b.tar.gz CMake-24e29d4190e5ec87021cc11e7bc787b7245bb50b.tar.bz2 | |
Features: Activate C++ 17 support for GNU 5.1+
Diffstat (limited to 'Modules/Compiler')
| -rw-r--r-- | Modules/Compiler/GNU-CXX.cmake | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/Modules/Compiler/GNU-CXX.cmake b/Modules/Compiler/GNU-CXX.cmake index 4150d94..b04ea11 100644 --- a/Modules/Compiler/GNU-CXX.cmake +++ b/Modules/Compiler/GNU-CXX.cmake @@ -34,6 +34,11 @@ elseif (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.8) set(CMAKE_CXX14_EXTENSION_COMPILE_OPTION "-std=gnu++1y") endif() +if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.1) + set(CMAKE_CXX17_STANDARD_COMPILE_OPTION "-std=c++1z") + set(CMAKE_CXX17_EXTENSION_COMPILE_OPTION "-std=gnu++1z") +endif() + if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.4) if (NOT CMAKE_CXX_COMPILER_FORCED) if (NOT CMAKE_CXX_STANDARD_COMPUTED_DEFAULT) @@ -49,6 +54,9 @@ endif() macro(cmake_record_cxx_compile_features) set(_result 0) if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.4) + if(_result EQUAL 0 AND CMAKE_CXX17_STANDARD_COMPILE_OPTION) + _record_compiler_features_cxx(17) + endif() if(_result EQUAL 0 AND CMAKE_CXX14_STANDARD_COMPILE_OPTION) _record_compiler_features_cxx(14) endif() |