Add option to disable coverage cleanup. Cleanup after rebase.

Signed-off-by: Maaike Zijderveld, iolar <git.mail@iolar.nl>

Author: maaikez

CMakeLists.txt

@@ -20,6 +20,7 @@ option(LIBOCPP_ENABLE_DEPRECATED_WEBSOCKETPP "Websocket++ has been removed from
 
 option(LIBOCPP_ENABLE_V16 "Enable OCPP 1.6 in the ocpp library" ON)
 option(LIBOCPP_ENABLE_V201 "Enable OCPP 2.0.1 in the ocpp library" ON)
+option(LIBOCPP_ENABLE_COVERAGE_CLEANUP "Cleanup 'old' coverage files before running coverage again" ON)
 
 if((NOT LIBOCPP_ENABLE_V16) AND (NOT LIBOCPP_ENABLE_V201))
     message(FATAL_ERROR "At least one of LIBOCPP_ENABLE_V16 and LIBOCPP_ENABLE_V201 needs to be ON")

tests/CMakeLists.txt

@@ -82,43 +82,24 @@ add_custom_command(TARGET libocpp_unit_tests POST_BUILD
 
 set(GCOVR_ADDITIONAL_ARGS "--gcov-ignore-parse-errors=negative_hits.warn")
 
-target_include_directories(libocpp_unit_tests PUBLIC 
-        ${CMAKE_CURRENT_SOURCE_DIR}
-        ${CMAKE_CURRENT_SOURCE_DIR}/lib/ocpp/common
-)
-target_link_libraries(libocpp_unit_tests PRIVATE
-        ocpp
-        GTest::gmock_main
-        GTest::gtest_main
-)
-
 set(GCOVR_DEPENDENCIES libocpp_unit_tests)
 
-add_subdirectory(lib/ocpp/common)
-
-if(LIBOCPP_ENABLE_V16)
-    add_subdirectory(lib/ocpp/v16)
-endif()
-
-if(LIBOCPP_ENABLE_V201)
-    add_subdirectory(lib/ocpp/v201)
-endif()
-
 # If ev-coverage is installed, remove gcda files and orphaned object / gcno files.
 find_program(EV_COVERAGE ev-coverage)
 
 if (NOT EV_COVERAGE)
     message("The \"ev-dev-tools\" Python3 package is not installed. You can install it going to
         `everest-utils/ev-dev-tools` and type `pip install .`")
 else()
-    add_custom_target(cleanup_coverage
-        COMMAND
-            ${EV_COVERAGE}
-                remove_files
-                --source-dirs=${LIBOCPP_ROOT_SRC_DIR}
-                --build-dir=${LIBOCPP_ROOT_BUILD_DIR})
-    list(APPEND GCOVR_DEPENDENCIES cleanup_coverage)
-endif()
+    if(LIBOCPP_ENABLE_COVERAGE_CLEANUP)
+        add_custom_target(cleanup_coverage
+            COMMAND
+                ${EV_COVERAGE}
+                    remove_files
+                    --build-dir=${LIBOCPP_ROOT_BUILD_DIR})
+        list(APPEND GCOVR_DEPENDENCIES cleanup_coverage)
+    endif() # LIBOCPP_ENABLE_COVERAGE_CLEANUP
+endif() # EV_COVERAGE
 
 # Run gcovr with the number of processors in this system
 ProcessorCount(number_of_procs)