diff --git a/CMakeLists.txt b/CMakeLists.txt index 01df7af..479acc3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -23,12 +23,4 @@ if(BUILD_AS_STANDALONE) enable_testing() add_subdirectory(untests) endif() - - option(BUILD_WITH_COVERAGE "Build with coverage" OFF) - if(BUILD_WITH_COVERAGE AND (CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")) - set(COVERAGE_FLAGS "--coverage") - set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} ${COVERAGE_FLAGS}") - set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${COVERAGE_FLAGS}") - set(CMAKE_LINKER_FLAGS_DEBUG "${CMAKE_LINKER_FLAGS_DEBUG} ${COVERAGE_FLAGS}") - endif() endif() diff --git a/scripts/upload_coverage.sh b/scripts/upload_coverage.sh index 5c65ca1..b1eef21 100755 --- a/scripts/upload_coverage.sh +++ b/scripts/upload_coverage.sh @@ -4,7 +4,7 @@ set -e BUILD_DIR=`dirname "$BASH_SOURCE"`/../build mkdir -p $BUILD_DIR/coverage cd $BUILD_DIR/coverage -cmake -DCMAKE_BUILD_TYPE=Debug -DFLAT_BUILD_WITH_COVERAGE=ON ../.. +cmake -DCMAKE_BUILD_TYPE=Debug -DBUILD_WITH_COVERAGE=ON ../.. cmake --build . -- -j8 lcov -d . -z diff --git a/untests/CMakeLists.txt b/untests/CMakeLists.txt index 735fbe1..c71a4db 100644 --- a/untests/CMakeLists.txt +++ b/untests/CMakeLists.txt @@ -16,6 +16,14 @@ if(NOT catch2_POPULATED) add_subdirectory(${catch2_SOURCE_DIR} ${catch2_BINARY_DIR}) endif() +option(BUILD_WITH_COVERAGE "Build with coverage" OFF) +if(BUILD_WITH_COVERAGE AND (CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")) + set(COVERAGE_FLAGS "--coverage") + set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} ${COVERAGE_FLAGS}") + set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${COVERAGE_FLAGS}") + set(CMAKE_LINKER_FLAGS_DEBUG "${CMAKE_LINKER_FLAGS_DEBUG} ${COVERAGE_FLAGS}") +endif() + file(GLOB UNTESTS_SOURCES "*.cpp" "*.hpp") add_executable(${PROJECT_NAME} ${UNTESTS_SOURCES}) target_link_libraries(${PROJECT_NAME}