1
=== modified file 'CMakeLists.txt'
2
--- CMakeLists.txt	2015-09-23 13:47:10 +0000
3
+++ CMakeLists.txt	2016-12-02 21:27:54 +0000
4
@@ -73,22 +73,23 @@
5
73
include_directories (${CMAKE_CURRENT_SOURCE_DIR}/include)
73
include_directories (${CMAKE_CURRENT_SOURCE_DIR}/include)
6
74
include_directories (${CMAKE_CURRENT_BINARY_DIR}/include)
74
include_directories (${CMAKE_CURRENT_BINARY_DIR}/include)
7
75
75
8
76
# testing & coverage
9
77
if (${enable_tests})
10
78
  pkg_check_modules (DBUSTEST REQUIRED dbustest-1>=14.04.0)
11
79
  enable_testing ()
12
80
  if (${enable_lcov})
13
81
    include(GCov)
14
82
  endif ()
15
83
endif ()
16
84
17
85
# add the subdirs
76
# add the subdirs
18
86
add_subdirectory(data)
77
add_subdirectory(data)
19
87
add_subdirectory(include)
78
add_subdirectory(include)
20
88
add_subdirectory(src)
79
add_subdirectory(src)
21
89
add_subdirectory(po)
80
add_subdirectory(po)
22
81
23
82
# testing & coverage
24
90
if (${enable_tests})
83
if (${enable_tests})
25
84
  pkg_check_modules (DBUSTEST REQUIRED dbustest-1>=14.04.0)
26
85
  enable_testing ()
27
91
  add_subdirectory(tests)
86
  add_subdirectory(tests)
28
87
  include(EnableCoverageReport)
