remove ENV overrides, shorten opt name, only allow setting via cmake option (not envvar), update doc ref

Author: tevio

cmake/script/CoverageInclude.cmake.in

@@ -2,13 +2,6 @@
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or https://opensource.org/license/mit/.
 
-if(NOT DEFINED LCOV_OPTS)
-  set(LCOV_OPTS "$ENV{LCOV_OPTS}")
-endif()
-if(NOT DEFINED GENHTML_OPTS)
-  set(GENHTML_OPTS "$ENV{GENHTML_OPTS}")
-endif()
-
 if("@CMAKE_CXX_COMPILER_ID@" STREQUAL "Clang")
   find_program(LLVM_COV_EXECUTABLE llvm-cov REQUIRED)
   set(COV_TOOL "${LLVM_COV_EXECUTABLE} gcov")
@@ -31,8 +24,8 @@ separate_arguments(LCOV_OPTS)
 set(LCOV_COMMAND ${LCOV_EXECUTABLE} --gcov-tool ${CMAKE_CURRENT_LIST_DIR}/cov_tool_wrapper.sh ${LCOV_OPTS})
 
 find_program(GENHTML_EXECUTABLE genhtml REQUIRED)
-separate_arguments(GENHTML_OPTS)
-set(GENHTML_COMMAND ${GENHTML_EXECUTABLE} --show-details ${GENHTML_OPTS})
+separate_arguments(HTML_OPTS)
+set(GENHTML_COMMAND ${GENHTML_EXECUTABLE} --show-details ${HTML_OPTS})
 
 find_program(GREP_EXECUTABLE grep REQUIRED)
 find_program(AWK_EXECUTABLE awk REQUIRED)

doc/developer-notes.md

@@ -508,8 +508,12 @@ enabled by setting `LCOV_OPTS="--rc branch_coverage=1"`:
 cmake -DLCOV_OPTS="--rc branch_coverage=1" -P build/Coverage.cmake
 ```
 
-GENHTML_OPTS can be specified to provide options to genhtml, the program that generates the
-html report from lcov: `GENHTML_OPTS="--exclude boost"`.
+HTML_OPTS can be specified to provide options to genhtml, the program that generates the
+html report from lcov: `HTML_OPTS="--exclude boost"`.
+
+```
+cmake -DHTML_OPTS="--exclude boost" -P build/Coverage.cmake
+```
 
 To enable test parallelism:
 ```