From 4122511e762048719fd9fe2058862ed3e930eebd Mon Sep 17 00:00:00 2001 From: Maarten Bent Date: Tue, 7 Apr 2020 18:24:37 +0200 Subject: [PATCH] CMake: Add c++20 option, enable setting c++ version for MSVC MSVC supports setting the CMAKE_CXX_STANDARD since VS2015 update 2. --- build/cmake/options.cmake | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/build/cmake/options.cmake b/build/cmake/options.cmake index 5417d4a136..bb5a205015 100644 --- a/build/cmake/options.cmake +++ b/build/cmake/options.cmake @@ -36,15 +36,17 @@ endif() if(MSVC) wx_option(wxBUILD_MSVC_MULTIPROC "Enable multi-processor compilation for MSVC") -else() - # Other compilers support setting the C++ standard, present it an option to the user +endif() + +if(NOT MSVC OR MSVC_VERSION GREATER 1800) + # support setting the C++ standard, present it an option to the user if(DEFINED CMAKE_CXX_STANDARD) set(wxCXX_STANDARD_DEFAULT ${CMAKE_CXX_STANDARD}) else() set(wxCXX_STANDARD_DEFAULT COMPILER_DEFAULT) endif() wx_option(wxBUILD_CXX_STANDARD "C++ standard used to build wxWidgets targets" - ${wxCXX_STANDARD_DEFAULT} STRINGS COMPILER_DEFAULT 98 11 14 17) + ${wxCXX_STANDARD_DEFAULT} STRINGS COMPILER_DEFAULT 98 11 14 17 20) endif() if(WIN32)