29
88
  ENABLE_COVERAGE_REPORT(
30
89
    TARGETS indicator-transfer indicator-transfer-service dmtransfers mock-source-plugin
31
90
    TESTS test-controller test-multisource test-plugin-source test-view-gmenu
32
91
    FILTER /usr/include ${CMAKE_BINARY_DIR}/*
33
92
  )
34
92
endif ()
93
endif ()
35
93
94
36
94
# uninstall target
95
# uninstall target
37
95
96
38
=== removed file 'cmake/GCov.cmake'
39
--- cmake/GCov.cmake	2014-03-29 17:17:09 +0000
40
+++ cmake/GCov.cmake	1970-01-01 00:00:00 +0000
41
@@ -1,51 +0,0 @@
42
1
if (CMAKE_BUILD_TYPE MATCHES coverage)
43
2
  set(GCOV_FLAGS "${GCOV_FLAGS} --coverage")
44
3
  set(CMAKE_EXE_LINKER_FLAGS    "${CMAKE_EXE_LINKER_FLAGS}    ${GCOV_FLAGS}")
45
4
  set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} ${GCOV_FLAGS}")
46
5
  set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${GCOV_FLAGS}")
47
6
  set(GCOV_LIBS ${GCOV_LIBS} gcov)
48
7
49
8
  find_program(GCOVR_EXECUTABLE gcovr HINTS ${GCOVR_ROOT} "${GCOVR_ROOT}/bin")
50
9
  if (NOT GCOVR_EXECUTABLE)
51
10
    message(STATUS "Gcovr binary was not found, can not generate XML coverage info.")
52
11
  else ()
53
12
    message(STATUS "Gcovr found, can generate XML coverage info.")
54
13
    add_custom_target (coverage-xml
55
14
      WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
56
15
      COMMAND "${GCOVR_EXECUTABLE}" --exclude="test.*" -x -r "${CMAKE_SOURCE_DIR}" 
57
16
      --object-directory=${CMAKE_BINARY_DIR} -o coverage.xml)
58
17
  endif()
59
18
60
19
  find_program(LCOV_EXECUTABLE lcov HINTS ${LCOV_ROOT} "${GCOVR_ROOT}/bin")
61
20
  find_program(GENHTML_EXECUTABLE genhtml HINTS ${GENHTML_ROOT})
62
21
  if (NOT LCOV_EXECUTABLE)
63
22
    message(STATUS "Lcov binary was not found, can not generate HTML coverage info.")
64
23
  else ()
65
24
    if(NOT GENHTML_EXECUTABLE)
66
25
      message(STATUS "Genthml binary not found, can not generate HTML coverage info.")
67
26
    else()
68
27
      message(STATUS "Lcov and genhtml found, can generate HTML coverage info.")
69
28
      add_custom_target (coverage-html
70
29
        WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
71
30
        COMMAND "${CMAKE_CTEST_COMMAND}" --force-new-ctest-process --verbose
72
31
        COMMAND "${LCOV_EXECUTABLE}" --directory ${CMAKE_BINARY_DIR} --capture | ${CMAKE_SOURCE_DIR}/trim-lcov.py > dconf-lcov.info
73
32
        COMMAND "${LCOV_EXECUTABLE}" -r dconf-lcov.info /usr/include/\\*  -o nosys-lcov.info
74
33
        COMMAND LANG=C "${GENHTML_EXECUTABLE}" --prefix ${CMAKE_BINARY_DIR} --output-directory lcov-html --legend --show-details nosys-lcov.info
75
34
        COMMAND ${CMAKE_COMMAND} -E echo ""
76
35
        COMMAND ${CMAKE_COMMAND} -E echo "file://${CMAKE_BINARY_DIR}/lcov-html/index.html"
77
36
        COMMAND ${CMAKE_COMMAND} -E echo "")
78
37
        #COMMAND "${LCOV_EXECUTABLE}" --directory ${CMAKE_BINARY_DIR} --capture --output-file coverage.info --no-checksum
79
38
        #COMMAND "${GENHTML_EXECUTABLE}" --prefix ${CMAKE_BINARY_DIR} --output-directory coveragereport --title "Code Coverage" --legend --show-details coverage.info
80
39
        #COMMAND ${CMAKE_COMMAND} -E echo "\\#define foo \\\"bar\\\"" 
81
40
        #)
82
41
    endif()
83
42
  endif()
84
43
endif()
85
44
86
45
87
46
	#$(MAKE) $(AM_MAKEFLAGS) check
88
47
	#lcov --directory $(top_builddir) --capture --test-name dconf | $(top_srcdir)/trim-lcov.py > dconf-lcov.info
89
48
	#LANG=C genhtml --prefix $(top_builddir) --output-directory lcov-html --legend --show-details dconf-lcov.info
90
49
	#@echo
91
50
	#@echo "     file://$(abs_top_builddir)/lcov-html/index.html"
92
51
	#@echo
93
52
0
94
=== modified file 'src/CMakeLists.txt'
95
--- src/CMakeLists.txt	2015-08-03 14:28:28 +0000
96
+++ src/CMakeLists.txt	2016-12-02 21:27:54 +0000
97
@@ -15,7 +15,7 @@
98
15
     multisource.cpp)
15
     multisource.cpp)
99
16
16
100
17
add_library(${SERVICE_LIB} SHARED ${SERVICE_LIB_HANDWRITTEN_SOURCES})
17
add_library(${SERVICE_LIB} SHARED ${SERVICE_LIB_HANDWRITTEN_SOURCES})
102
18
target_link_libraries (${SERVICE_LIB} PRIVATE ${SERVICE_DEPS_LIBRARIES} ${GCOV_LIBS})
18
target_link_libraries (${SERVICE_LIB} PRIVATE ${SERVICE_DEPS_LIBRARIES})
103
19
19
104
20
set_target_properties(${SERVICE_LIB} PROPERTIES
20
set_target_properties(${SERVICE_LIB} PROPERTIES
105
21
  VERSION ${INDICATOR_TRANSFER_VERSION}
21
  VERSION ${INDICATOR_TRANSFER_VERSION}
106
@@ -32,13 +32,13 @@
107
32
32
108
33
set (SERVICE_EXEC_HANDWRITTEN_SOURCES main.cpp)
33
set (SERVICE_EXEC_HANDWRITTEN_SOURCES main.cpp)
109
34
add_executable (${SERVICE_EXEC} ${SERVICE_EXEC_HANDWRITTEN_SOURCES})
34
add_executable (${SERVICE_EXEC} ${SERVICE_EXEC_HANDWRITTEN_SOURCES})
111
35
target_link_libraries (${SERVICE_EXEC} ${SERVICE_LIB} ${SERVICE_DEPS_LIBRARIES} ${GCOV_LIBS})
35
target_link_libraries (${SERVICE_EXEC} ${SERVICE_LIB} ${SERVICE_DEPS_LIBRARIES})
112
36
install (TARGETS ${SERVICE_EXEC} RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_PKGLIBEXECDIR})
36
install (TARGETS ${SERVICE_EXEC} RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_PKGLIBEXECDIR})
113
37
37
114
38
# add warnings/coverage info on handwritten files
38
# add warnings/coverage info on handwritten files
115
39
# but not the generated ones...
39
# but not the generated ones...
116
40
set_property (SOURCE ${SERVICE_LIB_HANDWRITTEN_SOURCES} ${SERVICE_EXEC_HANDWRITTEN_SOURCES}
40
set_property (SOURCE ${SERVICE_LIB_HANDWRITTEN_SOURCES} ${SERVICE_EXEC_HANDWRITTEN_SOURCES}
118
41
              APPEND_STRING PROPERTY COMPILE_FLAGS " -std=c++11 -fPIC -g ${CXX_WARNING_ARGS} ${GCOV_FLAGS}")
41
              APPEND_STRING PROPERTY COMPILE_FLAGS " -std=c++11 -fPIC -g ${CXX_WARNING_ARGS}")
119
42
42
120
43
set_property (SOURCE main.cpp APPEND PROPERTY COMPILE_DEFINITIONS PLUGINDIR="${CMAKE_INSTALL_FULL_PKGLIBEXECDIR}")
43
set_property (SOURCE main.cpp APPEND PROPERTY COMPILE_DEFINITIONS PLUGINDIR="${CMAKE_INSTALL_FULL_PKGLIBEXECDIR}")
121
44
44
122
45
45
123
=== modified file 'src/dm-plugin/CMakeLists.txt'
124
--- src/dm-plugin/CMakeLists.txt	2015-07-30 19:52:49 +0000
125
+++ src/dm-plugin/CMakeLists.txt	2016-12-02 21:27:54 +0000
126
@@ -13,9 +13,9 @@
127
13
target_link_libraries (${DM_LIB}
13
target_link_libraries (${DM_LIB}
128
14
    indicator-transfer
14
    indicator-transfer
129
15
    ${SERVICE_DEPS_LIBRARIES}
15
    ${SERVICE_DEPS_LIBRARIES}
131
16
    ${GCOV_LIBS})
16
)
132
17
17
133
18
install(TARGETS ${DM_LIB} LIBRARY DESTINATION ${CMAKE_INSTALL_FULL_PKGLIBEXECDIR})
18
install(TARGETS ${DM_LIB} LIBRARY DESTINATION ${CMAKE_INSTALL_FULL_PKGLIBEXECDIR})
134
19
19
135
20
set_property (SOURCE ${DM_SOURCES}
20
set_property (SOURCE ${DM_SOURCES}
137
21
              APPEND_STRING PROPERTY COMPILE_FLAGS " -std=c++11 -fPIC -g ${CXX_WARNING_ARGS} ${GCOV_FLAGS}")
21
              APPEND_STRING PROPERTY COMPILE_FLAGS " -std=c++11 -fPIC -g ${CXX_WARNING_ARGS}")
Status:	Merged
Approved by:	Pete Woods on 2016-12-05
Approved revision:	49
Merged at revision:	50
Proposed branch:	lp:~dobey/indicator-transfer/fix-coverage
Merge into:	lp:indicator-transfer
Prerequisite:	lp:~dobey/indicator-transfer/new-gmock
Diff against target:	137 lines (+15/-65) 4 files modified CMakeLists.txt (+10/-9) cmake/GCov.cmake (+0/-51) src/CMakeLists.txt (+3/-3) src/dm-plugin/CMakeLists.txt (+2/-2)
To merge this branch:	bzr merge lp:~dobey/indicator-transfer/fix-coverage
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Charles Kerr (community)			Approve on 2016-12-06
Pete Woods (community)		2016-12-02	Approve on 2016-12-05
unity-api-1-bot	continuous-integration		Approve on 2016-12-02
Review via email: mp+312401@code.launchpad.net