feat: add C++20 module support and update CMake configuration for NekoLog

moehoshio · moehoshio · commit c1f55a12e7f1 · 2025-11-26T05:28:50.000+09:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -17,36 +17,22 @@ jobs:
         config:
           # Windows builds
           - {
-              name: "Windows MSVC Debug",
+              name: "Windows MSVC Module Debug",
               os: windows-latest,
               cc: "cl",
               cxx: "cl",
               build_type: "Debug",
-              generators: "Visual Studio 17 2022"
+              generators: "Visual Studio 17 2022",
+              enable_module: "ON"
             }
           - {
-              name: "Windows MSVC Release",
+              name: "Windows MSVC Module Release",
               os: windows-latest,
               cc: "cl",
               cxx: "cl",
               build_type: "Release",
-              generators: "Visual Studio 17 2022"
-            }
-          - {
-              name: "Windows Clang Debug",
-              os: windows-latest,
-              cc: "clang",
-              cxx: "clang++",
-              build_type: "Debug",
-              generators: "Visual Studio 17 2022"
-            }
-          - {
-              name: "Windows Clang Release",
-              os: windows-latest,
-              cc: "clang",
-              cxx: "clang++",
-              build_type: "Release",
-              generators: "Visual Studio 17 2022"
+              generators: "Visual Studio 17 2022",
+              enable_module: "ON"
             }
           
           # Linux builds
@@ -56,31 +42,53 @@ jobs:
               cc: "gcc",
               cxx: "g++",
               build_type: "Debug",
-              generators: "Unix Makefiles"
+              generators: "Unix Makefiles",
+              enable_module: "OFF"
             }
           - {
               name: "Ubuntu GCC Release",
               os: ubuntu-latest,
               cc: "gcc",
               cxx: "g++",
               build_type: "Release",
-              generators: "Unix Makefiles"
+              generators: "Unix Makefiles",
+              enable_module: "OFF"
             }
           - {
               name: "Ubuntu Clang Debug",
               os: ubuntu-latest,
               cc: "clang",
               cxx: "clang++",
               build_type: "Debug",
-              generators: "Unix Makefiles"
+              generators: "Unix Makefiles",
+              enable_module: "OFF"
             }
           - {
               name: "Ubuntu Clang Release",
               os: ubuntu-latest,
               cc: "clang",
               cxx: "clang++",
               build_type: "Release",
-              generators: "Unix Makefiles"
+              generators: "Unix Makefiles",
+              enable_module: "OFF"
+            }
+          - {
+              name: "Ubuntu Clang-18 Module Debug",
+              os: ubuntu-latest,
+              cc: "clang-18",
+              cxx: "clang++-18",
+              build_type: "Debug",
+              generators: "Ninja",
+              enable_module: "ON"
+            }
+          - {
+              name: "Ubuntu Clang-21 Module Release",
+              os: ubuntu-latest,
+              cc: "clang-21",
+              cxx: "clang++-21",
+              build_type: "Release",
+              generators: "Ninja",
+              enable_module: "ON"
             }
 
           # macOS builds
@@ -90,34 +98,37 @@ jobs:
               cc: "clang",
               cxx: "clang++",
               build_type: "Debug",
-              generators: "Unix Makefiles"
+              generators: "Unix Makefiles",
+              enable_module: "OFF"
             }
           - {
               name: "macOS Clang Release",
               os: macos-latest,
               cc: "clang",
               cxx: "clang++",
               build_type: "Release",
-              generators: "Unix Makefiles"
+              generators: "Unix Makefiles",
+              enable_module: "OFF"
             }
           - {
               name: "macOS GCC Debug",
               os: macos-latest,
               cc: "gcc",
               cxx: "g++",
               build_type: "Debug",
-              generators: "Unix Makefiles"
+              generators: "Unix Makefiles",
+              enable_module: "OFF"
             }
           - {
               name: "macOS GCC Release",
               os: macos-latest,
               cc: "gcc",
               cxx: "g++",
               build_type: "Release",
-              generators: "Unix Makefiles"
+              generators: "Unix Makefiles",
+              enable_module: "OFF"
             }
 
-
     steps:
     - name: Checkout
       uses: actions/checkout@v4
@@ -148,13 +159,21 @@ jobs:
           g++ --version
         fi
 
