Skip to content

Commit

Permalink
for ci?
Browse files Browse the repository at this point in the history
  • Loading branch information
mhekkel committed Mar 6, 2024
1 parent 1863713 commit 835fd80
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 12 deletions.
13 changes: 2 additions & 11 deletions .github/workflows/cmake-multi-platform.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ jobs:
matrix:
os: [ubuntu-latest, windows-latest, macos-latest]
include:
# - os: windows-latest
# cpp_compiler: cl
- os: windows-latest
cpp_compiler: cl
- os: ubuntu-latest
cpp_compiler: g++
- os: macos-latest
Expand All @@ -36,15 +36,6 @@ jobs:
run: >
sudo apt-get update && sudo apt-get install catch2
# - name: Install Catch2 Windows
# if: matrix.os == 'windows-latest'
# uses: MarkusJx/[email protected]
# id: install-boost
# with:
# boost_version: 1.82.0
# platform_version: 2019
# toolset: msvc

- name: Install Catch2 macOS
if: matrix.os == 'macos-latest'
run: >
Expand Down
13 changes: 12 additions & 1 deletion test/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,15 @@
find_package(Catch2 REQUIRED)
find_package(Catch2 QUIET)

if(NOT Catch2_FOUND)
FetchContent_Declare(
Catch2
GIT_REPOSITORY https://github.com/catchorg/Catch2.git
GIT_TAG v2.13.9)

FetchContent_MakeAvailable(Catch2)

set(Catch2_VERSION "2.13.9")
endif()

add_executable(mcfp-unit-test ${CMAKE_CURRENT_SOURCE_DIR}/unit-test.cpp)

Expand Down

0 comments on commit 835fd80

Please sign in to comment.