Skip to content

Commit 92e5ff6

Browse files
committed
CMake: Require c++20
1 parent 18da5e6 commit 92e5ff6

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

cmake/CheckCompilerFunctionality.cmake

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,8 @@ function(flamegpu_visualiser_check_compiler_functionality)
8585
CUDA_STD_FILESYSTEM
8686
"${CMAKE_CURRENT_BINARY_DIR}/try_compile"
8787
"${CMAKE_CURRENT_LIST_DIR}/CheckCompilerFunctionality/CheckStdFilesystem.cu"
88-
CXX_STANDARD 17
89-
CUDA_STANDARD 17
88+
CXX_STANDARD 20
89+
CUDA_STANDARD 20
9090
CXX_STANDARD_REQUIRED "ON"
9191
)
9292
endif()
@@ -122,8 +122,8 @@ function(flamegpu_visualiser_check_compiler_functionality)
122122
GCC_CUDA_STDCHRONO
123123
"${CMAKE_CURRENT_BINARY_DIR}/try_compile"
124124
"${CMAKE_CURRENT_LIST_DIR}/CheckCompilerFunctionality/CheckStdChrono.cu"
125-
CXX_STANDARD 17
126-
CUDA_STANDARD 17
125+
CXX_STANDARD 20
126+
CUDA_STANDARD 20
127127
CXX_STANDARD_REQUIRED "ON"
128128
)
129129
endif()
@@ -164,8 +164,8 @@ function(flamegpu_visualiser_check_compiler_functionality)
164164
GCC_CUDA_VECTOR_TUPLE_PUSHBACK
165165
"${CMAKE_CURRENT_BINARY_DIR}/try_compile"
166166
"${CMAKE_CURRENT_LIST_DIR}/CheckCompilerFunctionality/CheckVectorTuplePushBack.cu"
167-
CXX_STANDARD 17
168-
CUDA_STANDARD 17
167+
CXX_STANDARD 20
168+
CUDA_STANDARD 20
169169
CXX_STANDARD_REQUIRED "ON"
170170
)
171171
endif()

src/CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -229,9 +229,9 @@ include(${CMAKE_CURRENT_LIST_DIR}/../cmake/CommonCompilerSettings.cmake)
229229
# Define output
230230
add_library("${PROJECT_NAME}" STATIC ${VISUALISER_ALL})
231231

232-
# Require C++17 as a public target property for C++ and CUDA, with no extensions, and the standard is required
233-
target_compile_features(${PROJECT_NAME} PUBLIC cxx_std_17)
234-
target_compile_features(${PROJECT_NAME} PUBLIC cuda_std_17)
232+
# Require C++20 as a public target property for C++ and CUDA, with no extensions, and the standard is required
233+
target_compile_features(${PROJECT_NAME} PUBLIC cxx_std_20)
234+
target_compile_features(${PROJECT_NAME} PUBLIC cuda_std_20)
235235
set_property(TARGET ${PROJECT_NAME} PROPERTY CXX_EXTENSIONS OFF)
236236
set_property(TARGET ${PROJECT_NAME} PROPERTY CUDA_EXTENSIONS OFF)
237237
set_property(TARGET ${PROJECT_NAME} PROPERTY CXX_STANDARD_REQUIRED ON)

0 commit comments

Comments
 (0)