From eee66b517673da38e51b61dc7ed6a4dfdd2a83c9 Mon Sep 17 00:00:00 2001
From: Felix Morgner <felix.morgner@gmail.com>
Date: Sat, 29 Feb 2020 13:00:39 +0100
Subject: build: fix coverage conditions

---
 .travis.yml    |  2 +-
 CMakeLists.txt | 24 ++++++++++++++----------
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index eba74f0..a348464 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -30,5 +30,5 @@ install:
   - sudo apt-get install cmake
 
 script:
-  - /usr/bin/cmake -S . -B build -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_TESTING=YES -DRUN_TESTS_AFTER_BUILD=YES -DENABLE_CODE_COVERAGE=YES -DPRINT_COVERAGE_REPORT=YES .. 
+  - /usr/bin/cmake -S . -B build -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_TESTING=YES -DRUN_TESTS_AFTER_BUILD=YES -DENABLE_CODE_COVERAGE=YES -DPRINT_COVERAGE_REPORT=YES
   - /usr/bin/cmake --build build --target all --parallel $(nproc)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 571d320..fdd2fa3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -125,7 +125,7 @@ if(BUILD_TESTING)
     )
   endif()
 
-  if(GENERATE_COVERAGE_REPORT AND RUN_TESTS_AFTER_BUILD)
+  if(ENABLE_CODE_COVERAGE AND RUN_TESTS_AFTER_BUILD)
     add_custom_command(TARGET "${PROJECT_NAME}_tests"
       POST_BUILD
       BYPRODUCTS "${PROJECT_BINARY_DIR}/${PROJECT_NAME}.coverage.info"
@@ -140,16 +140,20 @@ if(BUILD_TESTING)
       WORKING_DIRECTORY "${PROJECT_BINARY_DIR}"
       COMMENT "Capturing code coverage data"
     )
-    add_custom_command(TARGET "${PROJECT_NAME}_tests"
-      POST_BUILD
-      COMMAND "${LCOV_EXE}"
-      ARGS
-      "--list"
-      "${PROJECT_NAME}.coverage.info"
-      WORKING_DIRECTORY "${PROJECT_BINARY_DIR}"
-      COMMENT "Printing code coverage report"
-    )
+
     if(PRINT_COVERAGE_REPORT)
+      add_custom_command(TARGET "${PROJECT_NAME}_tests"
+        POST_BUILD
+        COMMAND "${LCOV_EXE}"
+        ARGS
+        "--list"
+        "${PROJECT_NAME}.coverage.info"
+        WORKING_DIRECTORY "${PROJECT_BINARY_DIR}"
+        COMMENT "Printing code coverage report"
+      )
+    endif()
+
+    if(GENERATE_COVERAGE_REPORT)
       add_custom_command(TARGET "${PROJECT_NAME}_tests"
         POST_BUILD
         BYPRODUCTS "${PROJECT_BINARY_DIR}/coverage-report/index.html"
-- 
cgit v1.2.3