diff --git a/cmake/CodeCoverage.cmake b/cmake/CodeCoverage.cmake
index 8cd99effe..af46de19b 100644
--- a/cmake/CodeCoverage.cmake
+++ b/cmake/CodeCoverage.cmake
@@ -320,7 +320,8 @@ function(setup_target_for_coverage_lcov)
       ${Coverage_NAME}.base
       -a
       ${Coverage_NAME}.capture
-      --ignore-errors mismatch,gcov
+      --ignore-errors
+      mismatch,gcov
       --output-file
       ${Coverage_NAME}.total)
   # filter collected data to final coverage report
@@ -329,15 +330,23 @@ function(setup_target_for_coverage_lcov)
       ${Coverage_LCOV_ARGS}
       --gcov-tool
       ${GCOV_PATH}
-      --ignore-errors mismatch,gcov
+      --ignore-errors
+      mismatch,gcov
       --remove
       ${Coverage_NAME}.total
       ${LCOV_EXCLUDES}
       --output-file
       ${Coverage_NAME}.info)
   # Generate HTML output
-  set(LCOV_GEN_HTML_CMD ${GENHTML_PATH} ${GENHTML_EXTRA_ARGS} --ignore-errors mismatch,gcov ${Coverage_GENHTML_ARGS} -o
-                        ${Coverage_NAME} ${Coverage_NAME}.info)
+  set(LCOV_GEN_HTML_CMD
+      ${GENHTML_PATH}
+      ${GENHTML_EXTRA_ARGS}
+      --ignore-errors
+      mismatch,gcov
+      ${Coverage_GENHTML_ARGS}
+      -o
+      ${Coverage_NAME}
+      ${Coverage_NAME}.info)
   if(${Coverage_SONARQUBE})
     # Generate SonarQube output
     set(GCOVR_XML_CMD