* cmake/: don't install test applications and service files, moved CMAKE_DEBUG_POSTFI...

diff --git a/ChangeLog b/ChangeLog
index 14130c0..5e112ff 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,12 +1,17 @@
+2007-04-28  Ralf Habacker <ralf.habacker@freenet.de>
+
+       * cmake/: don't install test applications and service files,
+       moved CMAKE_DEBUG_POSTFIX to top level CMakeLists.txt
+
 2007-04-27  Havoc Pennington  <hp@redhat.com>
 
        * dbus/dbus-sysdeps-unix.c (_dbus_open_socket): fix #10781 from
        Tobias Nygren, checking pointer to fd vs. 0 rather than checking
        the fd itself
 
-2007-04-26 Ralf.Habacker  <ralf.habacker@freenet.de>
+2007-04-26 Ralf Habacker  <ralf.habacker@freenet.de>
 
-       * cmake: added debug postfixes to debug exe's for 
+       * cmake/: added debug postfixes to debug exe's for 
        easier debugging.
        * dbus\dbus-sysdeps-win.c (_dbus_win_set_error_from_win_error): 
        print error code in case no string message is available.

diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
index 1b5249c..049323a 100644 (file)
--- a/cmake/CMakeLists.txt
+++ b/cmake/CMakeLists.txt
@@ -76,8 +76,9 @@ if(MSVC)
 endif(MSVC)
 
 if(CMAKE_BUILD_TYPE STREQUAL "Debug")
-   # dll postfix is set to 'd' by default
+   # used by executables, CMAKE_DEBUG_POSTFIX does not handle this case
    set (CMAKE_EXE_POSTFIX "d")
+   set (CMAKE_DEBUG_POSTFIX "d")
 endif(CMAKE_BUILD_TYPE STREQUAL "Debug")
 
 

diff --git a/cmake/bus/CMakeLists.txt b/cmake/bus/CMakeLists.txt
index c6e6c3e..5ae4674 100644 (file)
--- a/cmake/bus/CMakeLists.txt
+++ b/cmake/bus/CMakeLists.txt
@@ -121,10 +121,10 @@ set (bus_test_SOURCES
 )
 
 if (DBUS_BUILD_TESTS)  
-       add_executable(bus-test${CMAKE_EXE_POSTFIX} ${bus_test_SOURCES})
-       target_link_libraries(bus-test${CMAKE_EXE_POSTFIX} dbus-1 ${LIBS} )
-       install_targets(/bin bus-test${CMAKE_EXE_POSTFIX})
-       add_test(bus-test ${EXECUTABLE_OUTPUT_PATH}/bus-test${CMAKE_EXE_POSTFIX} ${CMAKE_SOURCE_DIR}/../test/data)
+       add_executable(bus-test ${bus_test_SOURCES})
+       target_link_libraries(bus-test dbus-1 ${LIBS} )
+       #install_targets(/bin bus-test)
+       add_test(bus-test ${EXECUTABLE_OUTPUT_PATH}/bus-test ${CMAKE_SOURCE_DIR}/../test/data)
 endif (DBUS_BUILD_TESTS)
 
 if(MSVC)

diff --git a/cmake/dbus/CMakeLists.txt b/cmake/dbus/CMakeLists.txt
index 4957b13..68ec4f0 100644 (file)
--- a/cmake/dbus/CMakeLists.txt
+++ b/cmake/dbus/CMakeLists.txt
@@ -205,7 +205,6 @@ set(libdbus_HEADERS
        ${DBUS_UTIL_HEADERS}
 )
 
-set(CMAKE_DEBUG_POSTFIX "d")
 if(MSVC)
        add_library(dbus-1 STATIC ${libdbus_SOURCES} ${libdbus_HEADERS} )
        project_source_group(${GROUP_CODE} libdbus_SOURCES libdbus_HEADERS)
@@ -234,10 +233,10 @@ install_files(/include/dbus FILES ${dbusinclude_HEADERS})
 
 if (DBUS_BUILD_TESTS)
        set (TESTS_ENVIRONMENT "DBUS_TEST_DATA=${CMAKE_SOURCE_DIR}/test/data DBUS_TEST_HOMEDIR=${CMAKE_BUILD_DIR}/dbus")
-       ADD_EXECUTABLE(dbus-test${CMAKE_EXE_POSTFIX}  ${CMAKE_SOURCE_DIR}/../dbus/dbus-test-main.c)
-       target_link_libraries(dbus-test${CMAKE_EXE_POSTFIX} dbus-1 ${LIBS})
-       add_test(dbus-test${CMAKE_EXE_POSTFIX} ${EXECUTABLE_OUTPUT_PATH}/dbus-test ${CMAKE_SOURCE_DIR}/../test/data)
-       install_targets(/bin dbus-test${CMAKE_EXE_POSTFIX})
+       ADD_EXECUTABLE(dbus-test ${CMAKE_SOURCE_DIR}/../dbus/dbus-test-main.c)
+       target_link_libraries(dbus-test dbus-1 ${LIBS})
+       add_test(dbus-test ${EXECUTABLE_OUTPUT_PATH}/dbus-test ${CMAKE_SOURCE_DIR}/../test/data)
+       #install_targets(/bin dbus-test)
 ENDIF (DBUS_BUILD_TESTS)
 
 if (UNIX)

