Properly handle unavailable Catch2 (#656)

This commit is contained in:
Frank Dana
2021-04-16 11:16:55 -04:00
committed by GitHub
parent fbc8a9b47b
commit 3457ffcc7e
2 changed files with 8 additions and 7 deletions

View File

@@ -173,9 +173,12 @@ if (ENABLE_DOCS)
endif()
############# PROCESS tests/ DIRECTORY ##############
if(ENABLE_TESTS)
set(TESTS_ENABLED TRUE) # May be overridden by tests/CMakeLists.txt
find_package(Catch2 REQUIRED)
set(BUILD_TESTS ${ENABLE_TESTS})
find_package(Catch2 QUIET)
if(NOT Catch2_FOUND)
set(BUILD_TESTS FALSE)
endif()
if(BUILD_TESTS)
if(ENABLE_PARALLEL_CTEST)
# Figure out the amount of parallelism for CTest
include(ProcessorCount)
@@ -189,7 +192,7 @@ if(ENABLE_TESTS)
include(Catch)
add_subdirectory(tests)
endif()
add_feature_info("Unit tests" TESTS_ENABLED "Compile unit tests for library functions")
add_feature_info("Unit tests" BUILD_TESTS "Compile unit tests for library functions")
############## COVERAGE REPORTING #################
if (ENABLE_COVERAGE AND DEFINED UNIT_TEST_TARGETS)
@@ -207,7 +210,7 @@ if (ENABLE_COVERAGE AND DEFINED UNIT_TEST_TARGETS)
)
endif()
if(TESTS_ENABLED AND NOT TARGET coverage)
if(BUILD_TESTS AND NOT TARGET coverage)
add_custom_target(coverage
COMMAND ctest ${CTEST_OPTIONS}
DEPENDS openshot ${UNIT_TEST_TARGETS}

View File

@@ -77,9 +77,7 @@ endif()
### Catch2 unit tests
###
if (TESTS_ENABLED)
message (STATUS "Tests enabled, test executables will be compiled")
include(Catch)
include(CTest)
# Create object library for test executable main(),