← Back to branch summary

~ci-train-bot/indicator-datetime/indicator-datetime-ubuntu-zesty-2446

« back to all changes in this revision

Viewing changes to src/CMakeLists.txt

  • Committer: Bileto Bot
  • Author(s): Rodney Dawes
  • Date: 2017-02-10 17:08:55 UTC
  • mfrom: (472.2.6 fix-coverage)
  • Revision ID: ci-train-bot@canonical.com-20170210170855-it1wpq3r4d48332r
Use cmake-extras for coverage support and always enable testing.

Approved by: Charles Kerr, Pete Woods, unity-api-1-bot

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/CMakeLists.txt
54
54
# add warnings/coverage info on handwritten files
55
55
# but not the autogenerated ones...
56
56
set_source_files_properties(${SERVICE_CXX_SOURCES}
57
 
                            PROPERTIES COMPILE_FLAGS "${CXX_WARNING_ARGS} ${GCOV_FLAGS} -g -std=c++11")
 
57
                            PROPERTIES COMPILE_FLAGS "${CXX_WARNING_ARGS} -std=c++11")
58
58
set_source_files_properties(${SERVICE_C_SOURCES}
59
 
                            PROPERTIES COMPILE_FLAGS "${CXX_WARNING_ARGS} ${GCOV_FLAGS} -g -std=c99")
 
59
                            PROPERTIES COMPILE_FLAGS "${CXX_WARNING_ARGS} -std=c99")
60
60
 
61
61
# add the bin dir to our include path so our code can find the generated header files
62
62
include_directories (${CMAKE_CURRENT_BINARY_DIR})
66
66
link_directories (${SERVICE_DEPS_LIBRARY_DIRS})
67
67
 
68
68
add_executable (${SERVICE_EXEC} main.cpp)
69
 
set_source_files_properties(${SERVICE_SOURCES} main.cpp PROPERTIES COMPILE_FLAGS "${CXX_WARNING_ARGS} -g -std=c++11")
70
 
target_link_libraries (${SERVICE_EXEC} ${SERVICE_LIB} ${SERVICE_DEPS_LIBRARIES} ${GCOV_LIBS})
 
69
set_source_files_properties(${SERVICE_SOURCES} main.cpp PROPERTIES COMPILE_FLAGS "${CXX_WARNING_ARGS} -std=c++11")
 
70
target_link_libraries (${SERVICE_EXEC} ${SERVICE_LIB} ${SERVICE_DEPS_LIBRARIES})
71
71
install (TARGETS ${SERVICE_EXEC} RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_PKGLIBEXECDIR})
72
72