Implement modules support

.github/workflows/ci_tests.yml

@@ -13,10 +13,10 @@ on:
 
 jobs:
   beman-submodule-check:
-    uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-submodule-check.yml@1.6.0
+    uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-submodule-check.yml@1.7.2
 
   preset-test:
-    uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-preset-test.yml@1.6.0
+    uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-preset-test.yml@1.7.2
     with:
       matrix_config: >
         [
@@ -31,7 +31,7 @@ jobs:
         ]
 
   build-and-test:
-    uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-build-and-test.yml@1.6.0
+    uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-build-and-test.yml@1.7.2
     with:
       matrix_config: >
         {
@@ -44,7 +44,7 @@ jobs:
                       "tests": [
                         "Debug.Default", "Release.Default", "Release.TSan",
                         "Release.MaxSan", "Debug.Werror", "Debug.Dynamic",
-                        "Debug.Coverage"
+                        "Debug.Coverage", "Debug.-DBEMAN_SCAN_VIEW_USE_MODULES=On"
                       ]
                     }
                   ]
@@ -78,7 +78,8 @@ jobs:
                     { "stdlibs": ["libstdc++", "libc++"],
                       "tests": [
                         "Debug.Default", "Release.Default", "Release.TSan",
-                        "Release.MaxSan", "Debug.Werror", "Debug.Dynamic"
+                        "Release.MaxSan", "Debug.Werror", "Debug.Dynamic",
+                        "Debug.-DBEMAN_SCAN_VIEW_USE_MODULES=On"
                       ]
                     }
                   ]
@@ -135,11 +136,16 @@ jobs:
         }
 
   vcpkg-ci:
-    uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-vcpkg-ci.yml@1.6.0
+    uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-vcpkg-ci.yml@1.7.2
     with:
       port_name: beman-scan-view
+      feature_combinations: |
+        [
+          {"features": {}},
+          {"features": {"modules": true}}
+        ]
 
   create-issue-when-fault:
     needs: [preset-test, build-and-test]
     if: failure() && github.event_name == 'schedule'
-    uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-create-issue-when-fault.yml@1.6.0
+    uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-create-issue-when-fault.yml@1.7.2

.github/workflows/pre-commit-check.yml

@@ -16,4 +16,4 @@ permissions:
 
 jobs:
   pre-commit:
-    uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-pre-commit.yml@1.6.0
+    uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-pre-commit.yml@1.7.2

.github/workflows/vcpkg-release.yml

@@ -6,7 +6,7 @@ on:
     types: [published]
 jobs:
   vcpkg-release:
-    uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-vcpkg-release.yml@1.6.0
+    uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-vcpkg-release.yml@1.7.2
     with:
       port_name: beman-scan-view
     secrets:

CMakeLists.txt

@@ -2,6 +2,8 @@
 
 cmake_minimum_required(VERSION 3.30...4.3)
 
+include(infra/cmake/enable-experimental-import-std.cmake)
+
 project(
     beman.scan_view
     DESCRIPTION
@@ -24,22 +26,59 @@ option(
     ${PROJECT_IS_TOP_LEVEL}
 )
 
+option(
+    BEMAN_SCAN_VIEW_USE_MODULES
+    "Provide beman.scan_view as a C++ module"
+    OFF
+)
+
+if(BEMAN_SCAN_VIEW_USE_MODULES)
+    set(CMAKE_CXX_SCAN_FOR_MODULES ON)
+endif()
+
+configure_file(
+    "${PROJECT_SOURCE_DIR}/include/beman/scan_view/config_generated.hpp.in"
+    "${PROJECT_BINARY_DIR}/include/beman/scan_view/config_generated.hpp"
+    @ONLY
+)
+
 # for find of beman_install_library and configure_build_telemetry
 include(infra/cmake/beman-install-library.cmake)
 include(infra/cmake/BuildTelemetryConfig.cmake)
 
-add_library(beman.scan_view INTERFACE)
+if(BEMAN_SCAN_VIEW_USE_MODULES)
+    add_library(beman.scan_view STATIC)
+else()
+    add_library(beman.scan_view INTERFACE)
+endif()
 add_library(beman::scan_view ALIAS beman.scan_view)
 
-target_sources(
-    beman.scan_view
-    PUBLIC FILE_SET HEADERS BASE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/include"
-)
-
-set_target_properties(
-    beman.scan_view
-    PROPERTIES VERIFY_INTERFACE_HEADER_SETS ${PROJECT_IS_TOP_LEVEL}
-)
+if(BEMAN_SCAN_VIEW_USE_MODULES)
+    target_sources(
+        beman.scan_view
+        PUBLIC
+            FILE_SET CXX_MODULES
+            FILE_SET HEADERS
+                BASE_DIRS
+                    "${CMAKE_CURRENT_SOURCE_DIR}/include"
+                    "${CMAKE_CURRENT_BINARY_DIR}/include"
+    )
+    set_target_properties(beman.scan_view PROPERTIES CXX_MODULE_STD ON)
+    target_compile_features(beman.scan_view PUBLIC cxx_std_23)
+else()
+    target_sources(
+        beman.scan_view
+        PUBLIC
+            FILE_SET HEADERS
+                BASE_DIRS
+                    "${CMAKE_CURRENT_SOURCE_DIR}/include"
+                    "${CMAKE_CURRENT_BINARY_DIR}/include"
+    )
+    set_target_properties(
+        beman.scan_view
+        PROPERTIES VERIFY_INTERFACE_HEADER_SETS ${PROJECT_IS_TOP_LEVEL}
+    )
+endif()
 
 add_subdirectory(include/beman/scan_view)
 

examples/CMakeLists.txt

@@ -10,4 +10,10 @@ foreach(example ${ALL_EXAMPLES})
         beman.scan_view.examples.${example}
         PRIVATE beman::scan_view
     )
