summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKelly (KT) Thompson <kgt@lanl.gov>2018-08-24 01:54:29 (GMT)
committerBrad King <brad.king@kitware.com>2018-08-24 19:15:53 (GMT)
commit5a655681c3d20cd15f4df074f5210a96d417fc60 (patch)
treec5b6d9dc34860b213280a0a409753a0bdee0a0fd
parentb2798594a5010849c84facb929516f5a78fc5ea4 (diff)
downloadCMake-5a655681c3d20cd15f4df074f5210a96d417fc60.zip
CMake-5a655681c3d20cd15f4df074f5210a96d417fc60.tar.gz
CMake-5a655681c3d20cd15f4df074f5210a96d417fc60.tar.bz2
Cray: Record C++14 compiler mode options
Fixes: #18270
-rw-r--r--Modules/Compiler/Cray-CXX.cmake4
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 ()