From adb6b6cdc6ecca42117e7343dee1dec6e7810081 Mon Sep 17 00:00:00 2001 From: Jojo-1000 <33495614+Jojo-1000@users.noreply.github.com> Date: Mon, 13 Apr 2020 23:08:18 +0200 Subject: [PATCH] Fix coverage test target. --- .travis.yml | 2 +- test/CMakeLists.txt | 15 +++++++-------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index d243034..797f2b9 100755 --- a/.travis.yml +++ b/.travis.yml @@ -59,7 +59,7 @@ script: ############################################################################ - mkdir -p build - cd build - - cmake .. -Dhueplusplus_TESTS=ON + - cmake .. -Dhueplusplus_TESTS=ON -DCMAKE_BUILD_TYPE=Debug - make coveragetest - cd .. - doxygen Doxyfile diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 4501e06..1cedabc 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -71,14 +71,13 @@ find_program( LCOV_PATH lcov ) if(LCOV_PATH AND GCOV_PATH) # GCov include(CodeCoverage.cmake) - add_executable(testcov_HuePlusPlus ${TEST_SOURCES} ${hueplusplus_SOURCES}) - target_link_libraries(testcov_HuePlusPlus gtest gmock) - # prevent Main.cpp from defining main() - target_compile_definitions(testcov_HuePlusPlus PUBLIC MAIN_CPP_NO_MAIN_FUNCTION) - target_include_directories(testcov_HuePlusPlus PUBLIC ${GTest_INCLUDE_DIRS}) - target_include_directories(testcov_HuePlusPlus PUBLIC ${HuePlusPlus_INCLUDE_DIR}) - set_property(TARGET testcov_HuePlusPlus PROPERTY CXX_STANDARD 14) - set_property(TARGET testcov_HuePlusPlus PROPERTY CXX_EXTENSIONS OFF) + add_executable(testcov_HuePlusPlus ${TEST_SOURCES}) + 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() #set_target_properties( # testcov_HuePlusPlus PROPERTIES -- libgit2 0.21.4