From a0c5eb4ca38fe6dbe39f1c994526f195bcb799a9 Mon Sep 17 00:00:00 2001 From: Ralf Habacker Date: Wed, 8 Jan 2014 01:45:56 +0100 Subject: [PATCH 3/5] Define TEST_BUS_LAUNCH_BINARY for cmake to keep in sync with autotools. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=41252 --- cmake/CMakeLists.txt | 1 + cmake/config.h.cmake | 1 + 2 Dateien geändert, 2 Zeilen hinzugefügt(+) diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt index db03520..c8a6834 100644 --- a/cmake/CMakeLists.txt +++ b/cmake/CMakeLists.txt @@ -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) diff --git a/cmake/config.h.cmake b/cmake/config.h.cmake index 3735560..119ed39 100644 --- a/cmake/config.h.cmake +++ b/cmake/config.h.cmake @@ -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 -- 1.7.10.4