diff options
| author | Johannes Doerfert <johannes@jdoerfert.de> | 2020-02-11 17:08:48 -0600 |
|---|---|---|
| committer | Johannes Doerfert <johannes@jdoerfert.de> | 2020-02-11 17:11:54 -0600 |
| commit | 3ff4e2eee8c39fd4ae13b1df412f0af219fbf382 (patch) | |
| tree | effd86090f010466c42cbed87d2e90d3dfadb7da /openmp/cmake | |
| parent | d3a96fc082bef6a15f1ce8aed1849ff4122636dc (diff) | |
| download | llvm-3ff4e2eee8c39fd4ae13b1df412f0af219fbf382.tar.gz | |
[OpenMP] Switch default C++ standard to C++ 14
Reviewed By: JonChesterfield
Differential Revision: https://reviews.llvm.org/D74258
Diffstat (limited to 'openmp/cmake')
| -rw-r--r-- | openmp/cmake/HandleOpenMPOptions.cmake | 6 | ||||
| -rw-r--r-- | openmp/cmake/config-ix.cmake | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/openmp/cmake/HandleOpenMPOptions.cmake b/openmp/cmake/HandleOpenMPOptions.cmake index eb7b286b3383..15382bcf12de 100644 --- a/openmp/cmake/HandleOpenMPOptions.cmake +++ b/openmp/cmake/HandleOpenMPOptions.cmake @@ -29,7 +29,7 @@ append_if(OPENMP_HAVE_WNO_EXTRA_FLAG "-Wno-extra" CMAKE_C_FLAGS CMAKE_CXX_FLAGS) append_if(OPENMP_HAVE_WNO_PEDANTIC_FLAG "-Wno-pedantic" CMAKE_C_FLAGS CMAKE_CXX_FLAGS) append_if(OPENMP_HAVE_WNO_MAYBE_UNINITIALIZED_FLAG "-Wno-maybe-uninitialized" CMAKE_C_FLAGS CMAKE_CXX_FLAGS) -append_if(OPENMP_HAVE_STD_GNUPP11_FLAG "-std=gnu++11" CMAKE_CXX_FLAGS) -if (NOT OPENMP_HAVE_STD_GNUPP11_FLAG) - append_if(OPENMP_HAVE_STD_CPP11_FLAG "-std=c++11" CMAKE_CXX_FLAGS) +append_if(OPENMP_HAVE_STD_GNUPP14_FLAG "-std=gnu++14" CMAKE_CXX_FLAGS) +if (NOT OPENMP_HAVE_STD_GNUPP14_FLAG) + append_if(OPENMP_HAVE_STD_CPP14_FLAG "-std=c++14" CMAKE_CXX_FLAGS) endif() diff --git a/openmp/cmake/config-ix.cmake b/openmp/cmake/config-ix.cmake index ebb2530ae541..d9ea3bbb0574 100644 --- a/openmp/cmake/config-ix.cmake +++ b/openmp/cmake/config-ix.cmake @@ -14,5 +14,5 @@ check_cxx_compiler_flag(-Wno-extra OPENMP_HAVE_WNO_EXTRA_FLAG) check_cxx_compiler_flag(-Wno-pedantic OPENMP_HAVE_WNO_PEDANTIC_FLAG) check_cxx_compiler_flag(-Wno-maybe-uninitialized OPENMP_HAVE_WNO_MAYBE_UNINITIALIZED_FLAG) -check_cxx_compiler_flag(-std=gnu++11 OPENMP_HAVE_STD_GNUPP11_FLAG) -check_cxx_compiler_flag(-std=c++11 OPENMP_HAVE_STD_CPP11_FLAG) +check_cxx_compiler_flag(-std=gnu++14 OPENMP_HAVE_STD_GNUPP14_FLAG) +check_cxx_compiler_flag(-std=c++14 OPENMP_HAVE_STD_CPP14_FLAG) |