Modules

.github/workflows/linux.yml

@@ -0,0 +1,46 @@
+name: Linux
+
+on:
+  push:
+    branches: [main]
+  pull_request:
+    branches: [main]
+
+jobs:
+  linux:
+    name: ${{ matrix.compiler }} ${{ matrix.build_type }}
+    runs-on: ${{ matrix.runs_on }}
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - build_type: Debug
+            runs_on: ubuntu-26.04
+            compiler: gcc-15
+            cc: gcc-15
+            cxx: g++-15
+            configure_preset: "linux"
+            build_preset: "linux-build"
+            test_preset: "linux-test"
+          - build_type: Debug
+            runs_on: ubuntu-26.04
+            compiler: clang-22
+            cc: clang-22
+            cxx: clang++-22
+            configure_preset: "linux"
+            build_preset: "linux-build"
+            test_preset: "linux-test"
+
+    steps:
+      - uses: actions/checkout@v6
+
+      - name: "Build & Test"
+        uses: lukka/run-cmake@v10
+        env:
+          CC: ${{ matrix.cc }}
+          CXX: ${{ matrix.cxx }}
+        with:
+          configurePreset: ${{ matrix.configure_preset }}
+          configurePresetAdditionalArgs: "['-DCMAKE_BUILD_TYPE=${{ matrix.build_type }}']"
+          buildPreset: ${{ matrix.build_preset }}
+          testPreset: ${{ matrix.test_preset }}

.github/workflows/macos.yml

@@ -0,0 +1,38 @@
+name: macOS
+
+on:
+  push:
+    branches: [main]
+  pull_request:
+    branches: [main]
+
+jobs:
+  macos:
+    runs-on: macos-26
+    strategy:
+      fail-fast: false
+      matrix:
+        build_type: [Debug]
+        llvm_version: [20]
+        preset:
+          - configure_preset: "macos"
+            build_preset: "macos-build"
+            test_preset: "macos-test"
+
+    steps:
+      - uses: actions/checkout@v6
+
+      - name: Locate Homebrew LLVM
+        id: llvm
+        run: |
+          llvm_prefix="$(brew --prefix llvm@${{ matrix.llvm_version }})"
+          "$llvm_prefix/bin/clang++" --version
+          echo "cxx=$llvm_prefix/bin/clang++" >> "$GITHUB_OUTPUT"
+
+      - name: "Build & Test"
+        uses: lukka/run-cmake@v10
+        with:
+          configurePreset: ${{ matrix.preset.configure_preset }}
+          configurePresetAdditionalArgs: "['-DCMAKE_BUILD_TYPE=${{ matrix.build_type }}', '-DCMAKE_CXX_COMPILER=${{ steps.llvm.outputs.cxx }}']"
+          buildPreset: ${{ matrix.preset.build_preset }}
+          testPreset: ${{ matrix.preset.test_preset }}

.github/workflows/msvc.yml

@@ -0,0 +1,28 @@
+name: MSVC
+
+on:
+  push:
+    branches: [main]
+  pull_request:
+    branches: [main]
+
+jobs:
+  msvc:
+    runs-on: windows-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        preset:
+          - configure_preset: "x64"
+            build_preset: "x64-build"
+            test_preset: "x64-test"
+
+    steps:
+      - uses: actions/checkout@v6
+
+      - name: "Build & Test"
+        uses: lukka/run-cmake@v10
+        with:
+          configurePreset: ${{ matrix.preset.configure_preset }}
+          buildPreset: ${{ matrix.preset.build_preset }}
+          testPreset: ${{ matrix.preset.test_preset }}

.gitignore

@@ -46,3 +46,5 @@ $RECYCLE.BIN/
 ehthumbs.db
 Thumbs.db
 *.json
+!CMakePresets.json
+/vc140.pdb

CMakeLists.txt

@@ -1,4 +1,6 @@
-cmake_minimum_required(VERSION 3.24)
+cmake_minimum_required(VERSION 4.2)
+
+set(CACHE{CMAKE_EXPERIMENTAL_CXX_IMPORT_STD} TYPE STRING VALUE 451f2fe2-a8a2-47c3-bc32-94786d8fc91b)
 
 include(cmake/prelude.cmake)
 
@@ -8,12 +10,16 @@ project(
     LANGUAGES CXX
 )
 
