Use vcpkg to find Catch2

ChrisThrasher · Sep 24, 2024 · 6b923d9 · 6b923d9
1 parent 7b55dd6
commit 6b923d9
Show file tree

Hide file tree

Showing 7 changed files with 38 additions and 24 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -41,6 +41,11 @@ jobs:
 
     - name: Checkout
       uses: actions/checkout@v4
+      with:
+        submodules: true
+
+    - name: Install Vcpkg
+      run: ./cmake/vcpkg/bootstrap-vcpkg.sh
 
     - name: Configure
       run: cmake --preset dev ${{matrix.platform.flags}} -DBUILD_SHARED_LIBS=${{matrix.type.flags}} -DCMAKE_BUILD_TYPE=${{matrix.config.name}} -DCMAKE_VERBOSE_MAKEFILE=ON
@@ -58,6 +63,11 @@ jobs:
     steps:
     - name: Checkout
       uses: actions/checkout@v4
+      with:
+        submodules: true
+
+    - name: Install Vcpkg
+      run: ./cmake/vcpkg/bootstrap-vcpkg.sh
 
     - name: Configure
       run: cmake --preset coverage
@@ -87,6 +97,11 @@ jobs:
     steps:
     - name: Checkout
       uses: actions/checkout@v4
+      with:
+        submodules: true
+
+    - name: Install Vcpkg
+      run: ./cmake/vcpkg/bootstrap-vcpkg.sh
 
     - name: Configure
       run: cmake --preset clang-tools
@@ -103,6 +118,11 @@ jobs:
     steps:
     - name: Checkout
       uses: actions/checkout@v4
+      with:
+        submodules: true
+
+    - name: Install Vcpkg
+      run: ./cmake/vcpkg/bootstrap-vcpkg.sh
 
     - name: Configure
       run: cmake --preset clang-tools
@@ -124,6 +144,11 @@ jobs:
     steps:
     - name: Checkout
       uses: actions/checkout@v4
+      with:
+        submodules: true
+
+    - name: Install Vcpkg
+      run: ./cmake/vcpkg/bootstrap-vcpkg.sh
 
     - name: Configure
       run: cmake --preset ${{matrix.sanitizer.preset}}

diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "vcpkg"]
+	path = cmake/vcpkg
+	url = git@github.com:Microsoft/vcpkg.git
diff --git a/CMakePresets.json b/CMakePresets.json
@@ -5,6 +5,7 @@
       "name": "dev",
       "binaryDir": "build",
       "installDir": "build/install",
+      "toolchainFile": "cmake/vcpkg/scripts/buildsystems/vcpkg.cmake",
       "cacheVariables": {
         "CMAKE_BUILD_TYPE": "Debug",
         "CMAKE_CXX_EXTENSIONS": "OFF",
@@ -13,15 +14,6 @@
         "ARGON_ENABLE_WARNINGS": "ON",
         "ARGON_BUILD_TESTING": "ON",
         "ARGON_BUILD_EXAMPLES": "ON"
-      },
-      "warnings": {
-        "dev": true,
-        "deprecated": true,
-        "uninitialized": true
-      },
-      "errors": {
-        "dev": true,
-        "deprecated": true
       }
     },
     {

diff --git a/cmake/vcpkg b/cmake/vcpkg
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -1,6 +1,4 @@
-list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR})
-
-find_package(Catch2 3.6.0 REQUIRED)
+find_package(Catch2 3.7.0 REQUIRED)
 include(Catch)
 
 add_executable(test-argon Main.cpp Argument.cpp Option.cpp Parser.cpp Position.cpp)

diff --git a/tests/FindCatch2.cmake b/tests/FindCatch2.cmake
diff --git a/vcpkg.json b/vcpkg.json
@@ -0,0 +1,7 @@
+{
+  "name": "argon",
+  "version-string": "0.12.0",
+  "dependencies": [
+    "catch2"
+  ]
+}