diff options
| author | Ralf Habacker <ralf.habacker@freenet.de> | 2018-11-20 16:33:57 +0100 |
|---|---|---|
| committer | Simon McVittie <smcv@collabora.com> | 2018-12-11 10:41:07 +0000 |
| commit | d9de6ab21319c848147c0c0891a01cf5f801b9a2 (patch) | |
| tree | 1e43a421d9b8df27e416e67b4ad9e6992f711ced /cmake | |
| parent | a7d1e275e7e01da91d584346326e46c469625d69 (diff) | |
| download | dbus-d9de6ab21319c848147c0c0891a01cf5f801b9a2.tar.gz | |
Add build system variable DBUS_NAME_TEST_EXEC to cover differences in executable paths
Autotools creates executable applications in the respective
subdirectory of the build directory, while cmake creates
them in <build-root>/bin.
This leads to different paths in the file created
from org.freedesktop.DBus.TestSuite.PrivServer.service.in,
which are fixed by the new variable.
Bug: https://gitlab.freedesktop.org/dbus/dbus/issues/135
Signed-off-by: Ralf Habacker <ralf.habacker@freenet.de>
Reviewed-by: Simon McVittie <smcv@collabora.com>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/CMakeLists.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt index 884b277f..b0aa760e 100644 --- a/cmake/CMakeLists.txt +++ b/cmake/CMakeLists.txt @@ -483,6 +483,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(DBUS_TEST_EXEC ${Z_DRIVE_IF_WINE}${EXECUTABLE_OUTPUT_PATH}${IDE_BIN}) + set(DBUS_NAME_TEST_EXEC ${DBUS_TEST_EXEC}) set(DBUS_TEST_DATA ${Z_DRIVE_IF_WINE}${CMAKE_BINARY_DIR}/test/data) set(TEST_LAUNCH_HELPER_BINARY ${Z_DRIVE_IF_WINE}${EXECUTABLE_OUTPUT_PATH}/dbus-daemon-launch-helper-test) if (UNIX) |