Peter M. Groen / hueplusplus

Commit adb6b6cdc6ecca42117e7343dee1dec6e7810081

Authored by Jojo-1000
Committed by Moritz Wirger
1 parent 39ce4c01

Fix coverage test target.

Inline Side-by-side
Showing 2 changed files with 8 additions and 9 deletions
.travis.yml
  View file @adb6b6c
@@ -59,7 +59,7 @@ script: @@ -59,7 +59,7 @@ script:
59 ############################################################################ 59 ############################################################################
60 - mkdir -p build 60 - mkdir -p build
61 - cd build 61 - cd build
62 - - cmake .. -Dhueplusplus_TESTS=ON 62 + - cmake .. -Dhueplusplus_TESTS=ON -DCMAKE_BUILD_TYPE=Debug
63 - make coveragetest 63 - make coveragetest
64 - cd .. 64 - cd ..
65 - doxygen Doxyfile 65 - doxygen Doxyfile
test/CMakeLists.txt
  View file @adb6b6c
@@ -71,14 +71,13 @@ find_program( LCOV_PATH lcov ) @@ -71,14 +71,13 @@ find_program( LCOV_PATH lcov )
71 if(LCOV_PATH AND GCOV_PATH) 71 if(LCOV_PATH AND GCOV_PATH)
72 # GCov 72 # GCov
73 include(CodeCoverage.cmake) 73 include(CodeCoverage.cmake)
74 - add_executable(testcov_HuePlusPlus ${TEST_SOURCES} ${hueplusplus_SOURCES})  
75 - target_link_libraries(testcov_HuePlusPlus gtest gmock)  
76 - # prevent Main.cpp from defining main()  
77 - target_compile_definitions(testcov_HuePlusPlus PUBLIC MAIN_CPP_NO_MAIN_FUNCTION)  
78 - target_include_directories(testcov_HuePlusPlus PUBLIC ${GTest_INCLUDE_DIRS})  
79 - target_include_directories(testcov_HuePlusPlus PUBLIC ${HuePlusPlus_INCLUDE_DIR})  
80 - set_property(TARGET testcov_HuePlusPlus PROPERTY CXX_STANDARD 14)  
81 - set_property(TARGET testcov_HuePlusPlus PROPERTY CXX_EXTENSIONS OFF) 74 + add_executable(testcov_HuePlusPlus ${TEST_SOURCES})
  75 + target_compile_features(testcov_HuePlusPlus PUBLIC cxx_std_14)
  76 + set_property(TARGET testcov_HuePlusPlus PROPERTY CXX_EXTENSIONS OFF)
  77 +
  78 + target_link_libraries(testcov_HuePlusPlus PUBLIC hueplusplusstatic)
  79 + target_link_libraries(testcov_HuePlusPlus PUBLIC gtest gmock)
  80 + target_include_directories(testcov_HuePlusPlus PUBLIC ${GTest_INCLUDE_DIRS})
82 # this will be already done by APPEND_COVERAGE_COMPILER_FLAGS() 81 # this will be already done by APPEND_COVERAGE_COMPILER_FLAGS()
83 #set_target_properties( 82 #set_target_properties(
84 # testcov_HuePlusPlus PROPERTIES 83 # testcov_HuePlusPlus PROPERTIES