diff options
| author | Brad King <brad.king@kitware.com> | 2018-08-27 18:05:44 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-08-27 18:06:24 (GMT) |
| commit | 826e75814bf12434b989e19b18cd458abe5d0120 (patch) | |
| tree | 5f95b8eb5d656b060d67b54275ef0575d220dfa0 /Modules | |
| parent | 4431bb051617f34c0fa955faaa7a467b933cef17 (diff) | |
| parent | 5a655681c3d20cd15f4df074f5210a96d417fc60 (diff) | |
| download | CMake-826e75814bf12434b989e19b18cd458abe5d0120.zip CMake-826e75814bf12434b989e19b18cd458abe5d0120.tar.gz CMake-826e75814bf12434b989e19b18cd458abe5d0120.tar.bz2 | |
Merge topic 'cray_cce_cxx14'
5a655681c3 Cray: Record C++14 compiler mode options
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2307
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/Compiler/Cray-CXX.cmake | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Modules/Compiler/Cray-CXX.cmake b/Modules/Compiler/Cray-CXX.cmake index a1899e6..ff97e92 100644 --- a/Modules/Compiler/Cray-CXX.cmake +++ b/Modules/Compiler/Cray-CXX.cmake @@ -13,6 +13,10 @@ if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 8.1) if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 8.4) set(CMAKE_CXX11_STANDARD_COMPILE_OPTION -h std=c++11) set(CMAKE_CXX11_EXTENSION_COMPILE_OPTION -h std=c++11,gnu) + endif() + if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 8.6) + set(CMAKE_CXX14_STANDARD_COMPILE_OPTION -h std=c++14) + set(CMAKE_CXX14_EXTENSION_COMPILE_OPTION -h std=c++14,gnu) endif () endif () |