Skip to content

Commit c9c926f

Browse files
committed
bump c++20 to c++23
1 parent cbdad21 commit c9c926f

File tree

7 files changed

+12
-12
lines changed

7 files changed

+12
-12
lines changed

cmake/includeos.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#includeos standard settings for compilation and linkers
22

3-
set(CMAKE_CXX_STANDARD 20)
3+
set(CMAKE_CXX_STANDARD 23)
44
set(CMAKE_CXX_STANDARD_REQUIRED ON)
55
set(CMAKE_CXX_EXTENSIONS OFF)
66

cmake/library.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,11 @@ if (debug)
5757
endif()
5858

5959
if (CMAKE_COMPILER_IS_GNUCC)
60-
set(CMAKE_CXX_FLAGS "-m32 -MMD ${CAPABS} ${WARNS} -nostdlib -fno-omit-frame-pointer -c -std=c++20 -D_LIBCPP_HAS_NO_THREADS=1")
60+
set(CMAKE_CXX_FLAGS "-m32 -MMD ${CAPABS} ${WARNS} -nostdlib -fno-omit-frame-pointer -c -std=c++23 -D_LIBCPP_HAS_NO_THREADS=1")
6161
set(CMAKE_C_FLAGS "-m32 -MMD ${CAPABS} ${WARNS} -nostdlib -fno-omit-frame-pointer -c")
6262
else()
6363
# these kinda work with llvm
64-
set(CMAKE_CXX_FLAGS "-MMD ${CAPABS} ${OPTIMIZE} ${WARNS} -nostdlib -nostdlibinc -fno-omit-frame-pointer -c -std=c++20 -fno-threadsafe-statics -D_LIBCPP_HAS_NO_THREADS=1")
64+
set(CMAKE_CXX_FLAGS "-MMD ${CAPABS} ${OPTIMIZE} ${WARNS} -nostdlib -nostdlibinc -fno-omit-frame-pointer -c -std=c++23 -fno-threadsafe-statics -D_LIBCPP_HAS_NO_THREADS=1")
6565
set(CMAKE_C_FLAGS "-MMD ${CAPABS} ${OPTIMIZE} ${WARNS} -nostdlib -nostdlibinc -fno-omit-frame-pointer -c")
6666
endif()
6767

cmake/linux.service.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
# Linux Userspace CMake script #
33
####################################
44

5-
#set(CMAKE_CXX_STANDARD 20)
5+
#set(CMAKE_CXX_STANDARD 23)
66
set(COMMON "-g -O2 -Wall -Wextra")
7-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++20 ${COMMON}")
7+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++23 ${COMMON}")
88
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${COMMON}")
99

1010
option(BUILD_PLUGINS "Build all plugins as libraries" OFF)

cmake/os.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ if (NOT CMAKE_BUILD_TYPE)
22
set(CMAKE_BUILD_TYPE "Release")
33
endif()
44

5-
set (CMAKE_CXX_STANDARD 20)
5+
set (CMAKE_CXX_STANDARD 23)
66
set (CMAKE_CXX_STANDARD_REQUIRED ON)
77

88

lib/LiveUpdate/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ set(CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY)
44

55
project(includeos C CXX)
66

7-
set(CMAKE_CXX_STANDARD 20)
7+
set(CMAKE_CXX_STANDARD 23)
88
set(CMAKE_CXX_STANDARD_REQUIRED ON)
99
set(CMAKE_CXX_EXTENSIONS OFF)
1010

test/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
cmake_minimum_required(VERSION 3.31.6)
22

33
project(unittests C CXX)
4-
set(CMAKE_CXX_STANDARD 20)
4+
set(CMAKE_CXX_STANDARD 23)
55
set(CMAKE_CXX_STANDARD_REQUIRED ON)
66
set(CMAKE_CXX_EXTENSIONS OFF)
77

@@ -46,7 +46,7 @@ if (DEBUG_INFO)
4646
set(NO_DEBUG "")
4747
endif()
4848

49-
set(CMAKE_CXX_FLAGS "-g -O0 -std=c++20 -Wall -Wextra -Wno-frame-address -Wno-unused-function -Wno-int-to-pointer-cast -D__id_t_defined -DUNITTESTS -DURI_THROW_ON_ERROR ${NO_INFO} ${NO_DEBUG} -DGSL_THROW_ON_CONTRACT_VIOLATION -Dlest_FEATURE_AUTO_REGISTER=1 -DHAVE_LEST_MAIN -DPAGE_SIZE=4096")
49+
set(CMAKE_CXX_FLAGS "-g -O0 -std=c++23 -Wall -Wextra -Wno-frame-address -Wno-unused-function -Wno-int-to-pointer-cast -D__id_t_defined -DUNITTESTS -DURI_THROW_ON_ERROR ${NO_INFO} ${NO_DEBUG} -DGSL_THROW_ON_CONTRACT_VIOLATION -Dlest_FEATURE_AUTO_REGISTER=1 -DHAVE_LEST_MAIN -DPAGE_SIZE=4096")
5050

5151
set(TEST ${CMAKE_CURRENT_SOURCE_DIR})
5252

vmbuild/CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@ project (vmbuilder)
44

55
include(CheckCXXCompilerFlag)
66
set(CMAKE_BUILD_TYPE Release)
7-
check_cxx_compiler_flag(-std=c++20 HAVE_FLAG_STD_CXX20)
7+
check_cxx_compiler_flag(-std=c++23 HAVE_FLAG_STD_CXX20)
88
if(NOT HAVE_FLAG_STD_CXX20)
9-
message(FATAL_ERROR "The provided compiler: " ${CMAKE_CXX_COMPILER} "\n does not support c++20 standard please make sure your CC and CXX points to a compiler that supports c++20")
9+
message(FATAL_ERROR "The provided compiler: " ${CMAKE_CXX_COMPILER} "\n does not support c++23 standard please make sure your CC and CXX points to a compiler that supports c++23")
1010
endif()
1111

1212
set(SOURCES vmbuild.cpp)
1313
set(ELF_SYMS_SOURCES elf_syms.cpp ../src/util/crc32.cpp)
1414

15-
set(CMAKE_CXX_STANDARD 20)
15+
set(CMAKE_CXX_STANDARD 23)
1616
set(CMAKE_CXX_STANDARD_REQUIRED ON)
1717
set(CMAKE_CXX_FLAGS "-Wall -Wextra -O2 -g")
1818

0 commit comments

Comments
 (0)