Last try

Author: ClausKlein

CMakeLists.txt

@@ -16,7 +16,7 @@ set(CPPdefinitions)
 
 option(FMT_SEPARATE_COMPILATION "build fmt lib too" ${PROJECT_IS_TOP_LEVEL})
 option(FMT_USE_MODULES "Export a CXX_MODULE asio if possible" ${PROJECT_IS_TOP_LEVEL})
-option(FMT_IMPORT_STD "Import the CXX_MODULE std if possible" NO)
+option(FMT_IMPORT_STD "Import the all std header needed" YES)
 
 if(FMT_IMPORT_STD)
   list(APPEND CPPdefinitions FMT_IMPORT_STD)
@@ -28,11 +28,14 @@ if(FMT_USE_MODULES)
   # FIXME: add_compile_options(-Wno-reserved-module-identifier -Wno-include-angled-in-module-purview)
 
   if(FMT_IMPORT_STD) # FIXME: clang++ only! AND $ENV{LLVM_ROOT})
-    set(CMAKE_CXX_COMPILER_IMPORT_STD 23)
-    add_compile_options(-fexperimental-library)
-    add_link_options(-lc++experimental)
-    add_compile_options(-stdlib=libc++)
-    add_link_options(-stdlib=libc++)
+
+    if(UNIX)
+      set(CMAKE_CXX_COMPILER_IMPORT_STD 23)
+      add_compile_options(-fexperimental-library)
+      add_link_options(-lc++experimental)
+      add_compile_options(-stdlib=libc++)
+      add_link_options(-stdlib=libc++)
+    endif()
 
     message(STATUS "CMAKE_CXX_COMPILER_IMPORT_STD=${CMAKE_CXX_COMPILER_IMPORT_STD}")
   endif()

module/fmt.cppm

@@ -2,95 +2,100 @@
 module;
 #endif
 
+#ifndef FMT_IMPORT_STD_MODULE
+
 // Put all implementation-provided headers into the global module fragment
 // to prevent attachment to this module.
-#ifndef FMT_IMPORT_STD
-#  include <algorithm>
-#  include <bitset>
-#  include <chrono>
-#  include <cmath>
-#  include <complex>
-#  include <cstddef>
-#  include <cstdint>
-#  include <cstdio>
-#  include <cstdlib>
-#  include <cstring>
-#  include <ctime>
-#  include <exception>
-#  include <expected>
-#  include <filesystem>
-#  include <fstream>
-#  include <functional>
-#  include <iterator>
-#  include <limits>
-#  include <locale>
-#  include <memory>
-#  include <optional>
-#  include <ostream>
-#  include <source_location>
-#  include <stdexcept>
-#  include <string>
-#  include <string_view>
-#  include <system_error>
-#  include <thread>
-#  include <type_traits>
-#  include <typeinfo>
-#  include <utility>
-#  include <variant>
-#  include <vector>
-#else
-#  include <limits.h>
-#  include <stdint.h>
-#  include <stdio.h>
-#  include <time.h>
-#endif
-#include <cerrno>
-#include <climits>
-#include <version>
+#  ifndef FMT_IMPORT_STD
+#    include <algorithm>
+#    include <bitset>
+#    include <chrono>
+#    include <cmath>
+#    include <complex>
+#    include <cstddef>
+#    include <cstdint>
+#    include <cstdio>
+#    include <cstdlib>
+#    include <cstring>
+#    include <ctime>
+#    include <exception>
+#    include <expected>
+#    include <filesystem>
+#    include <fstream>
+#    include <functional>
+#    include <iterator>
+#    include <limits>
+#    include <locale>
+#    include <memory>
+#    include <optional>
+#    include <ostream>
+#    include <source_location>
+#    include <stdexcept>
+#    include <string>
+#    include <string_view>
+#    include <system_error>
+#    include <thread>
+#    include <type_traits>
+#    include <typeinfo>
+#    include <utility>
+#    include <variant>
+#    include <vector>
+#  else
+#    include <limits.h>
+#    include <stdint.h>
+#    include <stdio.h>
+#    include <time.h>
+#  endif
+#  include <cerrno>
+#  include <climits>
+#  include <version>
 
-#if __has_include(<cxxabi.h>)
-#  include <cxxabi.h>
-#endif
-#if defined(_MSC_VER) || defined(__MINGW32__)
-#  include <intrin.h>
-#endif
-#if defined __APPLE__ || defined(__FreeBSD__)
-#  include <xlocale.h>
-#endif
-#if __has_include(<winapifamily.h>)
-#  include <winapifamily.h>
-#endif
-#if (__has_include(<fcntl.h>) || defined(__APPLE__) || \
+#  if __has_include(<cxxabi.h>)
+#    include <cxxabi.h>
+#  endif
+#  if defined(_MSC_VER) || defined(__MINGW32__)
+#    include <intrin.h>
+#  endif
+#  if defined __APPLE__ || defined(__FreeBSD__)
+#    include <xlocale.h>
+#  endif
+#  if __has_include(<winapifamily.h>)
+#    include <winapifamily.h>
+#  endif
+#  if (__has_include(<fcntl.h>) || defined(__APPLE__) || \
      defined(__linux__)) &&                            \
     (!defined(WINAPI_FAMILY) || (WINAPI_FAMILY == WINAPI_FAMILY_DESKTOP_APP))
-#  include <fcntl.h>
-#  include <sys/stat.h>
-#  include <sys/types.h>
-#  ifndef _WIN32
-#    include <unistd.h>
-#  else
-#    include <io.h>
+#    include <fcntl.h>
+#    include <sys/stat.h>
+#    include <sys/types.h>
+#    ifndef _WIN32
+#      include <unistd.h>
+#    else
+#      include <io.h>
+#    endif
 #  endif
-#endif
-#ifdef _WIN32
-#  if defined(__GLIBCXX__)
-#    include <ext/stdio_filebuf.h>
-#    include <ext/stdio_sync_filebuf.h>
+#  ifdef _WIN32
+#    if defined(__GLIBCXX__)
+#      include <ext/stdio_filebuf.h>
+#      include <ext/stdio_sync_filebuf.h>
+#    endif
+#    define WIN32_LEAN_AND_MEAN
+#    include <windows.h>
 #  endif
-#  define WIN32_LEAN_AND_MEAN
-#  include <windows.h>
 #endif
 
 #ifdef FMT_MODULE
 export module fmt;
 
-#ifdef FMT_IMPORT_STD_MODULE
+#  ifdef FMT_IMPORT_STD_MODULE
 import std;
-#endif
+#  endif
 #endif
 
 #define FMT_EXPORT export
-#define FMT_BEGIN_EXPORT export {
+#define FMT_BEGIN_EXPORT \
+  export \
+  {
 #define FMT_END_EXPORT }
 
 // If you define FMT_ATTACH_TO_GLOBAL_MODULE
@@ -99,7 +104,8 @@ import std;
 //  - all library symbols are mangled traditionally
 //  - you can mix TUs with either importing or #including the {fmt} API
 #ifdef FMT_ATTACH_TO_GLOBAL_MODULE
-extern "C++" {
+extern "C++"
+{
 #endif
 
 #ifndef FMT_OS
@@ -128,9 +134,9 @@ extern "C++" {
 
 #ifdef FMT_MODULE
 // gcc doesn't yet implement private module fragments
-#if !FMT_GCC_VERSION
+#  if !FMT_GCC_VERSION
 module :private;
-#endif
+#  endif
 #endif
 
 #if FMT_HAS_INCLUDE("format.cc")