From a9fb2231c859d1da156af1052a1220fa447482ef Mon Sep 17 00:00:00 2001 From: Jojo-1000 <33495614+Jojo-1000@users.noreply.github.com> Date: Sat, 18 Apr 2020 19:03:07 +0200 Subject: [PATCH] Add sources directly for coverage test, so cpp files are included. --- src/CMakeLists.txt | 6 ++++++ test/CMakeLists.txt | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index aa09a70..74238fc 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -37,6 +37,12 @@ if(ESP_PLATFORM) ) endif() +# append current source dir before files +foreach(src ${hueplusplus_SOURCES}) + list(APPEND _srcList "${CMAKE_CURRENT_SOURCE_DIR}/${src}") +endforeach() +set(hueplusplus_SOURCES ${_srcList} PARENT_SCOPE) + # hueplusplus shared library add_library(hueplusplusshared SHARED ${hueplusplus_SOURCES}) target_compile_features(hueplusplusshared PUBLIC cxx_std_14) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index e256b2e..be92fe5 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -76,11 +76,11 @@ mark_as_advanced(LCOV_PATH) if(LCOV_PATH AND GCOV_PATH) # GCov include(CodeCoverage.cmake) - add_executable(testcov_HuePlusPlus ${TEST_SOURCES}) + add_executable(testcov_HuePlusPlus ${TEST_SOURCES} ${hueplusplus_SOURCES}) + target_include_directories(testcov_HuePlusPlus PUBLIC "${PROJECT_SOURCE_DIR}/include") target_compile_features(testcov_HuePlusPlus PUBLIC cxx_std_14) set_property(TARGET testcov_HuePlusPlus PROPERTY CXX_EXTENSIONS OFF) - target_link_libraries(testcov_HuePlusPlus PUBLIC hueplusplusstatic) target_link_libraries(testcov_HuePlusPlus PUBLIC gtest gmock) target_include_directories(testcov_HuePlusPlus PUBLIC ${GTest_INCLUDE_DIRS}) # this will be already done by APPEND_COVERAGE_COMPILER_FLAGS() -- libgit2 0.21.4