diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2018-01-16 10:05:25 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2018-01-16 10:18:03 +0100 |
| commit | 81a2976123ac89d29628a610d3ac96f1d57beadd (patch) | |
| tree | 989f6fd9b48bf33bfbb08df4d6b15e02ce7f3dc3 | |
| parent | d2bcfdfe44568123b688c86b3a69e4a932641a33 (diff) | |
| download | ayatana-indicator-sound-81a2976123ac89d29628a610d3ac96f1d57beadd.tar.gz ayatana-indicator-sound-81a2976123ac89d29628a610d3ac96f1d57beadd.tar.bz2 ayatana-indicator-sound-81a2976123ac89d29628a610d3ac96f1d57beadd.zip | |
Some CMakeLists.txt optimizations.
| -rw-r--r-- | tests/dbus-types/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | tests/service-mocks/accounts-mock/CMakeLists.txt | 18 |
2 files changed, 8 insertions, 17 deletions
diff --git a/tests/dbus-types/CMakeLists.txt b/tests/dbus-types/CMakeLists.txt index f669bca..5323f51 100644 --- a/tests/dbus-types/CMakeLists.txt +++ b/tests/dbus-types/CMakeLists.txt @@ -16,14 +16,13 @@ set_source_files_properties(${dbusinterface_accounts_xml} PROPERTIES if(EXISTS "/usr/share/accountsservice/interfaces/com.ubuntu.AccountsService.Sound.xml") set(dbusinterface_accountssound_xml "com.ubuntu.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_source_files_properties(${dbusinterface_accountssound_xml} PROPERTIES + CLASSNAME AccountsSoundInterface) + set(dbusinterface_properties_xml "org.freedesktop.DBus.Properties.xml") set_source_files_properties(${dbusinterface_properties_xml} PROPERTIES CLASSNAME DBusPropertiesInterface diff --git a/tests/service-mocks/accounts-mock/CMakeLists.txt b/tests/service-mocks/accounts-mock/CMakeLists.txt index 9ef32fa..421e155 100644 --- a/tests/service-mocks/accounts-mock/CMakeLists.txt +++ b/tests/service-mocks/accounts-mock/CMakeLists.txt @@ -19,19 +19,11 @@ set_source_files_properties(${dbusinterface_sound_xml} PROPERTIES qt5_add_dbus_interface(interface_files ${dbusinterface_sound_xml} accountsservice_sound_interface) -if(EXISTS "/usr/share/accountsservice/interfaces/com.ubuntu.AccountsService.Sound.xml") - qt5_add_dbus_adaptor(adaptor_files - com.ubuntu.AccountsService.Sound.Mock.xml - AccountsServiceSoundMock.h - ubuntu::indicators::testing::AccountsServiceSoundMock - AccountsServiceSoundMockAdaptor) -else() - qt5_add_dbus_adaptor(adaptor_files - org.ayatana.AccountsService.Sound.Mock.xml - AccountsServiceSoundMock.h - ubuntu::indicators::testing::AccountsServiceSoundMock - AccountsServiceSoundMockAdaptor) -endif() +qt5_add_dbus_adaptor(adaptor_files + ${dbusinterface_sound_xml} + AccountsServiceSoundMock.h + ubuntu::indicators::testing::AccountsServiceSoundMock + AccountsServiceSoundMockAdaptor) qt5_add_dbus_adaptor(adaptor_files ${CMAKE_SOURCE_DIR}/tests/dbus-types/org.freedesktop.Accounts.xml |