Commit 67a78c4e authored by Ralf Habacker's avatar Ralf Habacker

Define TEST_BUS_LAUNCH_BINARY for cmake to keep in sync with autotools.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=41252Reviewed-by: 's avatarSimon McVittie <simon.mcvittie@collabora.co.uk>
parent 720afc64
......@@ -467,6 +467,7 @@ if (DBUS_BUILD_TESTS)
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_BUS_LAUNCH_BINARY ${EXECUTABLE_OUTPUT_PATH}/dbus-launch${EXEEXT})
if (UNIX)
set (TEST_LISTEN "unix:tmpdir=${TEST_SOCKET_DIR}")
endif (UNIX)
......
......@@ -32,6 +32,7 @@
// test binaries
#define DBUS_TEST_EXEC "@DBUS_TEST_EXEC@"
#define DBUS_EXEEXT "@EXEEXT@"
#cmakedefine TEST_BUS_LAUNCH_BINARY "@TEST_BUS_LAUNCH_BINARY@"
/* Some dbus features */
#cmakedefine DBUS_ENABLE_ANSI 1
......
......@@ -194,7 +194,3 @@ FOREACH(FILE ${FILES})
MESSAGE("FROM: ${FILE}\nTO: ${TARGET}\n")
ENDIF (CONFIG_VERBOSE)
ENDFOREACH(FILE)
# todo: for installation the TEST_..._BINARY variables must reflect the
# installation dir or has to be defined relative
#
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment