* cmake/CMakeLists.txt: fixed creating of TEST_..._BINARY to make bus-test able to...

diff --git a/ChangeLog b/ChangeLog
index 51de05b53e979a1a576e3c4b1166c25b95e9503a..d55bdb55bfb94f4d36749a199788a4c68be42915 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-05-22 Ralf.Habacker <ralf.habacker@freenet.de>
+
+       * cmake/CMakeLists.txt: fixed creating of TEST_..._BINARY to make 
+       bus-test able to find the binaries.
+
 2007-05-21 Simon McVittie  <simon.mcvittie@collabora.co.uk>
 
        * acinclude.m4, configure.in: In recent autotools, ${datadir} is

diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
index 049323abde5575bf3d6277fb8544b1712b64e858..6cc0ac8c17f0c6f533b7629eb45d976d0e217819 100644 (file)
--- a/cmake/CMakeLists.txt
+++ b/cmake/CMakeLists.txt
@@ -333,20 +333,12 @@ if (WIN32)
        set (EXT ".exe")
 endif(WIN32)
 
-# confirure.in:
-#TEST_PATH(SERVICE_DIR,          data/valid-service-files)
-#TEST_PATH(SERVICE_BINARY,       test-service)
-#TEST_PATH(SHELL_SERVICE_BINARY, test-shell-service)
-#TEST_PATH(EXIT_BINARY,          test-exit)
-#TEST_PATH(SEGFAULT_BINARY,      test-segfault)
-#TEST_PATH(SLEEP_FOREVER_BINARY, test-sleep-forever)
-
 set(TEST_SERVICE_DIR          ${CMAKE_BINARY_DIR}/test/data/valid-service-files     CACHE STRING "Full path to test file test/data/valid-service-files in builddir")
-set(TEST_SERVICE_BINARY       ${EXPANDED_BINDIR}/test-service${EXT}       CACHE STRING "Full path to test file test/test-service in builddir")
-set(TEST_SHELL_SERVICE_BINARY ${EXPANDED_BINDIR}/test-shell-service${EXT} CACHE STRING "Full path to test file test/test-shell-service in builddir")    
-set(TEST_EXIT_BINARY          ${EXPANDED_BINDIR}/test-exit${EXT}          CACHE STRING "Full path to test file test/test-exit in builddir")
-set(TEST_SEGFAULT_BINARY      ${EXPANDED_BINDIR}/test-segfault${EXT}      CACHE STRING "Full path to test file test/test-segfault in builddir")
-set(TEST_SLEEP_FOREVER_BINARY ${EXPANDED_BINDIR}/test-sleep-forever${EXT} CACHE STRING "Full path to test file test/test-sleep-forever in builddir")
+set(TEST_SERVICE_BINARY       ${CMAKE_BINARY_DIR}/bin/test-service${EXT}       CACHE STRING "Full path to test file test/test-service in builddir")
+set(TEST_SHELL_SERVICE_BINARY ${CMAKE_BINARY_DIR}/bin/test-shell-service${EXT} CACHE STRING "Full path to test file test/test-shell-service in builddir")    
+set(TEST_EXIT_BINARY          ${CMAKE_BINARY_DIR}/bin/test-exit${EXT}          CACHE STRING "Full path to test file test/test-exit in builddir")
+set(TEST_SEGFAULT_BINARY      ${CMAKE_BINARY_DIR}/bin/test-segfault${EXT}      CACHE STRING "Full path to test file test/test-segfault in builddir")
+set(TEST_SLEEP_FOREVER_BINARY ${CMAKE_BINARY_DIR}/bin/test-sleep-forever${EXT} CACHE STRING "Full path to test file test/test-sleep-forever in builddir")
 
 #### Find socket directories
 if (NOT WIN32)