Update CMake config and CI, improve example test

Bump CMake minimum version to 3.24 and update to cpp-library 5.0.0. Add CPM source cache to CMakePresets, remove unused install preset, and update CI workflow to use newer actions and a pinned Doxygen version. Clean up VSCode extension recommendations and settings, and improve enum_ops_example_test.cpp with MSVC warning suppression.

Author: sean-parent

.github/workflows/ci.yml

@@ -97,7 +97,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
 
       - name: Configure CMake with clang-tidy
         run: cmake --preset=clang-tidy
@@ -117,10 +117,11 @@ jobs:
       contents: read
 
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
 
+      # ssciwr/doxygen-install@1.6.4
       - name: Install Doxygen
-        uses: ssciwr/doxygen-install@v1
+        uses: ssciwr/doxygen-install@501e53b879da7648ab392ee226f5b90e42148449
 
       - name: Configure CMake
         run: cmake --preset=docs

.vscode/extensions.json

@@ -2,7 +2,6 @@
     "recommendations": [
         "matepek.vscode-catch2-test-adapter",
         "llvm-vs-code-extensions.vscode-clangd",
-        "ms-vscode.live-server",
-        "xaver.clang-format"
+        "ms-vscode.live-server"
     ]
 }

.vscode/settings.json

@@ -2,5 +2,6 @@
     "cSpell.words": [
         "dontinclude",
         "NOLINTNEXTLINE"
-    ]
+    ],
+    "cmake.copyCompileCommands": "${workspaceFolder}/compile_commands.json"
 }

CMakeLists.txt

@@ -1,27 +1,26 @@
-cmake_minimum_required(VERSION 3.20)
+cmake_minimum_required(VERSION 3.24)
 
-# Project declaration - cpp_library_setup will use this name and detect version from git tags
-project(enum-ops)
-
-# Setup cpp-library infrastructure
-if(PROJECT_IS_TOP_LEVEL AND NOT CPM_SOURCE_CACHE AND NOT DEFINED ENV{CPM_SOURCE_CACHE})
-    set(CPM_SOURCE_CACHE "${CMAKE_SOURCE_DIR}/.cache/cpm" CACHE PATH "CPM source cache")
-    message(STATUS "Setting cpm cache dir to: ${CPM_SOURCE_CACHE}")
-endif()
 include(cmake/CPM.cmake)
 
-# Fetch cpp-library via CPM
-
-# https://github.com/stlab/cpp-library/releases
+# Fetch cpp-library before project()
+# Check https://github.com/stlab/cpp-library/releases for the latest version
 # CPMAddPackage(
 #     NAME cpp-library
-#     URL "${CMAKE_SOURCE_DIR}/../cpp-library"
+#     SOURCE_DIR "${CMAKE_SOURCE_DIR}/../cpp-library"
 # )
-CPMAddPackage("gh:stlab/cpp-library#4f09b3b7f0abcc4ef1b39060ce03784920ce32e5")
-# CPMAddPackage("gh:stlab/cpp-library@4.0.5")
-
+# CPMAddPackage("gh:stlab/cpp-library#65dbed9fff9a0331355bd51dc1e8156262390154")
+CPMAddPackage("gh:stlab/cpp-library@5.0.0")
 include(${cpp-library_SOURCE_DIR}/cpp-library.cmake)
 