-    - name: Check compiler versions
-      if: startsWith(matrix.config.os, 'ubuntu')
+    - name: Install Clang 18 (Ubuntu)
+      if: startsWith(matrix.config.os, 'ubuntu') && matrix.config.cc == 'clang-18'
       run: |
-        echo "=== Compiler Information ==="
-        ${{ matrix.config.cxx }} --version
-        echo "=== CMake Information ==="
-        cmake --version
+        wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
+        sudo add-apt-repository "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-18 main"
+        sudo apt-get update
+        sudo apt-get install -y clang-18 clang++-18
+
+    - name: Install Clang 21 (Ubuntu)
+      if: startsWith(matrix.config.os, 'ubuntu') && matrix.config.cc == 'clang-21'
+      run: |
+        wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
+        sudo add-apt-repository "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-21 main"
+        sudo apt-get update
+        sudo apt-get install -y clang-21 clang++-21
 
     - name: Install dependencies (macOS)
       if: startsWith(matrix.config.os, 'macos')
@@ -169,19 +188,31 @@ jobs:
           # Setup Clang
           choco install llvm
         }
+    - name: Check compiler versions (Unix)
+      if: "!startsWith(matrix.config.os, 'windows')"
+      run: |
+        echo "=== Compiler Information ==="
+        ${{ matrix.config.cxx }} --version
+        echo "=== CMake Information ==="
+        cmake --version
+        echo "=== Ninja Information ==="
+        ninja --version
 
     - name: Set up MSVC environment (Windows)
       if: startsWith(matrix.config.os, 'windows') && matrix.config.cc == 'cl'
       uses: ilammy/msvc-dev-cmd@v1.13.0
 
     - name: Configure CMake
       run: |
+        echo "=== Configuring NekoFunction (Ubuntu) ==="
+        echo "Compiler: ${{ matrix.config.cxx }}"
+        echo "Module support: ${{ matrix.config.enable_module }}"
         if [[ "${{ matrix.config.generators }}" == *"Visual Studio"* ]]; then
           # For Visual Studio generators, let CMake auto-detect the compiler
-          cmake -B build -DCMAKE_BUILD_TYPE=${{ matrix.config.build_type }} -G "${{ matrix.config.generators }}" -DNEKO_LOG_BUILD_TESTS=ON -DNEKO_LOG_AUTO_FETCH_DEPS=ON
+          cmake -B build -DCMAKE_BUILD_TYPE=${{ matrix.config.build_type }} -G "${{ matrix.config.generators }}" -DNEKO_LOG_BUILD_TESTS=ON -DNEKO_LOG_AUTO_FETCH_DEPS=ON -DNEKO_LOG_ENABLE_MODULE=${{ matrix.config.enable_module }}
         else
           # For other generators, specify the compiler explicitly
-          cmake -B build -DCMAKE_BUILD_TYPE=${{ matrix.config.build_type }} -DCMAKE_C_COMPILER=${{ matrix.config.cc }} -DCMAKE_CXX_COMPILER=${{ matrix.config.cxx }} -G "${{ matrix.config.generators }}" -DNEKO_LOG_BUILD_TESTS=ON -DNEKO_LOG_AUTO_FETCH_DEPS=ON
+          cmake -B build -DCMAKE_BUILD_TYPE=${{ matrix.config.build_type }} -DCMAKE_C_COMPILER=${{ matrix.config.cc }} -DCMAKE_CXX_COMPILER=${{ matrix.config.cxx }} -G "${{ matrix.config.generators }}" -DNEKO_LOG_BUILD_TESTS=ON -DNEKO_LOG_AUTO_FETCH_DEPS=ON -DNEKO_LOG_ENABLE_MODULE=${{ matrix.config.enable_module }}
         fi
       shell: bash
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.14)
-project(NekoLog VERSION 1.0.5 LANGUAGES CXX)
+project(NekoLog VERSION 1.0.6 LANGUAGES CXX)
 
 # ================
 # === Config ====
@@ -99,15 +99,6 @@ if(NEKO_LOG_ENABLE_MODULE)
     
     target_link_libraries(NekoLog_module PUBLIC Neko::Schema::Module)
     target_compile_features(NekoLog_module PUBLIC cxx_std_20)
