eive/eive-obsw
eive/eive-obsw
13
4
Fork 0
Code Issues 4 Pull Requests 1 Releases 120 Wiki Activity

Catch2 hotfix #177

Merged
meierj merged 3 commits from mueller/suppress-catch2-warning into develop 2022-03-09 10:47:59 +01:00
Conversation 1 Commits 3 Files Changed 1 +4 -3
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 8cf3220cd0 - Show all commits

7
CMakeLists.txt
View File

@ -150,9 +150,6 @@ set(FSFW_ADDITIONAL_INC_PATHS
${CMAKE_CURRENT_BINARY_DIR}
)
# Check whether the user has already installed Catch2 first
find_package(Catch2 3 QUIET)
################################################################################
# Executable and Sources
################################################################################
@ -199,8 +196,12 @@ elseif(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
set(COMPILER_FLAGS "/permissive-")
endif()
# Check whether the user has already installed Catch2 first
find_package(Catch2 3 QUIET)
# Not installed, so use FetchContent to download and provide Catch2
if(NOT Catch2_FOUND)
message(STATUS "Did not find a valid Catch2 installation. Using FetchContent to install it")
include(FetchContent)
FetchContent_Declare(