diff options
author | Brad King <brad.king@kitware.com> | 2016-11-30 20:26:35 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2016-12-02 16:22:47 (GMT) |
commit | 85c8e652b10f35969dee9ada0784ca70c0f8719c (patch) | |
tree | 391058b7b2d248017296ac8c4df6c6be68c8c9a4 /Modules/Compiler/AppleClang-CXX.cmake | |
parent | 8084f7a6c9d5ed6059d37abde2c5e4a68cb01157 (diff) | |
download | CMake-85c8e652b10f35969dee9ada0784ca70c0f8719c.zip CMake-85c8e652b10f35969dee9ada0784ca70c0f8719c.tar.gz CMake-85c8e652b10f35969dee9ada0784ca70c0f8719c.tar.bz2 |
Features: Activate C++ 17 support for AppleClang 6.1+
Diffstat (limited to 'Modules/Compiler/AppleClang-CXX.cmake')
-rw-r--r-- | Modules/Compiler/AppleClang-CXX.cmake | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/Modules/Compiler/AppleClang-CXX.cmake b/Modules/Compiler/AppleClang-CXX.cmake index afb9aff..ee900ae 100644 --- a/Modules/Compiler/AppleClang-CXX.cmake +++ b/Modules/Compiler/AppleClang-CXX.cmake @@ -22,6 +22,11 @@ elseif(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.1) set(CMAKE_CXX14_EXTENSION_COMPILE_OPTION "-std=gnu++1y") endif() +if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 6.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.0) if (NOT CMAKE_CXX_COMPILER_FORCED) if (NOT CMAKE_CXX_STANDARD_COMPUTED_DEFAULT) @@ -38,6 +43,9 @@ endif() macro(cmake_record_cxx_compile_features) set(_result 0) if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.0) + 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() |