diff options
| -rw-r--r-- | CMakeLists.txt | 7 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/main.cpp | 6 | ||||
| -rw-r--r-- | src/snap.cpp | 2 | ||||
| -rw-r--r-- | tests/CMakeLists.txt | 4 |
5 files changed, 9 insertions, 14 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 1fc630f..3370b06 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -81,12 +81,7 @@ if(URLDISPATCHER_FOUND) endif() pkg_check_modules(LOMIRI_SOUNDS lomiri-sounds) - -if(EXISTS "/usr/share/accountsservice/interfaces/com.lomiri.touch.AccountsService.Sound.xml") - set (HAS_LOMIRI_ACCTSERVICE_SOUND ON) -else() - set (HAS_LOMIRI_ACCTSERVICE_SOUND OFF) -endif() +pkg_check_modules(LOMIRI_SCHEMAS lomiri-schemas) ## ## custom targets diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 9cde5fe..d6d6844 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -47,11 +47,11 @@ set(SERVICE_GENERATED_SOURCES) add_gdbus_codegen(SERVICE_GENERATED_SOURCES dbus-alarm-properties org.ayatana.indicator ${CMAKE_SOURCE_DIR}/data/org.ayatana.indicator.datetime.AlarmProperties.xml) -if(HAS_LOMIRI_ACCTSERVICE_SOUND) +if(LOMIRI_SCHEMAS_FOUND) add_gdbus_codegen(SERVICE_GENERATED_SOURCES dbus-accounts-sound com.lomiri.touch /usr/share/accountsservice/interfaces/com.lomiri.touch.AccountsService.Sound.xml) - add_definitions (-DHAS_LOMIRI_ACCTSERVICE_SOUND) + add_definitions (-DHAS_LOMIRI_SCHEMAS) endif() # add warnings/coverage info on handwritten files diff --git a/src/main.cpp b/src/main.cpp index 613f700..0dc7198 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -32,7 +32,7 @@ #include <datetime/planner-snooze.h> #include <datetime/planner-range.h> #include <datetime/settings-live.h> -#ifdef HAS_LOMIRI_ACCTSERVICE_SOUND +#ifdef HAS_LOMIRI_SCHEMAS #include <datetime/snap.h> #endif #include <datetime/state.h> @@ -95,7 +95,7 @@ namespace return state; } -#ifdef HAS_LOMIRI_ACCTSERVICE_SOUND +#ifdef HAS_LOMIRI_SCHEMAS std::shared_ptr<AlarmQueue> create_simple_alarm_queue(const std::shared_ptr<Clock>& clock, const std::shared_ptr<Planner>& snooze_planner, const std::shared_ptr<Engine>& engine, @@ -149,7 +149,7 @@ main(int /*argc*/, char** /*argv*/) auto actions = std::make_shared<LiveActions>(state); MenuFactory factory(actions, state); -#ifdef HAS_LOMIRI_ACCTSERVICE_SOUND +#ifdef HAS_LOMIRI_SCHEMAS // set up the snap decisions auto snooze_planner = std::make_shared<SnoozePlanner>(state->settings, state->clock); auto notification_engine = std::make_shared<ain::Engine>("ayatana-indicator-datetime-service"); diff --git a/src/snap.cpp b/src/snap.cpp index 45cd299..e306dea 100644 --- a/src/snap.cpp +++ b/src/snap.cpp @@ -19,7 +19,7 @@ * Robert Tari <robert@tari.in> */ -#ifdef HAS_LOMIRI_ACCTSERVICE_SOUND +#ifdef HAS_LOMIRI_SCHEMAS #include "dbus-accounts-sound.h" #include <datetime/snap.h> diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 3eb0b8a..7a6a301 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -44,7 +44,7 @@ function(add_test_by_name name) target_link_libraries (${TEST_NAME} indicatordatetimeservice ${DBUSTEST_LIBRARIES} ${SERVICE_DEPS_LIBRARIES} ${GTEST_LIBRARIES} ${GMOCK_LIBRARIES} ${URLDISPATCHER_LIBRARIES}) endfunction() add_test_by_name(test-datetime) -if(HAS_LOMIRI_ACCTSERVICE_SOUND) +if(LOMIRI_SCHEMAS_FOUND) if(LOMIRI_SOUNDS_FOUND) add_test_by_name(test-sound) add_test_by_name(test-notification) @@ -74,7 +74,7 @@ add_test_by_name(test-settings) add_test_by_name(test-timezone-timedated) add_test_by_name(test-utils) -if(HAS_LOMIRI_ACCTSERVICE_SOUND) +if(LOMIRI_SCHEMAS_FOUND) set (TEST_NAME manual-test-snap) set (COVERAGE_TEST_TARGETS ${COVERAGE_TEST_TARGETS} ${TEST_NAME}) add_executable (${TEST_NAME} ${TEST_NAME}.cpp) |