From 1c3f594087a54966b525ecb6a73031a05608632b Mon Sep 17 00:00:00 2001 From: JosJuice Date: Wed, 3 Mar 2021 23:44:35 +0100 Subject: [PATCH] CMake: Build with -std:c++latest for MSVC Making CMake match MSBuild in this aspect will hopefully reduce how often we accidentally break the MSVC CMake build. --- Source/CMakeLists.txt | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt index 61b3695cfe..3f0afcaf34 100644 --- a/Source/CMakeLists.txt +++ b/Source/CMakeLists.txt @@ -16,7 +16,13 @@ if(CMAKE_SYSTEM_NAME MATCHES "Windows") add_definitions(-D_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING) endif() -set(CMAKE_CXX_STANDARD 17) +if (MSVC) + set(CMAKE_CXX_STANDARD 20) + set(CMAKE_CXX20_STANDARD_COMPILE_OPTION "-std:c++latest") +else() + set(CMAKE_CXX_STANDARD 17) +endif() + set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_EXTENSIONS OFF) set(CMAKE_EXPORT_COMPILE_COMMANDS ON)