diff options
| author | Stephen Kelly <steveire@gmail.com> | 2014-11-11 22:11:17 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2014-11-12 21:59:17 (GMT) |
| commit | 32b91b9e019774365029f98026ed0676708ce318 (patch) | |
| tree | c2b0366741ab450c34e473455b306c0869022e07 | |
| parent | 82c283f914c23df9e11cdc50f764bfa054540f54 (diff) | |
| download | CMake-32b91b9e019774365029f98026ed0676708ce318.zip CMake-32b91b9e019774365029f98026ed0676708ce318.tar.gz CMake-32b91b9e019774365029f98026ed0676708ce318.tar.bz2 | |
Features: Run GNU feature tests with std=c++14 when available.
| -rw-r--r-- | Modules/Compiler/GNU-CXX.cmake | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Modules/Compiler/GNU-CXX.cmake b/Modules/Compiler/GNU-CXX.cmake index 1050679..422bacd 100644 --- a/Modules/Compiler/GNU-CXX.cmake +++ b/Modules/Compiler/GNU-CXX.cmake @@ -24,7 +24,10 @@ elseif(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.3) set(CMAKE_CXX11_EXTENSION_COMPILE_OPTION "-std=gnu++0x") endif() -if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.8) +if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.9) + set(CMAKE_CXX14_STANDARD_COMPILE_OPTION "-std=c++14") + set(CMAKE_CXX14_EXTENSION_COMPILE_OPTION "-std=gnu++14") +elseif (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.8) set(CMAKE_CXX14_STANDARD_COMPILE_OPTION "-std=c++1y") set(CMAKE_CXX14_EXTENSION_COMPILE_OPTION "-std=gnu++1y") endif() |