Cleanup

Author: ClausKlein

CMakeLists.txt

@@ -91,7 +91,7 @@ if(CMAKE_GENERATOR STREQUAL "Ninja" AND FMT_USE_MODULES)
                             ${LLVM_LIBC_SOURCE}/std.cppm
                             ${LLVM_LIBC_SOURCE}/std.compat.cppm
             )
-            target_compile_features(${NAME} PUBLIC cxx_std_26)
+            target_compile_features(${NAME} PUBLIC cxx_std_23)
             target_compile_definitions(
                 ${NAME}
                 PUBLIC _LIBCPP_HAS_NO_LOCALIZATION
@@ -110,13 +110,13 @@ if(CMAKE_GENERATOR STREQUAL "Ninja" AND FMT_USE_MODULES)
         CMAKE_CXX_COMPILER_ID STREQUAL "GNU"
         AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 15.0
     )
-        add_compile_options(-stdlib=libc++)
-        add_link_options(-stdlib=libc++)
+        add_compile_options(-stdlib=libstdc++)
+        add_link_options(-stdlib=libstdc++)
     endif()
 
     # Tell CMake that we explicitly want `import std`.
     # This will initialize the property on all targets declared after this to 1
-    if(26 IN_LIST CMAKE_CXX_COMPILER_IMPORT_STD)
+    if(23 IN_LIST CMAKE_CXX_COMPILER_IMPORT_STD)
         # XXX NO! set(CMAKE_CXX_MODULE_STD ON)
     endif()
 
@@ -195,7 +195,7 @@ target_sources(
 )
 
 target_compile_definitions(fmt-header-only INTERFACE FMT_HEADER_ONLY)
-target_compile_features(fmt-header-only INTERFACE cxx_std_26)
+target_compile_features(fmt-header-only INTERFACE cxx_std_23)
 
 # Unicode support requires compiling with /utf-8.
 target_compile_options(
@@ -221,7 +221,7 @@ if(FMT_SEPARATE_COMPILATION)
         fmt
         PUBLIC $<$<AND:$<COMPILE_LANGUAGE:CXX>,$<CXX_COMPILER_ID:MSVC>>:/utf-8>
     )
-    target_compile_features(fmt INTERFACE cxx_std_26)
+    target_compile_features(fmt INTERFACE cxx_std_23)
 
     if(FMT_USE_MODULES)
         message(STATUS "FMT_USE_MODULES=${FMT_USE_MODULES}")

CMakePresets.json

@@ -68,8 +68,8 @@
       },
       "environment": {
         "CXX": "clang++",
-        "LLVM_ROOT": "/usr/lib/llvm-19",
-        "PATH": "$env{LLVM_ROOT}/bin:$penv{PATH}"
+        "LLVM_DIR": "/usr/lib/llvm-20",
+        "PATH": "$env{LLVM_DIR}/bin:$penv{PATH}"
       },
       "condition": {
         "type": "equals",