+if(NOT CMAKE_GENERATOR MATCHES "Visual Studio")
+  set(CMAKE_CXX_MODULE_STD 1)
+endif()
+
 include(cmake/project-is-top-level.cmake)
 include(cmake/variables.cmake)
 
 option(BENCHER_ENABLE_JSON "Enable JSON output support via Glaze" OFF)
 
-add_library(${PROJECT_NAME}_${PROJECT_NAME} INTERFACE)
+add_library(${PROJECT_NAME}_${PROJECT_NAME} STATIC)
 add_library(${PROJECT_NAME}::${PROJECT_NAME} ALIAS ${PROJECT_NAME}_${PROJECT_NAME} )
 
 if (MSVC)
@@ -29,12 +35,14 @@ endif()
 
 set_property(TARGET ${PROJECT_NAME}_${PROJECT_NAME} PROPERTY EXPORT_NAME ${PROJECT_NAME})
 
-target_compile_features(${PROJECT_NAME}_${PROJECT_NAME} INTERFACE cxx_std_23)
+target_compile_features(${PROJECT_NAME}_${PROJECT_NAME} PUBLIC cxx_std_23)
 target_include_directories(
    ${PROJECT_NAME}_${PROJECT_NAME} ${warning_guard}
-    INTERFACE "$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>"
+    PUBLIC "$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/modules>"
 )
 
+include(cmake/modules-files.cmake)
+
 if(BENCHER_ENABLE_JSON)
    include(FetchContent)
    FetchContent_Declare(
@@ -45,6 +53,7 @@ if(BENCHER_ENABLE_JSON)
    )
    FetchContent_MakeAvailable(glaze)
    target_link_libraries(${PROJECT_NAME}_${PROJECT_NAME} INTERFACE glaze::glaze)
+   target_compile_definitions(BENCHER_ENABLE_JSON)
 endif()
 
 if(NOT CMAKE_SKIP_INSTALL_RULES)
@@ -53,4 +62,4 @@ endif()
 
 if (PROJECT_IS_TOP_LEVEL)
   include(cmake/dev-mode.cmake)
-endif()
+endif()

CMakePresets.json

@@ -0,0 +1,82 @@
+{
+  "version": 9,
+  "configurePresets": [
+    {
+      "name": "windows-base-vs",
+      "hidden": true,
+      "generator": "Visual Studio 18 2026",
+      "binaryDir": "${sourceDir}/out/build/${presetName}",
+      "installDir": "${sourceDir}/out/install/${presetName}",
+      "condition": {
+        "type": "equals",
+        "lhs": "${hostSystemName}",
+        "rhs": "Windows"
+      }
+    },
+    {
+      "name": "x64",
+      "inherits": "windows-base-vs",
+      "cacheVariables": {
+        "BUILD_TESTING": "ON"
+      }
+    },
+    {
+      "name": "linux",
+      "generator": "Ninja",
+      "binaryDir": "${sourceDir}/out/build/${presetName}",
+      "installDir": "${sourceDir}/out/install/${presetName}",
+      "condition": {
+        "type": "equals",
+        "lhs": "${hostSystemName}",
+        "rhs": "Linux"
+      },
+      "cacheVariables": {
+        "BUILD_TESTING": "ON"
+      }
+    },
+    {
+      "name": "macos",
+      "generator": "Ninja",
+      "binaryDir": "${sourceDir}/out/build/${presetName}",
+      "installDir": "${sourceDir}/out/install/${presetName}",
+      "condition": {
+        "type": "equals",
+        "lhs": "${hostSystemName}",
+        "rhs": "Darwin"
+      },
+      "cacheVariables": {
+        "BUILD_TESTING": "ON"
+      }
+    }
+  ],
+  "buildPresets": [
+    {
+      "name": "x64-build",
+      "configurePreset": "x64",
+      "configuration": "Debug"
+    },
+    {
+      "name": "linux-build",
+      "configurePreset": "linux"
+    },
+    {
+      "name": "macos-build",
+      "configurePreset": "macos"
+    }
+  ],
+  "testPresets": [
+    {
+      "name": "x64-test",
+      "configurePreset": "x64",
+      "configuration": "Debug"
+    },
+    {
+      "name": "linux-test",
+      "configurePreset": "linux"
+    },
+    {
+      "name": "macos-test",
+      "configurePreset": "macos"
+    }
+  ]
+}

cmake/install-config.cmake

@@ -1 +1,3 @@
-include("${CMAKE_CURRENT_LIST_DIR}/${PROJECT_NAME}Targets.cmake")
+@PACKAGE_INIT@
+
+include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake")