From 2c206e7b6e2ac77778f105cdcd7ed78892fc55bd Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Fri, 7 Oct 2022 02:34:45 +0200 Subject: [PATCH] Always require C++11 for CMake builds --- CMakeLists.txt | 3 +++ build/tools/appveyor.bat | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9c9f78b9dd..ee8fd239c1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -97,6 +97,9 @@ endif() project(wxWidgets VERSION ${wxVERSION} LANGUAGES ${wxLANGUAGES}) +set(CMAKE_CXX_STANDARD 11) +set(CMAKE_CXX_STANDARD_REQUIRED ON) + include(build/cmake/main.cmake) # Set the default startup project for Visual Studio diff --git a/build/tools/appveyor.bat b/build/tools/appveyor.bat index ed8c6800e4..999d555708 100644 --- a/build/tools/appveyor.bat +++ b/build/tools/appveyor.bat @@ -65,7 +65,7 @@ goto :eof :cmake_qt set SKIPINSTALL=1 set QT5DIR="C:\Qt\5.11\msvc2015_64" -set CMAKE_CONFIGURE_FLAGS=-DCMAKE_PREFIX_PATH=%QT5DIR% -DwxBUILD_TOOLKIT="qt" -DCMAKE_CXX_STANDARD=11 +set CMAKE_CONFIGURE_FLAGS=-DCMAKE_PREFIX_PATH=%QT5DIR% -DwxBUILD_TOOLKIT="qt" goto cmake :cmake