From c8209a51116a1a96eb85b8981d5c4f2eda7c65be Mon Sep 17 00:00:00 2001 From: Maarten Bent Date: Mon, 6 Apr 2020 23:10:06 +0200 Subject: [PATCH] CMake: Set wxBUILD_CXX_STANDARD globally instead of only on targets This way the tests in setup.cmake will use the correct c++ version. --- build/cmake/functions.cmake | 2 -- build/cmake/init.cmake | 4 ++++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/build/cmake/functions.cmake b/build/cmake/functions.cmake index 1c74202845..b9d862bbe8 100644 --- a/build/cmake/functions.cmake +++ b/build/cmake/functions.cmake @@ -78,8 +78,6 @@ function(wx_set_common_target_properties target_name) cmake_parse_arguments(wxCOMMON_TARGET_PROPS "DEFAULT_WARNINGS" "" "" ${ARGN}) if(DEFINED wxBUILD_CXX_STANDARD AND NOT wxBUILD_CXX_STANDARD STREQUAL COMPILER_DEFAULT) - # TODO: implement for older CMake versions ? - set_target_properties(${target_name} PROPERTIES CXX_STANDARD ${wxBUILD_CXX_STANDARD}) if( APPLE AND CMAKE_OSX_DEPLOYMENT_TARGET VERSION_LESS 10.9 AND diff --git a/build/cmake/init.cmake b/build/cmake/init.cmake index 32513f1241..659ce94da6 100644 --- a/build/cmake/init.cmake +++ b/build/cmake/init.cmake @@ -8,6 +8,10 @@ # Licence: wxWindows licence ############################################################################# +if(DEFINED wxBUILD_CXX_STANDARD AND NOT wxBUILD_CXX_STANDARD STREQUAL COMPILER_DEFAULT) + set(CMAKE_CXX_STANDARD ${wxBUILD_CXX_STANDARD}) +endif() + if(MSVC) # Determine MSVC runtime library flag set(MSVC_LIB_USE "/MD")