summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRalf Habacker <ralf.habacker@freenet.de>2014-01-08 01:45:56 +0100
committerRalf Habacker <ralf.habacker@freenet.de>2014-01-10 00:41:02 +0100
commit67a78c4ef6ada862b5dc584cc450db5694d882d3 (patch)
tree13d1696b5a0e4b15ce47e09eb65f543dc7dea07a
parent720afc64b8cb531b2f8340db404adb79fe09ff74 (diff)
downloaddbus-67a78c4ef6ada862b5dc584cc450db5694d882d3.tar.gz
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>
-rw-r--r--cmake/CMakeLists.txt1
-rw-r--r--cmake/config.h.cmake1
-rw-r--r--cmake/test/CMakeLists.txt4
3 files changed, 2 insertions, 4 deletions
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
index db035201..c8a68345 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 37355609..119ed396 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
diff --git a/cmake/test/CMakeLists.txt b/cmake/test/CMakeLists.txt
index b3e03901..e29a4993 100644
--- a/cmake/test/CMakeLists.txt
+++ b/cmake/test/CMakeLists.txt
@@ -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
-#