From 76789a3a3bd92c08e694b6d05020d20b49bff50f Mon Sep 17 00:00:00 2001
From: Rodney Dawes <rodney.dawes@canonical.com>
Date: Thu, 2 Feb 2017 15:52:03 -0500
Subject: Use cmake-extras for coverage support and always enable testing.

---
 src/CMakeLists.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 823a9b8..37baf86 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -57,9 +57,9 @@ endif()
 # add warnings/coverage info on handwritten files
 # but not the autogenerated ones...
 set_source_files_properties(${SERVICE_CXX_SOURCES}
-                            PROPERTIES COMPILE_FLAGS "${COMPILE_FLAGS} ${GCOV_FLAGS} -g -std=c++11")
+                            PROPERTIES COMPILE_FLAGS "${COMPILE_FLAGS} -g -std=c++11")
 set_source_files_properties(${SERVICE_C_SOURCES}
-                            PROPERTIES COMPILE_FLAGS "${COMPILE_FLAGS} ${GCOV_FLAGS} -g -std=c99")
+                            PROPERTIES COMPILE_FLAGS "${COMPILE_FLAGS} -g -std=c99")
 
 # add the bin dir to our include path so our code can find the generated header files
 include_directories (${CMAKE_CURRENT_BINARY_DIR})
@@ -70,5 +70,5 @@ link_directories (${SERVICE_DEPS_LIBRARY_DIRS})
 
 add_executable (${SERVICE_EXEC} main.cpp)
 set_source_files_properties(${SERVICE_SOURCES} main.cpp PROPERTIES COMPILE_FLAGS "${COMPILE_FLAGS} -g -std=c++11")
-target_link_libraries (${SERVICE_EXEC} ${SERVICE_LIB} ${SERVICE_DEPS_LIBRARIES} ${GCOV_LIBS})
+target_link_libraries (${SERVICE_EXEC} ${SERVICE_LIB} ${SERVICE_DEPS_LIBRARIES})
 install (TARGETS ${SERVICE_EXEC} RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_PKGLIBEXECDIR})
-- 
cgit v1.2.3