WIP: C++20. Some new gcc warnings. CI probably needs tweaking

Author: ptheywood

cmake/CheckCompilerFunctionality.cmake

@@ -85,8 +85,8 @@ function(flamegpu_check_compiler_functionality)
             CUDA_STD_FILESYSTEM
             "${CMAKE_CURRENT_BINARY_DIR}/try_compile"
             "${CMAKE_CURRENT_LIST_DIR}/CheckCompilerFunctionality/CheckStdFilesystem.cu"
-            CXX_STANDARD 17
-            CUDA_STANDARD 17
+            CXX_STANDARD 20
+            CUDA_STANDARD 20
             CXX_STANDARD_REQUIRED "ON"
         )
     endif()
@@ -122,8 +122,8 @@ function(flamegpu_check_compiler_functionality)
                 GCC_CUDA_STDCHRONO
                 "${CMAKE_CURRENT_BINARY_DIR}/try_compile"
                 "${CMAKE_CURRENT_LIST_DIR}/CheckCompilerFunctionality/CheckStdChrono.cu"
-                CXX_STANDARD 17
-                CUDA_STANDARD 17
+                CXX_STANDARD 20
+                CUDA_STANDARD 20
                 CXX_STANDARD_REQUIRED "ON"
             )
         endif()
@@ -164,8 +164,8 @@ function(flamegpu_check_compiler_functionality)
                 GCC_CUDA_VECTOR_TUPLE_PUSHBACK
                 "${CMAKE_CURRENT_BINARY_DIR}/try_compile"
                 "${CMAKE_CURRENT_LIST_DIR}/CheckCompilerFunctionality/CheckVectorTuplePushBack.cu"
-                CXX_STANDARD 17
-                CUDA_STANDARD 17
+                CXX_STANDARD 20
+                CUDA_STANDARD 20
                 CXX_STANDARD_REQUIRED "ON"
             )
         endif()
@@ -195,8 +195,8 @@ function(flamegpu_check_compiler_functionality)
             LINUX_F_OFD_SETLKW
             "${CMAKE_CURRENT_BINARY_DIR}/try_compile"
             "${CMAKE_CURRENT_LIST_DIR}/CheckCompilerFunctionality/F_OFD_SETLKW.cpp"
-            CXX_STANDARD 17
-            CUDA_STANDARD 17
+            CXX_STANDARD 20
+            CUDA_STANDARD 20
             CXX_STANDARD_REQUIRED "ON"
         )
         if(NOT LINUX_F_OFD_SETLKW)

cmake/common.cmake

@@ -242,7 +242,7 @@ function(flamegpu_configure_rc_file)
     endif()
 endfunction()
 