+    if(BEMAN_SCAN_VIEW_USE_MODULES)
+        set_target_properties(
+            beman.scan_view.examples.${example}
+            PROPERTIES CXX_MODULE_STD ON
+        )
+    endif()
 endforeach()

examples/basic_example.cpp

@@ -1,9 +1,19 @@
-#include <functional>
-#include <iostream>
-#include <vector>
+#include <beman/scan_view/config.hpp>
+
+#if BEMAN_SCAN_VIEW_USE_MODULES()
+
+import std;
+
+#else
+
+    #include <functional>
+    #include <iostream>
+    #include <vector>
+
+    #if __cpp_lib_print >= 202207L
+        #include <print>
+    #endif
 
-#if __cpp_lib_print >= 202207L
-    #include <print>
 #endif
 
 #include <beman/scan_view/scan.hpp>

examples/complex_example.cpp

@@ -1,14 +1,24 @@
-#include <algorithm>
-#include <iostream>
-#include <memory>
-#include <ranges>
-#include <string>
-#include <string_view>
-#include <utility>
-#include <vector>
-
-#if __cpp_lib_print >= 202207L
-    #include <print>
+#include <beman/scan_view/config.hpp>
+
+#if BEMAN_SCAN_VIEW_USE_MODULES()
+
+import std;
+
+#else
+
+    #include <algorithm>
+    #include <iostream>
+    #include <memory>
+    #include <ranges>
+    #include <string>
+    #include <string_view>
+    #include <utility>
+    #include <vector>
+
+    #if __cpp_lib_print >= 202207L
+        #include <print>
+    #endif
+
 #endif
 
 #include <beman/scan_view/scan.hpp>

include/beman/scan_view/CMakeLists.txt

@@ -1,3 +1,24 @@
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-target_sources(beman.scan_view PUBLIC FILE_SET HEADERS FILES scan.hpp)
+if(BEMAN_SCAN_VIEW_USE_MODULES)
+    target_sources(
+        beman.scan_view
+        PUBLIC
+            FILE_SET CXX_MODULES FILES scan_view.cppm
+            FILE_SET HEADERS
+                FILES
+                    config.hpp
+                    scan.hpp
+                    "${PROJECT_BINARY_DIR}/include/beman/scan_view/config_generated.hpp"
+    )
+else()
+    target_sources(
+        beman.scan_view
+        PUBLIC
+            FILE_SET HEADERS
+                FILES
+                    config.hpp
+                    scan.hpp
+                    "${PROJECT_BINARY_DIR}/include/beman/scan_view/config_generated.hpp"
+    )
+endif()

include/beman/scan_view/config.hpp

@@ -0,0 +1,12 @@
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+
+#ifndef BEMAN_SCAN_VIEW_CONFIG_HPP
+#define BEMAN_SCAN_VIEW_CONFIG_HPP
+
+#if !defined(__has_include) || __has_include(<beman/scan_view/config_generated.hpp>)
+    #include <beman/scan_view/config_generated.hpp>
+#else
+    #define BEMAN_SCAN_VIEW_USE_MODULES() 0
+#endif
+
+#endif

include/beman/scan_view/config_generated.hpp.in

@@ -0,0 +1,8 @@
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+
+#ifndef BEMAN_SCAN_VIEW_CONFIG_GENERATED_HPP
+#define BEMAN_SCAN_VIEW_CONFIG_GENERATED_HPP
+
+#cmakedefine01 BEMAN_SCAN_VIEW_USE_MODULES()
+
+#endif