diff --git a/cmake/test/CMakeLists.txt b/cmake/test/CMakeLists.txt
index 65606bf..ef79c26 100644 (file)
--- a/cmake/test/CMakeLists.txt
+++ b/cmake/test/CMakeLists.txt
@@ -90,7 +90,7 @@ set (decode_gcov_SOURCES
 
 add_executable(test-service ${test-service_SOURCES})
 target_link_libraries(test-service dbus-1)
-install_targets(/bin test-service)
+#install_targets(/bin test-service)
 
 # (rh) does not work at now
 ADD_TEST(test-service ${EXECUTABLE_OUTPUT_PATH}/test-service${EXT})
@@ -99,17 +99,17 @@ ADD_TEST(test-service ${EXECUTABLE_OUTPUT_PATH}/test-service${EXT})
 
 add_executable(test-names ${test-names_SOURCES})
 target_link_libraries(test-names dbus-1)
-install_targets(/bin test-names)
+#install_targets(/bin test-names)
 ADD_TEST(test-names ${EXECUTABLE_OUTPUT_PATH}/test-names${EXT})
 
 add_executable(test-shell ${test-shell_SOURCES})
 target_link_libraries(test-shell dbus-1)
-install_targets(/bin test-shell)
+#install_targets(/bin test-shell)
 ADD_TEST(test-shell ${EXECUTABLE_OUTPUT_PATH}/test-shell${EXT})
 
 add_executable(test-shell-service ${test-shell_SOURCES})
 target_link_libraries(test-shell-service dbus-1)
-install_targets(/bin test-shell-service)
+#install_targets(/bin test-shell-service)
 ADD_TEST(test-shell-service ${EXECUTABLE_OUTPUT_PATH}/test-shell-service${EXT})
 
 add_executable(test-spawn ${test-spawn_SOURCES})
@@ -119,12 +119,12 @@ target_link_libraries(test-spawn dbus-1)
 
 add_executable(test-exit ${test-exit_SOURCES})
 target_link_libraries(test-exit dbus-1)
-install_targets(/bin test-exit)
+#install_targets(/bin test-exit)
 ADD_TEST(test-exit ${EXECUTABLE_OUTPUT_PATH}/test-exit${EXT})
 
 add_executable(test-segfault ${test-segfault_SOURCES})
 target_link_libraries(test-segfault dbus-1)
-install_targets(/bin test-segfault)
+#install_targets(/bin test-segfault)
 ADD_TEST(test-segfault ${EXECUTABLE_OUTPUT_PATH}/test-segfault${EXT})
 
 add_executable(test-sleep-forever ${test-sleep-forever_SOURCES})
@@ -203,7 +203,7 @@ FOREACH(FILE ${FILES})
                MESSAGE("FROM: ${FILE}\nTO: ${TARGET}\n")
        ENDIF (CONFIG_VERBOSE)
        configure_file(${FILE} ${TARGET} )
-       install_files(/data/dbus-1/services FILES ${TARGET})
+       #install_files(/data/dbus-1/services FILES ${TARGET})
 ENDFOREACH(FILE)
 
 #

diff --git a/cmake/test/name-test/CMakeLists.txt b/cmake/test/name-test/CMakeLists.txt
index 3b8f39e..2af0d89 100644 (file)
--- a/cmake/test/name-test/CMakeLists.txt
+++ b/cmake/test/name-test/CMakeLists.txt
@@ -9,17 +9,17 @@ add_definitions(-DDBUS_COMPILATION)
 # there is also a test-names executable, don't know if this is the same
 add_executable(test-names1 ${NAMEtest-DIR}/test-names.c)
 target_link_libraries(test-names1 dbus-1)
-install_targets(/bin test-names1)
+#install_targets(/bin test-names1)
 ADD_TEST(test-names ${EXECUTABLE_OUTPUT_PATH}/test-names1)
 
 add_executable(test-pending-call-dispatch ${NAMEtest-DIR}/test-pending-call-dispatch.c)
 target_link_libraries(test-pending-call-dispatch dbus-1)
-install_targets(/bin test-pending-call-dispatch)
+#install_targets(/bin test-pending-call-dispatch)
 ADD_TEST(test-pending-call-dispatch ${EXECUTABLE_OUTPUT_PATH}/test-pending_call-dispatch)
 
 add_executable(test-thread-init ${NAMEtest-DIR}/test-threads-init.c)
 target_link_libraries(test-thread-init dbus-1)
-install_targets(/bin test-thread-init)
+#install_targets(/bin test-thread-init)
 ADD_TEST(test-names ${EXECUTABLE_OUTPUT_PATH}/test-thread-init)
 
 endif (DBUS_BUILD_TESTS)