nullptr c23

Author: scivision

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.25...4.2)
+cmake_minimum_required(VERSION 3.25...4.4)
 # 3.19 for CheckSourceCompiles
 # 3.25 for block()
 

test/nullptr/CMakeLists.txt

@@ -1,12 +1,28 @@
 set_property(DIRECTORY PROPERTY LABELS nullptr)
 
+block()
+set(CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY)
+set(CMAKE_C_STANDARD 23)
+# test has nullptr_t otherwise you're testing for a macro but not the type
+check_source_compiles(C "#include <stddef.h>
+nullptr_t p = nullptr;"
+c23_nullptr
+)
+endblock()
+
+if(c23_nullptr)
 add_library(c_nullptr OBJECT lib.c)
-target_include_directories(c_nullptr PRIVATE .)
+target_include_directories(c_nullptr PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
+target_compile_features(c_nullptr PRIVATE c_std_23)
+endif()
+
 add_library(cpp_nullptr OBJECT lib.cpp)
-target_include_directories(cpp_nullptr PRIVATE .)
+target_include_directories(cpp_nullptr PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
 
+if(TARGET c_nullptr)
 add_executable(C_Fortran_nullptr main.f90 $<TARGET_OBJECTS:c_nullptr>)
 add_test(NAME C_Nullptr COMMAND C_Fortran_nullptr)
+endif()
 
 add_executable(Cpp_Fortran_nullptr main.f90 $<TARGET_OBJECTS:cpp_nullptr>)
 set_property(TARGET Cpp_Fortran_nullptr PROPERTY LINKER_LANGUAGE ${linker_lang})

test/nullptr/lib.c

@@ -1,6 +1,9 @@
-#include <nullptr.h>
 #include <stddef.h>
 
+#if __STDC_VERSION__ < 202311L
+#include <stdbool.h>
+#endif
+
 const char* nullchar(bool b) {
-  return b ? NULL : "hello";
+  return b ? nullptr : "hello";
 }