-function(flamegpu_target_cxx17)
+function(flamegpu_target_cxx20)
     cmake_parse_arguments(
         FTC
         ""
@@ -255,8 +255,8 @@ function(flamegpu_target_cxx17)
     elseif(NOT TARGET ${FTC_TARGET})
         message(FATAL_ERROR "${CMAKE_CURRENT_FUNCTION}: TARGET '${FTC_TARGET}' is not a valid target")
     endif()
-    target_compile_features(${FTC_TARGET} PUBLIC cxx_std_17)
-    target_compile_features(${FTC_TARGET} PUBLIC cuda_std_17)
+    target_compile_features(${FTC_TARGET} PUBLIC cxx_std_20)
+    target_compile_features(${FTC_TARGET} PUBLIC cuda_std_20)
     set_property(TARGET ${FTC_TARGET} PROPERTY CXX_EXTENSIONS OFF)
     set_property(TARGET ${FTC_TARGET} PROPERTY CUDA_EXTENSIONS OFF)
     set_property(TARGET ${FTC_TARGET} PROPERTY CXX_STANDARD_REQUIRED ON)
@@ -375,8 +375,8 @@ function(flamegpu_add_executable NAME SRC FLAMEGPU_ROOT PROJECT_ROOT IS_EXAMPLE)
     flamegpu_enable_compiler_warnings(TARGET "${NAME}")
     # Apply common compiler settings
     flamegpu_common_compiler_settings(TARGET "${NAME}")
-    # Set C++17 using modern CMake options
-    flamegpu_target_cxx17(TARGET "${NAME}")    
+    # Set C++20 using modern CMake options
+    flamegpu_target_cxx20(TARGET "${NAME}")    
 
     # Enable RDC for the target
     set_property(TARGET ${NAME} PROPERTY CUDA_SEPARABLE_COMPILATION ON)
@@ -430,8 +430,8 @@ function(flamegpu_add_library NAME SRC FLAMEGPU_ROOT PROJECT_ROOT IS_EXAMPLE)
     flamegpu_enable_compiler_warnings(TARGET "${NAME}")
     # Apply common compiler settings
     flamegpu_common_compiler_settings(TARGET "${NAME}")
-    # Set C++17 using modern CMake options
-    flamegpu_target_cxx17(TARGET "${NAME}")    
+    # Set C++20 using modern CMake options
+    flamegpu_target_cxx20(TARGET "${NAME}")    
 
     # Enable RDC for the target
     set_property(TARGET ${NAME} PROPERTY CUDA_SEPARABLE_COMPILATION ON)

src/CMakeLists.txt

@@ -495,9 +495,9 @@ unset(SRC_GROUP_MANUAL)
 # Define which source files are required for the target executable
 add_library(${PROJECT_NAME} STATIC ${ALL_SRC})
 
-# Require C++17 as a public target property for C++ and CUDA, with no extensions, and the standard is required
-target_compile_features(${PROJECT_NAME} PUBLIC cxx_std_17)
-target_compile_features(${PROJECT_NAME} PUBLIC cuda_std_17)
+# Require C++20 as a public target property for C++ and CUDA, with no extensions, and the standard is required
+target_compile_features(${PROJECT_NAME} PUBLIC cxx_std_20)
+target_compile_features(${PROJECT_NAME} PUBLIC cuda_std_20)
 set_property(TARGET ${PROJECT_NAME} PROPERTY CXX_EXTENSIONS OFF)
 set_property(TARGET ${PROJECT_NAME} PROPERTY CUDA_EXTENSIONS OFF)
 set_property(TARGET ${PROJECT_NAME} PROPERTY CXX_STANDARD_REQUIRED ON)

src/flamegpu/detail/JitifyCache.cu

@@ -429,8 +429,8 @@ std::unique_ptr<jitify2::LinkedProgramData> JitifyCache::buildProgram(
 #endif
 
 // pass the c++ language dialect. It may be better to explicitly pass this from CMake.
-#if defined(__cplusplus) && __cplusplus > 201700L && defined(__CUDACC_VER_MAJOR__) && __CUDACC_VER_MAJOR__ >= 11
-    options.push_back("--std=c++17");
+#if defined(__cplusplus) && __cplusplus >= 202002L && defined(__CUDACC_VER_MAJOR__) && __CUDACC_VER_MAJOR__ >= 12
+    options.push_back("--std=c++20");
 #endif
 
     // If FLAMEGPU_SEATBELTS is defined and false, forward it as off, otherwise forward it as on.

swig/python/CMakeLists.txt

@@ -105,8 +105,8 @@ set_property(TARGET ${PYTHON_SWIG_TARGET_NAME} PROPERTY CUDA_SEPARABLE_COMPILATI
 set_property(TARGET ${PYTHON_SWIG_TARGET_NAME} APPEND PROPERTY SWIG_GENERATED_COMPILE_DEFINITIONS "SWIG")
 
 # Require C++17 as a public target property for C++ and CUDA, with no extensions, and the standard is required
-target_compile_features(${PYTHON_SWIG_TARGET_NAME} PUBLIC cxx_std_17)
-target_compile_features(${PYTHON_SWIG_TARGET_NAME} PUBLIC cuda_std_17)
+target_compile_features(${PYTHON_SWIG_TARGET_NAME} PUBLIC cxx_std_20)
+target_compile_features(${PYTHON_SWIG_TARGET_NAME} PUBLIC cuda_std_20)
 set_property(TARGET ${PYTHON_SWIG_TARGET_NAME} PROPERTY CXX_EXTENSIONS OFF)
 set_property(TARGET ${PYTHON_SWIG_TARGET_NAME} PROPERTY CUDA_EXTENSIONS OFF)
 set_property(TARGET ${PYTHON_SWIG_TARGET_NAME} PROPERTY CXX_STANDARD_REQUIRED ON)