From ed5a6fecd90a701727ac319c35c1b3eb6e0d6556 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Sat, 13 Jan 2018 12:47:41 +0000 Subject: tests/dbus-types/CMakeLists.txt: Conditionally use com.canonical.AccountsService.Sound.xml (on Ubuntu) or org.ayatana.AccountsService.Sound.xml (or non-Ubuntu). --- tests/dbus-types/CMakeLists.txt | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'tests/dbus-types') diff --git a/tests/dbus-types/CMakeLists.txt b/tests/dbus-types/CMakeLists.txt index aadc940..45369cf 100644 --- a/tests/dbus-types/CMakeLists.txt +++ b/tests/dbus-types/CMakeLists.txt @@ -14,9 +14,15 @@ set(dbusinterface_accounts_xml "org.freedesktop.Accounts.xml") set_source_files_properties(${dbusinterface_accounts_xml} PROPERTIES CLASSNAME AccountsInterface) -set(dbusinterface_accountssound_xml "org.ayatana.AccountsService.Sound.xml") -set_source_files_properties(${dbusinterface_accountssound_xml} PROPERTIES - CLASSNAME AccountsSoundInterface) +if(EXISTS "/usr/share/accountsservice/interfaces/com.ubuntu.AccountsService.Sound.xml") + set(dbusinterface_accountssound_xml "com.canonical.AccountsService.Sound.xml") + set_source_files_properties(${dbusinterface_accountssound_xml} PROPERTIES + CLASSNAME AccountsSoundInterface) +else() + set(dbusinterface_accountssound_xml "org.ayatana.AccountsService.Sound.xml") + set_source_files_properties(${dbusinterface_accountssound_xml} PROPERTIES + CLASSNAME AccountsSoundInterface) +endif() set(dbusinterface_properties_xml "org.freedesktop.DBus.Properties.xml") set_source_files_properties(${dbusinterface_properties_xml} PROPERTIES -- cgit v1.2.3