diff options
| author | Lukas Rusak <lorusak@gmail.com> | 2020-09-10 10:27:17 -0700 |
|---|---|---|
| committer | Lukas Rusak <lorusak@gmail.com> | 2020-09-18 07:26:42 -0700 |
| commit | 345166dbedd495c65ebbb412545eab6347de4b85 (patch) | |
| tree | d039c0cbd4bff37666f8a84ff4c5253cf0ace437 /cmake | |
| parent | 58e9d3e6e3ead006a5cf967d3f66e0e720b629ff (diff) | |
cmake: use c++17
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/scripts/common/CompilerSettings.cmake | 4 | ||||
| -rw-r--r-- | cmake/scripts/windowsstore/ArchSetup.cmake | 1 |
2 files changed, 1 insertions, 4 deletions
diff --git a/cmake/scripts/common/CompilerSettings.cmake b/cmake/scripts/common/CompilerSettings.cmake index b4e7e89220..bb0af925ce 100644 --- a/cmake/scripts/common/CompilerSettings.cmake +++ b/cmake/scripts/common/CompilerSettings.cmake @@ -1,7 +1,5 @@ # Languages and global compiler settings -if(NOT DEFINED CMAKE_CXX_STANDARD OR CMAKE_CXX_STANDARD LESS 14) - set(CMAKE_CXX_STANDARD 14) -endif() +set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_EXTENSIONS OFF) set(CMAKE_ASM_FLAGS "${CMAKE_C_FLAGS} -x assembler-with-cpp") diff --git a/cmake/scripts/windowsstore/ArchSetup.cmake b/cmake/scripts/windowsstore/ArchSetup.cmake index ad55a01ac8..9473a4bb61 100644 --- a/cmake/scripts/windowsstore/ArchSetup.cmake +++ b/cmake/scripts/windowsstore/ArchSetup.cmake @@ -79,7 +79,6 @@ list(APPEND SYSTEM_DEFINES -DHAS_WIN10_NETWORK) # The /MP option enables /FS by default. set(CMAKE_CXX_FLAGS "/MP ${CMAKE_CXX_FLAGS} /EHsc /await") -set(CMAKE_CXX_STANDARD 17) # Google Test needs to use shared version of runtime libraries set(gtest_force_shared_crt ON CACHE STRING "" FORCE) |