mirror of
https://gitlab.freedesktop.org/dbus/dbus.git
synced 2026-04-20 07:10:44 +02:00
Define TEST_BUS_LAUNCH_BINARY for cmake to keep in sync with autotools.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=41252 Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
This commit is contained in:
parent
720afc64b8
commit
67a78c4ef6
3 changed files with 2 additions and 4 deletions
|
|
@ -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
|
||||
#
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue