update workflows

rekola · Feb 6, 2024 · 12c9776 · 12c9776
1 parent c632283
commit 12c9776
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/.github/workflows/ubuntu-ci.yml b/.github/workflows/ubuntu-ci.yml
@@ -25,11 +25,6 @@ jobs:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
       - uses: actions/checkout@v3
 
-      # Compile
-      - name: Configure
-        run: |
-          sudo apt install catch2
-
       # Build
       - name: Build
         run: |

diff --git a/.github/workflows/vs17-ci.yml b/.github/workflows/vs17-ci.yml
@@ -22,7 +22,6 @@ jobs:
       - name: Configure
         working-directory: ${{github.workspace}}
         run: |
-          vcpkg install catch2
           mkdir build
           cd build && cmake -G "${{matrix.gen}}" -A ${{matrix.arch}}  ..
       - name: Build

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -19,8 +19,13 @@ else()
 	# set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pg")
 endif()
 
-find_package(Catch2 2 REQUIRED)
-# These tests can use the Catch2-provided main
+include(FetchContent)
+FetchContent_Declare(Catch2
+  QUIET
+  URL https://github.com/catchorg/Catch2/archive/v2.13.4.tar.gz
+)
+FetchContent_MakeAvailable(Catch2)
+
 add_executable(tests tests/test.cpp)
 target_link_libraries(tests PRIVATE Catch2::Catch2WithMain)
 target_include_directories(tests PRIVATE include)