From 081b2cd68e3bbbcffc4f005e55ddbb7aced8727b Mon Sep 17 00:00:00 2001 From: Ralf Habacker Date: Fri, 1 Jun 2007 22:24:57 +0000 Subject: * tools/dbus-launch-win.c: new file, replaces script wrapper on win32 --- cmake/CMakeLists.txt | 2 -- cmake/tools/CMakeLists.txt | 10 ++++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) (limited to 'cmake') diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt index 6cc0ac8c..1df49f64 100644 --- a/cmake/CMakeLists.txt +++ b/cmake/CMakeLists.txt @@ -423,9 +423,7 @@ endif(MINGW) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h ) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/dbus-env.bat.cmake ${CMAKE_BINARY_DIR}/bin/dbus-env.bat ) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/dbus-launch.bat.cmake ${CMAKE_BINARY_DIR}/bin/dbus-launch.bat ) install_files(/bin FILES ${CMAKE_BINARY_DIR}/bin/dbus-env.bat) -install_files(/bin FILES ${CMAKE_BINARY_DIR}/bin/dbus-launch.bat) # compiler definitions add_definitions(-DHAVE_CONFIG_H=1) diff --git a/cmake/tools/CMakeLists.txt b/cmake/tools/CMakeLists.txt index c5568cb3..adff9306 100644 --- a/cmake/tools/CMakeLists.txt +++ b/cmake/tools/CMakeLists.txt @@ -38,9 +38,15 @@ set (dbus_monitor_SOURCES ../../tools/dbus-print-message.h ) +if (WIN32) +set (dbus_launch_SOURCES + ../../tools/dbus-launch-win.c +) +else (WIN32) set (dbus_launch_SOURCES ../../tools/dbus-launch.c ) +endif (WIN32) set (dbus_cleanup_sockets_SOURCES ../../tools/dbus-cleanup-sockets.c @@ -61,6 +67,10 @@ install_targets(/bin dbus-send${CMAKE_EXE_POSTFIX} ) # glib required #add_executable(dbus_launch${CMAKE_EXE_POSTFIX} ${dbus_launch_SOURCES}) +add_executable(dbus-launch${CMAKE_EXE_POSTFIX} ${dbus_launch_SOURCES}) +target_link_libraries(dbus-launch${CMAKE_EXE_POSTFIX} ) +install_targets(/bin dbus-launch${CMAKE_EXE_POSTFIX} ) + add_executable(dbus-monitor${CMAKE_EXE_POSTFIX} ${dbus_monitor_SOURCES}) target_link_libraries(dbus-monitor${CMAKE_EXE_POSTFIX} dbus-1) install_targets(/bin dbus-monitor${CMAKE_EXE_POSTFIX} ) -- cgit