KSat/fsfw
18
6
Fork 0
forked from fsfw/fsfw
Code Issues Pull Requests 1 Releases Wiki Activity

Merge branch 'mueller/add-etl-dependency' into mueller/master

Browse Source
This commit is contained in:
Robin Müller 2022-03-28 21:03:27 +02:00
commit 0cb2868b24
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@ -64,7 +64,7 @@ add_library(${LIB_FSFW_NAME})
if(FSFW_BUILD_UNITTESTS) if(FSFW_BUILD_UNITTESTS)
message(STATUS "Building the FSFW unittests in addition to the static library") message(STATUS "Building the FSFW unittests in addition to the static library")
# Check whether the user has already installed Catch2 first # Check whether the user has already installed Catch2 first
find_package(Catch2 3) find_package(Catch2 ${FSFW_CATCH2_LIB_MAJOR_VERSION})
# Not installed, so use FetchContent to download and provide Catch2 # Not installed, so use FetchContent to download and provide Catch2
if(NOT Catch2_FOUND) if(NOT Catch2_FOUND)
include(FetchContent) include(FetchContent)
@ -106,6 +106,9 @@ endif()
message(STATUS "Finding and/or providing ETL library") message(STATUS "Finding and/or providing ETL library")
# Check whether the user has already installed Catch2 first # Check whether the user has already installed Catch2 first
# I think the version provisioning feature of CMake has not been implemented for the ETL library
# yet. Therefore we can not specify any (not even the major) version here and we have to rely
# on the user having installed the correct version for now
find_package(${FSFW_ETL_LIB_NAME} QUIET) find_package(${FSFW_ETL_LIB_NAME} QUIET)
# Not installed, so use FetchContent to download and provide etl # Not installed, so use FetchContent to download and provide etl
if(NOT ${FSFW_ETL_LIB_NAME}_FOUND) if(NOT ${FSFW_ETL_LIB_NAME}_FOUND)