-    
-    # Compiler-specific module flags
-    if(MSVC)
-        target_compile_options(NekoLog_module PUBLIC /experimental:module)
-    elseif(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-        target_compile_options(NekoLog_module PUBLIC -fmodules-ts)
-    elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-        target_compile_options(NekoLog_module PUBLIC -fmodules)
-    endif()
 
     target_include_directories(NekoLog_module PUBLIC
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
@@ -139,11 +130,17 @@ if(NEKO_LOG_BUILD_TESTS)
     gtest_discover_tests(nlog_test)
     
     # Module test (if modules are enabled)
-    if(NEKO_LOG_ENABLE_MODULES)
-        add_executable(nlog_module_test tests/nlog_module_test.cpp)
-        target_link_libraries(nlog_module_test PRIVATE NekoLog_module GTest::gtest GTest::gtest_main)
-        target_compile_features(nlog_module_test PRIVATE cxx_std_20)
-        gtest_discover_tests(nlog_module_test)
+    if(NEKO_LOG_ENABLE_MODULE)
+        if (MSVC)
+            message(STATUS "NekoLog module tests enabled (MSVC only)")
+
+            add_executable(nlog_module_test tests/nlog_module_test.cpp)
+            target_link_libraries(nlog_module_test PRIVATE NekoLog_module GTest::gtest GTest::gtest_main)
+            target_compile_features(nlog_module_test PRIVATE cxx_std_20)
+            gtest_discover_tests(nlog_module_test)
+        else()
+            message(STATUS "Skipping NekoLog module tests on non-MSVC toolchains")
+        endif()
     endif()
     
 else()
diff --git a/cmake/NekoLogConfig.cmake.in b/cmake/NekoLogConfig.cmake.in
@@ -7,9 +7,12 @@ find_dependency(NekoSchema REQUIRED)
 # Include the targets file
 include("${CMAKE_CURRENT_LIST_DIR}/NekoLogTargets.cmake")
 
-# Recreate the Neko::Log alias for consumers
+# Recreate alias for consumers
 if(TARGET NekoLog AND NOT TARGET Neko::Log)
 	add_library(Neko::Log ALIAS NekoLog)
 endif()
+if (TARGET NekoLog_module AND NOT TARGET Neko::Log::Module)
+	add_library(Neko::Log::Module ALIAS NekoLog_module)
+endif()
 
 check_required_components(NekoLog)
diff --git a/examples/example_module.cpp b/examples/example_module.cpp
@@ -7,12 +7,12 @@
  * cmake --build build
  */
 
-// Use C++20 module instead of header
-import neko.log;
-
 #include <thread>
 #include <chrono>
 
+// Use C++20 module instead of header
+import neko.log;
+
 int main() {
     using namespace neko;
     
diff --git a/include/neko/log/neko.log.cppm b/include/neko/log/neko.log.cppm
@@ -1,16 +1,13 @@
-/**
- * @file neko.log.cppm
- * @brief C++20 module interface for NekoLog
- * @details This module exports all NekoLog functionality by wrapping the header files.
- *          The original headers are still available for traditional include-based usage.
- */
+// =====================
+// === Global Module ===
+// =====================
 
 module;
 
-#if defined(__cpp_lib_modules) && (__cpp_lib_modules >= 202207L)
-import std;
-#else
-// Global module fragment - include headers that should not be exported
+// ====================
+// = Standard Library =
+// ====================
+
 #include <format>
 
 #include <chrono>
@@ -32,12 +29,15 @@ import std;
 #include <queue>
 #include <unordered_map>
 #include <vector>
-#endif
 
-import neko.schema;
+// =====================
+// = Module Interface ==
+// =====================
 
 export module neko.log;
 
+import neko.schema;
+
 // Control header files to not import dependencies (dependencies are declared and imported by the cppm)
 #define NEKO_LOG_ENABLE_MODULE true
 
diff --git a/include/neko/log/nlog.hpp b/include/neko/log/nlog.hpp
@@ -19,6 +19,7 @@
     #error "Neko logging Cannot find header <format>"
 #endif
 
+#include <version>
 #include <format>
 
 #if !defined(__cpp_lib_format) || __cpp_lib_format < 201907L
diff --git a/readme.md b/readme.md
diff --git a/tests/vcpkg/CMakeLists.txt b/tests/vcpkg/CMakeLists.txt
