diff options
| author | Robert Tari <robert@tari.in> | 2021-04-28 14:59:58 +0200 |
|---|---|---|
| committer | Robert Tari <robert@tari.in> | 2021-04-28 14:59:58 +0200 |
| commit | f679c07d5bb9039fb20b91544f95dd97449c0004 (patch) | |
| tree | 22e16b7b0599cc5945b27e2310cb54f8eaaa1773 /tests | |
| parent | 76f02c94df4563f1addd025fbec8d0c1fd3c76bf (diff) | |
| parent | 651a8c3ec03a2e8dff43381d42a7586785623088 (diff) | |
| download | ayatana-indicator-session-f679c07d5bb9039fb20b91544f95dd97449c0004.tar.gz ayatana-indicator-session-f679c07d5bb9039fb20b91544f95dd97449c0004.tar.bz2 ayatana-indicator-session-f679c07d5bb9039fb20b91544f95dd97449c0004.zip | |
Merge branch 'sunweaver-pr/travis-ci'
Attributes GH PR #31: https://github.com/AyatanaIndicators/ayatana-indicator-session/pull/31
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tests/backend-dbus/CMakeLists.txt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 7c06881..2b4bdcc 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -18,7 +18,7 @@ add_custom_command (OUTPUT gschemas.compiled ${CMAKE_SOURCE_DIR}/tests/org.gnome.desktop.lockdown.gschema.xml ${CMAKE_SOURCE_DIR}/tests/org.gnome.settings-daemon.plugins.media-keys.gschema.xml COMMAND cp -f ${CMAKE_BINARY_DIR}/data/*gschema.xml ${SCHEMA_DIR} - COMMAND cp -f ${CMAKE_SOURCE_DIR}/tests/*gschema.xml ${SCHEMA_DIR} + COMMAND if [ \"x${CMAKE_SOURCE_DIR}/tests\" != \"x${SCHEMA_DIR}\" ]; then cp -f \"${CMAKE_SOURCE_DIR}/tests/\"*gschema.xml \"${SCHEMA_DIR}\"\; fi COMMAND ${COMPILE_SCHEMA_EXECUTABLE} ${SCHEMA_DIR}) # DBus Activation diff --git a/tests/backend-dbus/CMakeLists.txt b/tests/backend-dbus/CMakeLists.txt index 5ffdbd9..5a218f8 100644 --- a/tests/backend-dbus/CMakeLists.txt +++ b/tests/backend-dbus/CMakeLists.txt @@ -32,7 +32,7 @@ add_library (desktopmock STATIC mock-webcredentials.cc mock-webcredentials.h) -add_dependencies(desktopmock dbusbackend) +add_dependencies(desktopmock backenddbus) include_directories (${SERVICE_INCLUDE_DIRS}) include_directories (${CMAKE_SOURCE_DIR}/src) |