mirror of
https://github.com/TomHarte/CLK.git
synced 2026-04-20 10:17:05 +00:00
Bump to C++20.
This commit is contained in:
+1
-1
@@ -5,7 +5,7 @@ project(CLK
|
||||
VERSION 24.01.22
|
||||
)
|
||||
|
||||
set(CMAKE_CXX_STANDARD 17)
|
||||
set(CMAKE_CXX_STANDARD 20)
|
||||
set(CMAKE_CXX_STANDARD_REQUIRED ON)
|
||||
set(CMAKE_CXX_EXTENSIONS OFF)
|
||||
|
||||
|
||||
@@ -7007,7 +7007,7 @@
|
||||
ALWAYS_SEARCH_USER_PATHS = NO;
|
||||
ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
|
||||
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
|
||||
CLANG_CXX_LANGUAGE_STANDARD = "c++17";
|
||||
CLANG_CXX_LANGUAGE_STANDARD = "c++20";
|
||||
CLANG_ENABLE_MODULES = YES;
|
||||
CLANG_ENABLE_OBJC_ARC = YES;
|
||||
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
|
||||
@@ -7069,7 +7069,7 @@
|
||||
ALWAYS_SEARCH_USER_PATHS = NO;
|
||||
ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
|
||||
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
|
||||
CLANG_CXX_LANGUAGE_STANDARD = "c++17";
|
||||
CLANG_CXX_LANGUAGE_STANDARD = "c++20";
|
||||
CLANG_ENABLE_MODULES = YES;
|
||||
CLANG_ENABLE_OBJC_ARC = YES;
|
||||
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
|
||||
|
||||
@@ -3,8 +3,8 @@ greaterThan(5, QT_MAJOR_VERSION) QT += openglwidgets
|
||||
|
||||
# Be specific about C++17 but also try the vaguer C++1z for older
|
||||
# versions of Qt.
|
||||
CONFIG += c++17
|
||||
CONFIG += c++1z
|
||||
CONFIG += c++20
|
||||
CONFIG += c++2a
|
||||
|
||||
# Permit multiple source files in different directories to have the same file name.
|
||||
CONFIG += object_parallel_to_source
|
||||
|
||||
@@ -139,8 +139,8 @@ SOURCES += glob.glob('../../Storage/Tape/*.cpp')
|
||||
SOURCES += glob.glob('../../Storage/Tape/Formats/*.cpp')
|
||||
SOURCES += glob.glob('../../Storage/Tape/Parsers/*.cpp')
|
||||
|
||||
# Add additional compiler flags; c++1z is insurance in case c++17 isn't fully implemented.
|
||||
env.Append(CCFLAGS = ['--std=c++17', '--std=c++1z', '-Wall', '-O2', '-DNDEBUG', '-I../..'])
|
||||
# Add additional compiler flags; c++2a is insurance in case c++20 isn't fully implemented.
|
||||
env.Append(CCFLAGS = ['--std=c++20', '--std=c++2a', '-Wall', '-O2', '-DNDEBUG', '-I../..'])
|
||||
|
||||
# Add additional libraries to link against.
|
||||
env.Append(LIBS = ['libz', 'pthread'])
|
||||
|
||||
Reference in New Issue
Block a user