Merge pull request #4 from stlab/sean-parent/cpp-library-update

Updating to cpp-library 5.0 with install support.

Author: sean-parent

.github/workflows/ci.yml

@@ -13,21 +13,23 @@ on:
 
 jobs:
   test:
+    name: Test (${{ matrix.name }})
     strategy:
+      fail-fast: false
       matrix:
-        os: [ubuntu-latest, macos-latest, windows-latest]
-        compiler: [gcc, clang, msvc]
-        exclude:
-          - os: ubuntu-latest
-            compiler: msvc
-          - os: macos-latest
-            compiler: msvc
-          - os: macos-latest
-            compiler: gcc
-          - os: windows-latest
-            compiler: gcc
-          - os: windows-latest
-            compiler: clang
+        include:
+          - name: Ubuntu GCC
+            os: ubuntu-latest
+            cc: gcc
+            cxx: g++
+          - name: Ubuntu Clang
+            os: ubuntu-latest
+            cc: clang
+            cxx: clang++
+          - name: macOS
+            os: macos-latest
+          - name: Windows
+            os: windows-latest
 
     runs-on: ${{ matrix.os }}
 
@@ -36,18 +38,66 @@ jobs:
 
       - name: Configure CMake
         run: cmake --preset=test
+        env:
+          CC: ${{ matrix.cc }}
+          CXX: ${{ matrix.cxx }}
+        if: ${{ matrix.cc }}
+
+      - name: Configure CMake
+        run: cmake --preset=test
+        if: ${{ !matrix.cc }}
 
       - name: Build
         run: cmake --build --preset=test
 
       - name: Test
         run: ctest --preset=test
 
+      - name: Build and Install
+        run: |
+          cmake --preset=default
+          cmake --build --preset=default
+          cmake --install build/default --prefix ${{ runner.temp }}/install
+        env:
+          CC: ${{ matrix.cc }}
+          CXX: ${{ matrix.cxx }}
+        if: ${{ matrix.cc }}
+
+      - name: Build and Install
+        run: |
+          cmake --preset=default
+          cmake --build --preset=default
+          cmake --install build/default --prefix ${{ runner.temp }}/install
+        if: ${{ !matrix.cc }}
+
+      - name: Test find_package
+        shell: bash
+        run: |
+          # Create a minimal test to verify the installation works with find_package
+          mkdir -p ${{ runner.temp }}/test-find-package
+          cd ${{ runner.temp }}/test-find-package
+
+          # Create test CMakeLists.txt
+          cat > CMakeLists.txt << EOF
+          cmake_minimum_required(VERSION 3.20)
+          project(test-find-package CXX)
+
+          find_package(stlab-enum-ops REQUIRED)
+
+          message(STATUS "Successfully found stlab-enum-ops")
+          EOF
+
+          # Convert paths to forward slashes for CMake (works on all platforms)
+          INSTALL_PREFIX=$(echo '${{ runner.temp }}/install' | sed 's|\\|/|g')
+
+          # Test find_package with CMAKE_PREFIX_PATH
+          cmake -B build -S . -DCMAKE_PREFIX_PATH="${INSTALL_PREFIX}"
+
   clang-tidy:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
 
       - name: Configure CMake with clang-tidy
         run: cmake --preset=clang-tidy
@@ -67,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

@@ -1,9 +1,7 @@
 {
-    "_comment": "Auto-generated from cpp-library (https://github.com/stlab/cpp-library) - Do not edit this file directly",
     "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,24 +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(stlab-enum-ops)
-
-# Setup cpp-library infrastructure
-if(PROJECT_IS_TOP_LEVEL)
-    set(CPM_SOURCE_CACHE ${CMAKE_SOURCE_DIR}/.cache/cpm CACHE PATH "CPM 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@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,7 +70,8 @@
         "BUILD_TESTING": "OFF",
         "CMAKE_EXPORT_COMPILE_COMMANDS": "ON",
         "CMAKE_CXX_EXTENSIONS": "OFF",
-        "CPP_LIBRARY_FORCE_INIT": "ON"
+        "CPP_LIBRARY_FORCE_INIT": "ON",
+        "CPM_SOURCE_CACHE": "${sourceDir}/.cache/cpm"
       }
     }
   ],

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()); }