diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2011-09-16 17:40:29 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2011-09-28 19:00:11 +0100 |
| commit | 6934bc6927a3846d096bd3549f0ed06c901bb9f2 (patch) | |
| tree | 15de860bfd12e9e223175768d07a6a8ecfa871ef /cmake | |
| parent | ba033709b54df18bbe48b22303e0c3d514f547f8 (diff) | |
| download | dbus-6934bc6927a3846d096bd3549f0ed06c901bb9f2.tar.gz dbus-6934bc6927a3846d096bd3549f0ed06c901bb9f2.tar.bz2 dbus-6934bc6927a3846d096bd3549f0ed06c901bb9f2.zip | |
Simplify generation of bus configuration files
Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Reviewed-by: Ralf Habacker <ralf.habacker@freenet.de>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=41222
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/CMakeLists.txt | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt index 21728a70..cfba103d 100644 --- a/cmake/CMakeLists.txt +++ b/cmake/CMakeLists.txt @@ -478,9 +478,7 @@ add_definitions(${DBUS_BUS_CFLAGS}) if (DBUS_BUILD_TESTS) # set variables used for the .in files (substituted by configure_file) in test/data: - set(TEST_VALID_SERVICE_DIR ${CMAKE_BINARY_DIR}/test/data/valid-service-files) - set(TEST_VALID_SERVICE_SYSTEM_DIR ${CMAKE_BINARY_DIR}/test/data/valid-service-files-system) - set(TEST_INVALID_SERVICE_SYSTEM_DIR ${CMAKE_BINARY_DIR}/test/data/invalid-service-files-system) + set(DBUS_TEST_DATA ${CMAKE_BINARY_DIR}/test/data) set(TEST_SOCKET_DIR ${DBUS_SESSION_SOCKET_DIR} ) set(TEST_LAUNCH_HELPER_BINARY ${EXECUTABLE_OUTPUT_PATH}/dbus-daemon-launch-helper-test) set(TEST_PRIVSERVER_BINARY ${EXECUTABLE_OUTPUT_PATH}/test-privserver) |