Unity HUD

Merge lp:~pete-woods/hud/cmake-extras-compatibility into lp:hud

  1. cmake-extras-compatibility
  2. Merge into trunk.15.10
Proposed by Pete Woods
Status: Merged
Approved by: Pete Woods
Approved revision: 413
Merged at revision: 411
Proposed branch: lp:~pete-woods/hud/cmake-extras-compatibility
Merge into: lp:hud
Diff against target: 292 lines (+69/-129)
8 files modified
CMakeLists.txt (+61/-2)
cmake/Coverage.cmake (+0/-37)
cmake/FindValgrind.cmake (+0/-40)
cmake/UseGSettings.cmake (+0/-42)
debian/control (+1/-1)
debian/rules (+1/-3)
tests/CMakeLists.txt (+2/-4)
tests/integration/TestHud.cpp (+4/-0)
To merge this branch: bzr merge lp:~pete-woods/hud/cmake-extras-compatibility
Reviewer Review Type Date Requested Status
Indicator Applet Developers Pending
Review via email: mp+312698@code.launchpad.net

Commit message

Compatibility with unversioned cmake-extras modules. Remove inactive and broken valgrind / memcheck support.

Description of the change

Compatibility with unversioned cmake-extras modules. Remove inactive and broken valgrind / memcheck support.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt 2015-08-20 13:44:43 +0000
+++ CMakeLists.txt 2016-12-12 13:51:51 +0000
@@ -19,11 +19,10 @@
19include(GNUInstallDirs)19include(GNUInstallDirs)
20include(CheckIncludeFile)20include(CheckIncludeFile)
21include(CheckFunctionExists)21include(CheckFunctionExists)
22include(Coverage)
23include(UseGlibGeneration)22include(UseGlibGeneration)
24include(UseGdbusCodegen)23include(UseGdbusCodegen)
25include(UseConstantBuilder)24include(UseConstantBuilder)
26include(UseGSettings)25find_package(GSettings)
27include(UseVala)26include(UseVala)
2827
29# Workaround for libexecdir on debian28# Workaround for libexecdir on debian
@@ -160,6 +159,66 @@
160 ${CMAKE_CTEST_COMMAND} --force-new-ctest-process --output-on-failure159 ${CMAKE_CTEST_COMMAND} --force-new-ctest-process --output-on-failure
161 )160 )
162 add_subdirectory(tests)161 add_subdirectory(tests)
162
163 find_package(CoverageReport)
164 enable_coverage_report(
165 TARGETS
166 hud-generated
167 hud
168 hud-cli
169 hud-cli-appstack
170 hud-cli-param
171 hud-cli-toolbar
172 hud-client-generated
173 hud-client
174 hud-common
175 hud-gtk
176 hud-service
177 hud-service-exec
178 qtgmenu
179 window-stack-bridge
180 window-stack-bridge-bin
181 dbusmenu-json-loader
182 hud-test-interface
183 qtgmenu-test-app
184 test-integration-tests
185 test-libhud-application
186 test-libhud-client-unit-tests
187 test-libhud-unit-tests
188 test-menu-input-model-deep
189 test-menu-input-model-shortcuts
190 test-menu-input-model-simple
191 test-menu-input-model-toolbar-all
192 test-menu-input-model-toolbar-dynamic
193 test-menu-input-model-toolbar-undo
194 test-menu-input-model-toolbar-unknown
195 test-qtgmenu-unit-tests
196 test-service-unit-tests
197 test-utils
198 test-window-stack-bridge-unit-tests
199 FILTER
200 ${CMAKE_SOURCE_DIR}/tests/*
201 ${CMAKE_BINARY_DIR}/*
202 TESTS
203 dbusmenu-json-loader
204 hud-test-interface
205 qtgmenu-test-app
206 test-integration-tests
207 test-libhud-application
208 test-libhud-client-unit-tests
209 test-libhud-unit-tests
210 test-menu-input-model-deep
211 test-menu-input-model-shortcuts
212 test-menu-input-model-simple
213 test-menu-input-model-toolbar-all
214 test-menu-input-model-toolbar-dynamic
215 test-menu-input-model-toolbar-undo
216 test-menu-input-model-toolbar-unknown
217 test-qtgmenu-unit-tests
218 test-service-unit-tests
219 test-utils
220 test-window-stack-bridge-unit-tests
221 )
163endif()222endif()
164223
165224
166225
=== removed file 'cmake/Coverage.cmake'
--- cmake/Coverage.cmake 2013-10-30 08:38:05 +0000
+++ cmake/Coverage.cmake 1970-01-01 00:00:00 +0000
@@ -1,37 +0,0 @@
1if (CMAKE_BUILD_TYPE MATCHES coverage)
2 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --coverage")
3 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} --coverage")
4 set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} --coverage")
5 set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} --coverage")
6
7 find_program(GCOVR_EXECUTABLE gcovr HINTS ${GCOVR_ROOT} "${GCOVR_ROOT}/bin")
8 if (NOT GCOVR_EXECUTABLE)
9 message(STATUS "Gcovr binary was not found, can not generate XML coverage info.")
10 else ()
11 message(STATUS "Gcovr found, can generate XML coverage info.")
12 add_custom_target (coverage-xml
13 WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
14 COMMAND "${GCOVR_EXECUTABLE}" --exclude="test.*" --exclude="obj.*" -x -r "${CMAKE_SOURCE_DIR}"
15 --object-directory=${CMAKE_BINARY_DIR} -o coverage.xml)
16 endif()
17
18 find_program(LCOV_EXECUTABLE lcov HINTS ${LCOV_ROOT} "${GCOVR_ROOT}/bin")
19 find_program(GENHTML_EXECUTABLE genhtml HINTS ${GENHTML_ROOT})
20 if (NOT LCOV_EXECUTABLE)
21 message(STATUS "Lcov binary was not found, can not generate HTML coverage info.")
22 else ()
23 if(NOT GENHTML_EXECUTABLE)
24 message(STATUS "Genthml binary not found, can not generate HTML coverage info.")
25 else()
26 message(STATUS "Lcov and genhtml found, can generate HTML coverage info.")
27 add_custom_target (coverage-html
28 WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
29 COMMAND "${LCOV_EXECUTABLE}" --capture --output-file "${CMAKE_BINARY_DIR}/coverage.info" --no-checksum --directory "${CMAKE_BINARY_DIR}"
30 COMMAND "${LCOV_EXECUTABLE}" --remove "${CMAKE_BINARY_DIR}/coverage.info" '/usr/*' --output-file "${CMAKE_BINARY_DIR}/coverage.info"
31 COMMAND "${LCOV_EXECUTABLE}" --remove "${CMAKE_BINARY_DIR}/coverage.info" '${CMAKE_BINARY_DIR}/*' --output-file "${CMAKE_BINARY_DIR}/coverage.info"
32 COMMAND "${LCOV_EXECUTABLE}" --remove "${CMAKE_BINARY_DIR}/coverage.info" '${CMAKE_SOURCE_DIR}/tests/*' --output-file "${CMAKE_BINARY_DIR}/coverage.info"
33 COMMAND "${GENHTML_EXECUTABLE}" --prefix "${CMAKE_BINARY_DIR}" --output-directory coveragereport --title "Code Coverage" --legend --show-details coverage.info
34 )
35 endif()
36 endif()
37endif()
380
=== removed file 'cmake/FindValgrind.cmake'
--- cmake/FindValgrind.cmake 2015-08-19 16:04:55 +0000
+++ cmake/FindValgrind.cmake 1970-01-01 00:00:00 +0000
@@ -1,40 +0,0 @@
1
2option(
3 ENABLE_MEMCHECK_OPTION
4 "If set to ON, enables automatic creation of memcheck targets"
5 OFF
6)
7
8find_program(
9 VALGRIND_PROGRAM
10 NAMES valgrind
11)
12
13if(VALGRIND_PROGRAM)
14 set(VALGRIND_PROGRAM_OPTIONS
15 "--suppressions=${CMAKE_SOURCE_DIR}/tests/data/valgrind.suppression"
16 "--error-exitcode=1"
17 "--leak-check=full"
18 "--gen-suppressions=all"
19 "--quiet"
20 )
21endif()
22
23find_package_handle_standard_args(
24 VALGRIND DEFAULT_MSG
25 VALGRIND_PROGRAM
26)
27
28function(add_valgrind_test)
29 foreach(_arg ${ARGN})
30 if ("VALGRIND" STREQUAL ${_arg})
31 if(ENABLE_MEMCHECK_OPTION AND VALGRIND_PROGRAM)
32 list(APPEND _vgargs ${VALGRIND_PROGRAM} ${VALGRIND_PROGRAM_OPTIONS})
33 endif()
34 else()
35 list(APPEND _vgargs ${_arg})
36 endif()
37 endforeach()
38
39 add_test(${_vgargs})
40endfunction()
410
=== removed file 'cmake/UseGSettings.cmake'
--- cmake/UseGSettings.cmake 2013-04-02 08:34:53 +0000
+++ cmake/UseGSettings.cmake 1970-01-01 00:00:00 +0000
@@ -1,42 +0,0 @@
1# GSettings.cmake, CMake macros written for Marlin, feel free to re-use them.
2
3option (GSETTINGS_LOCALINSTALL "Install GSettings Schemas locally instead of to the GLib prefix" ${LOCAL_INSTALL})
4
5option (GSETTINGS_COMPILE "Compile GSettings Schemas after installation" ${GSETTINGS_LOCALINSTALL})
6
7if(GSETTINGS_LOCALINSTALL)
8 message(STATUS "GSettings schemas will be installed locally.")
9endif()
10
11if(GSETTINGS_COMPILE)
12 message(STATUS "GSettings shemas will be compiled.")
13endif()
14
15macro(add_schema SCHEMA_NAME)
16
17 set(PKG_CONFIG_EXECUTABLE pkg-config)
18 # Have an option to not install the schema into where GLib is
19 if (GSETTINGS_LOCALINSTALL)
20 SET (GSETTINGS_DIR "${CMAKE_INSTALL_PREFIX}/share/glib-2.0/schemas/")
21 else (GSETTINGS_LOCALINSTALL)
22 execute_process (COMMAND ${PKG_CONFIG_EXECUTABLE} glib-2.0 --variable prefix OUTPUT_VARIABLE _glib_prefix OUTPUT_STRIP_TRAILING_WHITESPACE)
23 SET (GSETTINGS_DIR "${_glib_prefix}/share/glib-2.0/schemas/")
24 endif (GSETTINGS_LOCALINSTALL)
25
26 # Run the validator and error if it fails
27 execute_process (COMMAND ${PKG_CONFIG_EXECUTABLE} gio-2.0 --variable glib_compile_schemas OUTPUT_VARIABLE _glib_comple_schemas OUTPUT_STRIP_TRAILING_WHITESPACE)
28 execute_process (COMMAND ${_glib_comple_schemas} --dry-run --schema-file=${CMAKE_CURRENT_SOURCE_DIR}/${SCHEMA_NAME} ERROR_VARIABLE _schemas_invalid OUTPUT_STRIP_TRAILING_WHITESPACE)
29
30 if (_schemas_invalid)
31 message (SEND_ERROR "Schema validation error: ${_schemas_invalid}")
32 endif (_schemas_invalid)
33
34 # Actually install and recomple schemas
35 message (STATUS "GSettings schemas will be installed into ${GSETTINGS_DIR}")
36 install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/${SCHEMA_NAME} DESTINATION ${GSETTINGS_DIR} OPTIONAL)
37
38 if (GSETTINGS_COMPILE)
39 install (CODE "message (STATUS \"Compiling GSettings schemas\")")
40 install (CODE "execute_process (COMMAND ${_glib_comple_schemas} ${GSETTINGS_DIR})")
41 endif ()
42endmacro()
430
=== modified file 'debian/control'
--- debian/control 2016-12-02 12:25:16 +0000
+++ debian/control 2016-12-12 13:51:51 +0000
@@ -3,7 +3,7 @@
3Priority: optional3Priority: optional
4Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>4Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
5Build-Depends: cmake (>= 3.4),5Build-Depends: cmake (>= 3.4),
6 cmake-extras,6 cmake-extras (>= 0.10),
7 debhelper (>= 9),7 debhelper (>= 9),
8 gnome-common,8 gnome-common,
9 gobject-introspection,9 gobject-introspection,
1010
=== modified file 'debian/rules'
--- debian/rules 2014-09-11 14:20:19 +0000
+++ debian/rules 2016-12-12 13:51:51 +0000
@@ -6,17 +6,15 @@
66
7ifneq (,$(filter $(DEB_HOST_ARCH),ppc64el armhf arm64))7ifneq (,$(filter $(DEB_HOST_ARCH),ppc64el armhf arm64))
8 ENABLE_BAMF = OFF8 ENABLE_BAMF = OFF
9 ENABLE_MEMCHECK_OPTION = OFF
10else9else
11 ENABLE_BAMF = ON10 ENABLE_BAMF = ON
12 ENABLE_MEMCHECK_OPTION = ON
13endif11endif
1412
15%:13%:
16 dh $@14 dh $@
1715
18override_dh_auto_configure:16override_dh_auto_configure:
19 dh_auto_configure -- -DDEBIAN_TARGET_DIR="${DEBIAN_TARGET_DIR}" -DENABLE_DOCUMENTATION=ON -DENABLE_MEMCHECK_OPTION=$(ENABLE_MEMCHECK_OPTION) -DENABLE_BAMF=$(ENABLE_BAMF)17 dh_auto_configure -- -DDEBIAN_TARGET_DIR="${DEBIAN_TARGET_DIR}" -DENABLE_DOCUMENTATION=ON -DENABLE_BAMF=$(ENABLE_BAMF)
2018
21override_dh_install:19override_dh_install:
22 dh_install --fail-missing20 dh_install --fail-missing
2321
=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt 2016-12-02 12:25:16 +0000
+++ tests/CMakeLists.txt 2016-12-12 13:51:51 +0000
@@ -2,8 +2,6 @@
2find_package(GMock REQUIRED)2find_package(GMock REQUIRED)
3set(CMAKE_AUTOMOC ON)3set(CMAKE_AUTOMOC ON)
44
5find_package("Valgrind" REQUIRED)
6
7include_directories(${CMAKE_CURRENT_SOURCE_DIR})5include_directories(${CMAKE_CURRENT_SOURCE_DIR})
8include_directories(${GMOCK_INCLUDE_DIRS})6include_directories(${GMOCK_INCLUDE_DIRS})
9include_directories(${GTEST_INCLUDE_DIRS})7include_directories(${GTEST_INCLUDE_DIRS})
@@ -52,9 +50,9 @@
52set(TEST_RUNNER "${CMAKE_CURRENT_SOURCE_DIR}/run-under-xvfb.sh")50set(TEST_RUNNER "${CMAKE_CURRENT_SOURCE_DIR}/run-under-xvfb.sh")
5351
54function(add_hud_test NAME)52function(add_hud_test NAME)
55 add_valgrind_test(53 add_test(
56 ${NAME}54 ${NAME}
57 ${TEST_RUNNER} qdbus-simple-test-runner VALGRIND "${CMAKE_CURRENT_BINARY_DIR}/${NAME}"55 ${TEST_RUNNER} qdbus-simple-test-runner "${CMAKE_CURRENT_BINARY_DIR}/${NAME}"
58 )56 )
59 57
60 set_tests_properties(58 set_tests_properties(
6159
=== modified file 'tests/integration/TestHud.cpp'
--- tests/integration/TestHud.cpp 2014-03-18 18:02:27 +0000
+++ tests/integration/TestHud.cpp 2016-12-12 13:51:51 +0000
@@ -145,6 +145,10 @@
145 EXPECT_EQ(icon,145 EXPECT_EQ(icon,
146 toolbarModel.data(index, Qt::DecorationRole).toString());146 toolbarModel.data(index, Qt::DecorationRole).toString());
147 EXPECT_EQ(item, toolbarModel.data(index, Qt::UserRole).toInt());147 EXPECT_EQ(item, toolbarModel.data(index, Qt::UserRole).toInt());
148 if ((toolbarModel.data(index, Qt::UserRole + 1).toBool()) != enabled) {
149 QSignalSpy spy(&toolbarModel, SIGNAL(dataChanged(const QModelIndex &, const QModelIndex &, const QVector<int> &)));
150 ASSERT_TRUE(spy.wait());
151 }
148 EXPECT_EQ(enabled, toolbarModel.data(index, Qt::UserRole + 1).toBool());152 EXPECT_EQ(enabled, toolbarModel.data(index, Qt::UserRole + 1).toBool());
149 }153 }
150154

Subscribers

People subscribed via source and target branches