From 81db2957f86a86c96263dba63664d5d97f9937d5 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Tue, 4 May 2021 13:04:58 +0200 Subject: CMakeLists.txt: Move coverage report generation macro into basefolder's CMakeLists.txt file. With the previous approach, only coverage of the tests/ subfolder was reported (which always should be 100%). With this change, also coverage of the files in src/ is reported. --- CMakeLists.txt | 9 +++++++++ tests/CMakeLists.txt | 7 ------- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b039352..70b509f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -51,6 +51,15 @@ if (ENABLE_TESTS) enable_testing() add_subdirectory(example) add_subdirectory(tests) + # coverage + if (ENABLE_COVERAGE) + find_package(CoverageReport) + ENABLE_COVERAGE_REPORT( + TARGETS "ayatana-ido3-0.4" + TESTS "gtest-menuitems" + FILTER /usr/include ${CMAKE_BINARY_DIR}/* + ) + endif() endif() # Display config info diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 39cde1f..a31f789 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -23,10 +23,3 @@ target_link_libraries("gtest-menuitems" ) add_test("gtest-menuitems" "gtest-menuitems") add_dependencies("gtest-menuitems" ayatana-ido3-0.4) - - -# coverage -if (ENABLE_COVERAGE) - find_package(CoverageReport) - ENABLE_COVERAGE_REPORT(TARGETS "gtest-menuitems" TESTS "gtest-menuitems") -endif() -- cgit v1.2.3 From 80df555dd96b5a9102453cad9a3da8439a448653 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Tue, 4 May 2021 16:05:33 +0200 Subject: .travis.yml: Don't try running autotools based CI build. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 4d688af..bf1aa18 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,7 +27,7 @@ install: - ./docker-build --name ${DISTRO} --config .build.yml --install script: - - ./docker-build --name ${DISTRO} --verbose --config .build.yml --build scripts --build autotools + - ./docker-build --name ${DISTRO} --verbose --config .build.yml --build scripts env: # temp disable of archlinux builds, see https://gitlab.archlinux.org/archlinux/archlinux-docker/-/issues/56 -- cgit v1.2.3 From ef73e1d341ecb2a39944bbd7172bda1711958a4d Mon Sep 17 00:00:00 2001 From: Robert Tari Date: Mon, 3 May 2021 13:58:25 +0200 Subject: src/idolocationmenuitem.c: Fix deprecated g_time_zone_new warning. Fixes AyatanaIndicators/ayatana-ido#30 --- src/idolocationmenuitem.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/idolocationmenuitem.c b/src/idolocationmenuitem.c index 8b16807..6999cc1 100644 --- a/src/idolocationmenuitem.c +++ b/src/idolocationmenuitem.c @@ -53,7 +53,12 @@ update_timestamp (IdoLocationMenuItem * self) IdoLocationMenuItemPrivate * priv = ido_location_menu_item_get_instance_private(self); - tz = g_time_zone_new (priv->timezone); + #if GLIB_CHECK_VERSION(2, 68, 0) + tz = g_time_zone_new_identifier (priv->timezone); + #else + tz = g_time_zone_new (priv->timezone); + #endif + if (tz == NULL) tz = g_time_zone_new_local (); date_time = g_date_time_new_now (tz); -- cgit v1.2.3 From 4dedcedf52cfedc625d4ae3ecab9068e8885728a Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Tue, 11 May 2021 17:12:32 +0200 Subject: debian/control: Adjust versioned B-D on cmake (3.13 as stated in CMakeLists.txt). --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 78c5769..35be628 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: libs Priority: optional Maintainer: Mike Gabriel Build-Depends: debhelper (>= 9), - cmake (>= 3.16), + cmake (>= 3.13), cmake-extras, lcov, gcovr, -- cgit v1.2.3