More tweaks

Author: kunitoki

cmake/yup_utilities.cmake

@@ -291,7 +291,7 @@ endfunction()
 
 #==============================================================================
 
-function (_yup_setup_coverage_targets modules_list)
+function (_yup_setup_coverage_targets test_target_name modules_list)
     if (YUP_ENABLE_COVERAGE AND (CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang"))
         find_program (LCOV_PATH lcov)
         find_program (GENHTML_PATH genhtml)
@@ -316,16 +316,26 @@ function (_yup_setup_coverage_targets modules_list)
 
             add_custom_target (coverage_${module_name}
                 COMMAND ${CMAKE_COMMAND} -E echo "Generating coverage for ${module_name}"
-                COMMAND ${LCOV_PATH} --directory ${CMAKE_BINARY_DIR} --capture --output-file ${module_coverage_dir}/coverage.info --ignore-errors mismatch,gcov,source,negative
-                COMMAND ${LCOV_PATH} --extract ${module_coverage_dir}/coverage.info "*/modules/${module_name}/*" --output-file ${module_coverage_dir}/coverage_filtered.info --ignore-errors mismatch,gcov,source,negative
-                COMMAND ${LCOV_PATH} --remove ${module_coverage_dir}/coverage_filtered.info "*/thirdparty/*" "*/build/*" "*/tests/*" --output-file ${module_coverage_dir}/coverage_final.info --ignore-errors mismatch,gcov,source,negative
+                COMMAND ${LCOV_PATH}
+                    --directory ${CMAKE_BINARY_DIR} --capture
+                    --output-file ${module_coverage_dir}/coverage.info
+                    --ignore-errors mismatch,gcov,source,negative
+                COMMAND ${LCOV_PATH}
+                    --extract ${module_coverage_dir}/coverage.info "*/modules/${module_name}/*"
+                    --output-file ${module_coverage_dir}/coverage_filtered.info
+                    --ignore-errors mismatch,gcov,source,negative
+                COMMAND ${LCOV_PATH}
+                    --remove ${module_coverage_dir}/coverage_filtered.info "*/thirdparty/*" "*/build/*" "*/tests/*" "*/examples/*"
+                    --output-file ${module_coverage_dir}/coverage_final.info
+                    --ignore-errors mismatch,gcov,source,negative
                 WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
-                DEPENDS yup_tests
+                DEPENDS ${test_target_name}
                 COMMENT "Processing coverage data for ${module_name}")
 
             if (GENHTML_PATH)
                 add_custom_target (coverage_html_${module_name}
-                    COMMAND ${GENHTML_PATH} ${module_coverage_dir}/coverage_final.info --output-directory ${module_coverage_dir}/html
+                    COMMAND ${GENHTML_PATH}
+                        ${module_coverage_dir}/coverage_final.info --output-directory ${module_coverage_dir}/html
                     DEPENDS coverage_${module_name}
                     COMMENT "Generating HTML coverage report for ${module_name}")
             endif()
@@ -334,15 +344,22 @@ function (_yup_setup_coverage_targets modules_list)
         # Combined coverage target
         add_custom_target (coverage_all
             COMMAND ${CMAKE_COMMAND} -E echo "Generating combined coverage report"
-            COMMAND ${LCOV_PATH} --directory ${CMAKE_BINARY_DIR} --capture --output-file ${CMAKE_BINARY_DIR}/coverage/coverage.info --ignore-errors mismatch,gcov,source,negative
-            COMMAND ${LCOV_PATH} --remove ${CMAKE_BINARY_DIR}/coverage/coverage.info "*/thirdparty/*" "*/build/*" "*/tests/*" "*/examples/*" --output-file ${CMAKE_BINARY_DIR}/coverage/coverage_final.info --ignore-errors mismatch,gcov,source,negative
+            COMMAND ${LCOV_PATH}
+                --directory ${CMAKE_BINARY_DIR} --capture
+                --output-file ${CMAKE_BINARY_DIR}/coverage/coverage.info
+                --ignore-errors mismatch,gcov,source,negative
+            COMMAND ${LCOV_PATH}
+                --remove ${CMAKE_BINARY_DIR}/coverage/coverage.info "*/thirdparty/*" "*/build/*" "*/tests/*" "*/examples/*"
+                --output-file ${CMAKE_BINARY_DIR}/coverage/coverage_final.info
+                --ignore-errors mismatch,gcov,source,negative
             WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
-            DEPENDS yup_tests
+            DEPENDS ${test_target_name}
             COMMENT "Processing combined coverage data")
 
         if (GENHTML_PATH)
             add_custom_target (coverage_html_all
-                COMMAND ${GENHTML_PATH} ${CMAKE_BINARY_DIR}/coverage/coverage_final.info --output-directory ${CMAKE_BINARY_DIR}/coverage/html
+                COMMAND ${GENHTML_PATH}
+                    ${CMAKE_BINARY_DIR}/coverage/coverage_final.info --output-directory ${CMAKE_BINARY_DIR}/coverage/html
                 DEPENDS coverage_all
                 COMMENT "Generating combined HTML coverage report")
         endif()

tests/CMakeLists.txt

@@ -93,5 +93,5 @@ if (YUP_ENABLE_COVERAGE)
         _yup_setup_coverage_flags (${module})
     endforeach()
 
-    _yup_setup_coverage_targets ("${target_modules}")
+    _yup_setup_coverage_targets (${target_name} "${target_modules}")
 endif()