Use conan

.github/workflows/tests.yml

@@ -59,6 +59,7 @@ jobs:
       working-directory: ${{runner.workspace}}/build
       run: >
         cmake -B . -S ${{ github.workspace }}
+        -DCMAKE_TOOLCHAIN_FILE=conan_toolchain.cmake
         -DCMAKE_C_COMPILER=${{ matrix.c_compiler }}
         -DCMAKE_CXX_COMPILER=${{ matrix.cpp_compiler }}
         -DCMAKE_BUILD_TYPE=${{ matrix.build_type }}

.gitignore

@@ -6,3 +6,4 @@ build
 *.s
 ctp
 Testing
+CMakeUserPresets.json

Makefile

@@ -1,14 +1,22 @@
 default: build
 
+install-deps:
+	conan install . --output-folder=build --build=missing -s compiler.cppstd=20 -s build_type=Release
+
 build:
-	cmake -S . -B build
+	cmake -S . -B build \
+		-DCMAKE_TOOLCHAIN_FILE=conan_toolchain.cmake \
+		-DCMAKE_BUILD_TYPE=Release \
+		-DBUILD_TESTS=1
 	make -C build
 
 tests: build
-	./build/tests/tests
+	ctest --test-dir ./build/tests --output-on-failure
 
 lint:
 	cppcheck compile_time_regexp.h --enable=warning,style,performance,portability --inline-suppr --language=c++
 
 clean:
 	rm -rf build
+
+.PHONY: build lint clean install-deps

compile_time_regexp.h

@@ -42,7 +42,7 @@ struct hash {
 template <>
 struct hash<char> {
   constexpr uint32_t operator()(char v) const {
-    char s[1] = {v};
+    const char s[1] = {v};
     return fnv32(s, 1);
   }
 };
@@ -565,7 +565,7 @@ class State {
 
 template <>
 struct hash<State *> {
-  constexpr uint32_t operator()(State *st) const {
+  constexpr uint32_t operator()(const State *st) const {
     return hash<uint32_t>{}(st->Id());
   }
 };

conanfile.txt

@@ -0,0 +1,6 @@
+[requires]
+catch2/[>=3.2.0]
+
+[generators]
+CMakeDeps
+CMakeToolchain

tests/CMakeLists.txt

@@ -8,18 +8,7 @@ enable_testing()
 
 include_directories("..")
 
-# Find or Download package Catch 2
-include(FetchContent)
-set(FETCHCONTENT_QUIET FALSE)
-FetchContent_Declare(
-  Catch2
-  GIT_REPOSITORY https://github.com/catchorg/Catch2.git
-  GIT_TAG v3.4.0 # or a later release
-  GIT_PROGRESS TRUE
-  FIND_PACKAGE_ARGS NAMES Catch2)
-
-FetchContent_MakeAvailable(Catch2)
-list(APPEND CMAKE_MODULE_PATH ${catch2_SOURCE_DIR}/extras)
+find_package(Catch2 CONFIG REQUIRED)
 
 if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
   add_compile_options(-fconstexpr-steps=1000000000)