From 2b939453598cc1fd8f1c40e5d6cbfd63cb852fb4 Mon Sep 17 00:00:00 2001 From: charles kerr Date: Fri, 1 Jan 2016 13:53:48 -0600 Subject: use gstreamer to play the sound --- CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 9cc29fe..927a0bf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -56,6 +56,7 @@ pkg_check_modules(SERVICE_DEPS REQUIRED gio-2.0>=2.36 gio-unix-2.0>=2.36 libnotify>=0.7.6 + gstreamer-1.0>=1.2 libayatana-common>=0.9.1) include_directories (SYSTEM ${SERVICE_DEPS_INCLUDE_DIRS}) -- cgit v1.2.3 From 460f1464709a4c5e2c1594045961be9108ae2afd Mon Sep 17 00:00:00 2001 From: charles kerr Date: Fri, 1 Jan 2016 19:37:51 -0600 Subject: use a symbolic constant for the low battery sound's filename --- CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 927a0bf..3d59545 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -41,7 +41,8 @@ set (CMAKE_INSTALL_FULL_PKGLIBEXECDIR "${CMAKE_INSTALL_FULL_LIBEXECDIR}/${CMAKE_ set(GETTEXT_PACKAGE "ayatana-indicator-power") add_definitions (-DGETTEXT_PACKAGE="${GETTEXT_PACKAGE}" - -DLOCALEDIR="${CMAKE_INSTALL_FULL_LOCALEDIR}") + -DLOCALEDIR="${CMAKE_INSTALL_FULL_LOCALEDIR}" + -DLOW_BATTERY_SOUND="Low battery.ogg") ## ## Check for prerequisites -- cgit v1.2.3 From 1182c7fb79942c14f2a713063182778e6af94cd1 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Mon, 4 Jan 2016 09:38:01 -0600 Subject: add build-dep to accountsservice-ubuntu-schemas instead of bundling com.ubuntu.touch.AccountsService.Sound.xml into our source tree --- CMakeLists.txt | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 3d59545..bc5729a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -69,6 +69,13 @@ pkg_check_modules( ) include_directories(${URLDISPATCHER_INCLUDE_DIRS}) +if(EXISTS "/usr/share/accountsservice/interfaces/com.ubuntu.touch.AccountsService.Sound.xml") + set (HAVE_UT_ACCTSERVICE_SYSTEMSOUND_SETTINGS ON) + add_definitions ( -DHAS_UT_ACCTSERVICE_SYSTEMSOUND_SETTINGS ) +else() + set (HAVE_UT_ACCTSERVICE_SYSTEMSOUND_SETTINGS OFF) +endif() + ## ## custom targets ## -- cgit v1.2.3 From 39571b0e05c78627d233b2f77250de459d73f4a6 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Mon, 16 May 2016 12:59:03 -0500 Subject: fix cmake warning of the test apps' dependency on the service library --- CMakeLists.txt | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index bc5729a..258a111 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -40,14 +40,21 @@ set (CMAKE_INSTALL_FULL_PKGLIBEXECDIR "${CMAKE_INSTALL_FULL_LIBEXECDIR}/${CMAKE_ ## set(GETTEXT_PACKAGE "ayatana-indicator-power") -add_definitions (-DGETTEXT_PACKAGE="${GETTEXT_PACKAGE}" - -DLOCALEDIR="${CMAKE_INSTALL_FULL_LOCALEDIR}" - -DLOW_BATTERY_SOUND="Low battery.ogg") +add_definitions( + -DGETTEXT_PACKAGE="${GETTEXT_PACKAGE}" + -DG_LOG_DOMAIN="${GETTEXT_PACKAGE}" + -DLOCALEDIR="${CMAKE_INSTALL_FULL_LOCALEDIR}" + -DLOW_BATTERY_SOUND="Low battery.ogg" +) ## ## Check for prerequisites ## +set(SERVICE_LIB "ayatanaindicatorpowerservice") +set(SERVICE_EXEC "ayatana-indicator-power-service") +add_definitions(-DSERVICE_EXEC="${SERVICE_EXEC}") + find_package (PkgConfig REQUIRED) include (CheckIncludeFile) include (FindPkgConfig) -- cgit v1.2.3 From 4a4663acffea728b2d147447de32703f42a774bf Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Mon, 16 May 2016 13:09:57 -0500 Subject: since we're shopping audio out to org.freedesktop notifications, drop the gstreamer build dep --- CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 258a111..956c724 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -64,7 +64,6 @@ pkg_check_modules(SERVICE_DEPS REQUIRED gio-2.0>=2.36 gio-unix-2.0>=2.36 libnotify>=0.7.6 - gstreamer-1.0>=1.2 libayatana-common>=0.9.1) include_directories (SYSTEM ${SERVICE_DEPS_INCLUDE_DIRS}) -- cgit v1.2.3 From 948a5107c479a72a2940316674fae6a3b55534ff Mon Sep 17 00:00:00 2001 From: Rodney <6557070+dobey@users.noreply.github.com> Date: Sun, 28 Oct 2018 13:54:40 -0400 Subject: Pull in many fixes from the bionic branch. (#7) * Pay attention to $SNAP prefix * Releasing 12.10.6+17.04.20161201-0ubuntu1 * give sorting priority to devices with power supplies * Releasing 12.10.6+17.04.20170116-0ubuntu1 * Remove old autostart files. * Use gmock module from cmake-extras. * Use coverage support from cmake-extras. * Add gcovr and lcov dependencies. * Use intltool support from cmake-extras. * Remove usage of extra GCOV variables. * Remove hard-coded -g compiler flag. * Releasing 12.10.6+17.04.20170210-0ubuntu1 * no change rebuild * Releasing 12.10.6+17.04.20170322-0ubuntu1 * Start indicator in systemd when indicators.target is started * Build for bionic * This is still xenial. * Update translations from launchpad too. --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 956c724..72f4bde 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -125,7 +125,7 @@ if (ENABLE_TESTS) if (ENABLE_COVERAGE) find_package(CoverageReport) ENABLE_COVERAGE_REPORT( - TARGETS ayatanaindicatorpowerservice ayatana-indicator-power-service + TARGETS ${SERVICE_LIB} ${SERVICE_EXEC} TESTS ${COVERAGE_TEST_TARGETS} FILTER /usr/include ${CMAKE_BINARY_DIR}/* ) -- cgit v1.2.3