upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-04-15 08:31:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update to require C++17.

Browse Source 
This then also bumps the minimum GCC version to 7.
This commit is contained in:
Pentarctagon 2021-01-16 16:18:30 -06:00 committed by Pentarctagon
parent ef7d69b953
commit 90946ca262
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
.github/workflows/ci-main.yml vendored
View File

@ -67,7 +67,7 @@ jobs:
export TOOL=scons
export CC=clang
export CXX=clang++
export CXX_STD=14
export CXX_STD=17
export CFG=debug
export LTO=false
export CACHE_DIR=/home/wesnoth-CI/build
@ -97,7 +97,7 @@ jobs:
export TOOL=cmake
export CC=clang
export CXX=clang++
export CXX_STD=14
export CXX_STD=17
export CFG=release
export LTO=false
export CACHE_DIR=/home/wesnoth-CI/build
@ -119,7 +119,7 @@ jobs:
export TOOL=cmake
export CC=gcc
export CXX=g++
export CXX_STD=14
export CXX_STD=17
export CFG=debug
export LTO=false
export CACHE_DIR=/home/wesnoth-CI/build
@ -149,7 +149,7 @@ jobs:
export TOOL=scons
export CC=gcc
export CXX=g++
export CXX_STD=14
export CXX_STD=17
export CFG=release
export LTO=false
export CACHE_DIR=/home/wesnoth-CI/build
@ -171,7 +171,7 @@ jobs:
export TOOL=scons
export CC=gcc-9
export CXX=g++-9
export CXX_STD=14
export CXX_STD=17
export CFG=release
export LTO=false
export CACHE_DIR=/home/wesnoth-CI/build
@ -193,7 +193,7 @@ jobs:
export TOOL=scons
export CC=gcc
export CXX=g++
export CXX_STD=14
export CXX_STD=17
export CFG=release
export LTO=false
export CACHE_DIR=/home/wesnoth-CI/build
@ -215,7 +215,7 @@ jobs:
export TOOL=scons
export CC=gcc
export CXX=g++
export CXX_STD=14
export CXX_STD=17
export CFG=release
export LTO=false
export CACHE_DIR=/home/wesnoth-CI/build
@ -237,7 +237,7 @@ jobs:
export TOOL=scons
export CC=gcc
export CXX=g++
export CXX_STD=14
export CXX_STD=17
export CFG=release
export LTO=false
export CACHE_DIR=/home/wesnoth-CI/build

2
CMakeLists.txt
View File

@ -67,7 +67,7 @@ endif(ENABLE_MYSQL)
# set what std version to use
if(NOT CXX_STD)
set(CXX_STD "14")
set(CXX_STD "17")
endif()
set(CMAKE_CXX_STANDARD ${CXX_STD})
# make sure to force using it

4
SConstruct
View File

@ -109,7 +109,7 @@ opts.AddVariables(
BoolVariable('ccache', "Use ccache", False),
('ctool', 'Set c compiler command if not using standard compiler.'),
('cxxtool', 'Set c++ compiler command if not using standard compiler.'),
EnumVariable('cxx_std', 'Target c++ std version', '14', ['14', '17', '20']),
EnumVariable('cxx_std', 'Target c++ std version', '17', ['17', '20']),
('sanitize', 'Enable clang and GCC sanitizer functionality. A comma separated list of sanitize suboptions must be passed as value.', ''),
BoolVariable("fast", "Make scons faster at cost of less precise dependency tracking.", False),
BoolVariable("autorevision", 'Use autorevision tool to fetch current git revision that will be embedded in version string', True),
@ -371,7 +371,7 @@ if env["prereqs"]:
env["PKG_CONFIG_FLAGS"] = "--dont-define-prefix"
have_server_prereqs = (\
conf.CheckCPlusPlus(gcc_version = "5.4") & \
conf.CheckCPlusPlus(gcc_version = "7") & \
conf.CheckBoost("iostreams", require_version = boost_version) & \
conf.CheckBoostIostreamsGZip() & \
conf.CheckBoostIostreamsBZip2() & \