+# Enable dependency tracking before project()
+cpp_library_enable_dependency_tracking()
+
+# Now declare project
+project(enum-ops)
+
+# Enable CTest infrastructure (required for tests/examples to work)
+include(CTest)
+
 # Let cpp-library handle the project declaration and version detection
 cpp_library_setup(
     DESCRIPTION "Type-safe operators for enums"

CMakePresets.json

@@ -11,7 +11,8 @@
         "CMAKE_BUILD_TYPE": "Release",
         "BUILD_TESTING": "OFF",
         "CMAKE_EXPORT_COMPILE_COMMANDS": "ON",
-        "CMAKE_CXX_EXTENSIONS": "OFF"
+        "CMAKE_CXX_EXTENSIONS": "OFF",
+        "CPM_SOURCE_CACHE": "${sourceDir}/.cache/cpm"
       }
     },
     {
@@ -24,7 +25,8 @@
         "CMAKE_BUILD_TYPE": "Debug",
         "BUILD_TESTING": "ON",
         "CMAKE_EXPORT_COMPILE_COMMANDS": "ON",
-        "CMAKE_CXX_EXTENSIONS": "OFF"
+        "CMAKE_CXX_EXTENSIONS": "OFF",
+        "CPM_SOURCE_CACHE": "${sourceDir}/.cache/cpm"
       }
     },
     {
@@ -38,7 +40,8 @@
         "BUILD_TESTING": "OFF",
         "BUILD_DOCS": "ON",
         "CMAKE_EXPORT_COMPILE_COMMANDS": "ON",
-        "CMAKE_CXX_EXTENSIONS": "OFF"
+        "CMAKE_CXX_EXTENSIONS": "OFF",
+        "CPM_SOURCE_CACHE": "${sourceDir}/.cache/cpm"
       }
     },
     {
@@ -52,7 +55,8 @@
         "BUILD_TESTING": "ON",
         "CMAKE_EXPORT_COMPILE_COMMANDS": "ON",
         "CMAKE_CXX_EXTENSIONS": "OFF",
-        "CMAKE_CXX_CLANG_TIDY": "clang-tidy"
+        "CMAKE_CXX_CLANG_TIDY": "clang-tidy",
+        "CPM_SOURCE_CACHE": "${sourceDir}/.cache/cpm"
       }
     },
     {
@@ -66,21 +70,8 @@
         "BUILD_TESTING": "OFF",
         "CMAKE_EXPORT_COMPILE_COMMANDS": "ON",
         "CMAKE_CXX_EXTENSIONS": "OFF",
-        "CPP_LIBRARY_FORCE_INIT": "ON"
-      }
-    },
-    {
-      "name": "install",
-      "displayName": "Local Install Test",
-      "description": "Configuration for testing installation locally (installs to build/install/prefix)",
-      "binaryDir": "${sourceDir}/build/install",
-      "generator": "Ninja",
-      "cacheVariables": {
-        "CMAKE_BUILD_TYPE": "Release",
-        "BUILD_TESTING": "OFF",
-        "CMAKE_EXPORT_COMPILE_COMMANDS": "ON",
-        "CMAKE_CXX_EXTENSIONS": "OFF",
-        "CMAKE_INSTALL_PREFIX": "${sourceDir}/build/install/prefix"
+        "CPP_LIBRARY_FORCE_INIT": "ON",
+        "CPM_SOURCE_CACHE": "${sourceDir}/.cache/cpm"
       }
     }
   ],
@@ -89,8 +80,7 @@
     { "name": "test", "displayName": "Build Tests", "configurePreset": "test" },
     { "name": "docs", "displayName": "Build Docs", "configurePreset": "docs", "targets": "docs" },
     { "name": "clang-tidy", "displayName": "Build with Clang-Tidy", "configurePreset": "clang-tidy" },
-    { "name": "init", "displayName": "Initialize Templates", "configurePreset": "init" },
-    { "name": "install", "displayName": "Build for Local Install", "configurePreset": "install" }
+    { "name": "init", "displayName": "Initialize Templates", "configurePreset": "init" }
   ],
   "testPresets": [
     { "name": "test", "displayName": "Run All Tests", "configurePreset": "test", "output": { "outputOnFailure": true } },

examples/enum_ops_example_test.cpp

@@ -1,6 +1,11 @@
 #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
 #include <doctest/doctest.h>
 
+#if defined(_MSC_VER) && !defined(__clang__)
+#pragma warning(push)
+#pragma warning(disable : 4010)
+#endif
+
 #include <stlab/enum_ops.hpp> /// [EXAMPLE_START]
 
 #include <iostream>
@@ -18,12 +23,17 @@ int main() {
     foo b{foo_8};
     foo c{a | b};
     std::cout << a << " " << b << " " << c << "\n";
-
+    
     // Bitset operations on enum class
     views x = views::text | views::icon;
     bool has_text = (x & views::text) == views::text;
     bool has_preview = (x & views::preview) == views::preview;
     std::cout << has_text << " " << has_preview << "\n";
 } /// [EXAMPLE_END]
 
+
+#if defined(_MSC_VER) && !defined(__clang__)
+#pragma warning(pop)
+#endif
+
 TEST_CASE("Example: common use cases") { CHECK_NOTHROW(run_example()); }