From 847228911fb13143b7df31617be4c2a505e1e903 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Fri, 8 Nov 2024 18:04:36 +0100 Subject: [PATCH] add option to add Catch2 for library users --- CMakeLists.txt | 5 ++--- contrib/fsfw_contrib/CMakeLists.txt | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index eee2c6b7..dfa85fd3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -90,6 +90,7 @@ endif() option(FSFW_BUILD_TESTS "Build unittest binary in addition to static library. Requires Catch2" OFF) +option(FSFW_ADD_CATCH2 "Add Catch2 unittest framework dependency" OFF) option(FSFW_CICD_BUILD "Build for CI/CD. This can disable problematic test" OFF) option(FSFW_BUILD_DOCS "Build documentation with Sphinx and Doxygen" OFF) if(FSFW_BUILD_TESTS) @@ -141,9 +142,7 @@ if(FSFW_BUILD_TESTS) configure_file(unittests/testcfg/TestsConfig.h.in tests/TestsConfig.h) project(${FSFW_TEST_TGT} CXX C) - add_executable( - ${FSFW_TEST_TGT} - ) + add_executable(${FSFW_TEST_TGT}) if(IPO_SUPPORTED AND FSFW_ENABLE_IPO) set_property(TARGET ${FSFW_TEST_TGT} PROPERTY INTERPROCEDURAL_OPTIMIZATION TRUE) diff --git a/contrib/fsfw_contrib/CMakeLists.txt b/contrib/fsfw_contrib/CMakeLists.txt index a987f2df..3c5d12ad 100644 --- a/contrib/fsfw_contrib/CMakeLists.txt +++ b/contrib/fsfw_contrib/CMakeLists.txt @@ -11,6 +11,6 @@ if(FSFW_ADD_SGP4_PROPAGATOR) endif() add_subdirectory(etl-20.39.4) -if(FSFW_BUILD_TESTS) +if(FSFW_BUILD_TESTS OR FSFW_ADD_CATCH2) add_subdirectory(Catch2-3.7.1) -endif() \ No newline at end of file +endif() -- 2.43.0