diff options
| author | Christian Ehrlicher <Ch.Ehrlicher@gmx.de> | 2009-04-24 11:36:50 +0200 |
|---|---|---|
| committer | unknown <Administrator@.(none)> | 2009-11-30 10:32:04 +0100 |
| commit | 466848045880783eb3f8939fbedb7a7b6064b81f (patch) | |
| tree | 057b93d4b068b32b3d486db383cd814d924f07b8 /cmake/tools | |
| parent | a83b7cb80c375c1aaeaa8b4d8114037069e2736c (diff) | |
| download | dbus-466848045880783eb3f8939fbedb7a7b6064b81f.tar.gz | |
merge changes done to the cmake-buildsystem from the sf.net windbus-svn trunk. tested and works fine with at least msvc2008. (cherry picked from commit 45c168fd61e3f6447e014df4bb6417efbe725ccd)
Diffstat (limited to 'cmake/tools')
| -rw-r--r-- | cmake/tools/CMakeLists.txt | 61 |
1 files changed, 11 insertions, 50 deletions
diff --git a/cmake/tools/CMakeLists.txt b/cmake/tools/CMakeLists.txt index adff9306..684ec0e0 100644 --- a/cmake/tools/CMakeLists.txt +++ b/cmake/tools/CMakeLists.txt @@ -1,30 +1,4 @@ - -include_directories(${CMAKE_SOURCE_DIR}/..) - -#nodist_libdbus_glib_HEADERS = dbus-glib-bindings.h -#libdbus_glibdir = $(includedir)/dbus-1.0/dbus - -#dbus-glib-bindings.h: dbus-bus-introspect.xml $(top_builddir)/glib/dbus-binding-tool$(EXEEXT) -# $(top_builddir)/glib/dbus-binding-tool --mode=glib-client --output=dbus-glib-bindings.h dbus-bus-introspect.xml - -#BUILT_SOURCES = dbus-glib-bindings.h dbus-bus-introspect.xml - -#else -#GLIB_TOOLS= -#endif - -#if HAVE_GTK -#GTK_TOOLS=dbus-viewer -#else -#GTK_TOOLS= -#endif - -#if HAVE_GLIB -#dbus-bus-introspect.xml: $(top_builddir)/bus/dbus-daemon$(EXEEXT) dbus-launch$(EXEEXT) dbus-send$(EXEEXT) $(top_builddir)/bus/dbus-daemon$(EXEEXT) Makefile -# DBUS_TOP_BUILDDIR=$(top_builddir) $(srcdir)/run-with-tmp-session-bus.sh ./dbus-send --print-reply=literal --dest=org.freedesktop.DBus /org/freedesktop/DBus org.freedesktop.DBus.Introspectable.Introspect > dbus-bus-introspect.xml.tmp && mv dbus-bus-introspect.xml.tmp dbus-bus-introspect.xml -#endif - -#bin_PROGRAMS=dbus-send $(GLIB_TOOLS) dbus-launch dbus-cleanup-sockets $(GTK_TOOLS) +project(tools) set (dbus_send_SOURCES ../../tools/dbus-print-message.c @@ -60,29 +34,16 @@ set (dbus_viewer_SOURCES ../../tools/dbus-viewer.c ) -add_executable(dbus-send${CMAKE_EXE_POSTFIX} ${dbus_send_SOURCES}) -target_link_libraries(dbus-send${CMAKE_EXE_POSTFIX} dbus-1) -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-send ${dbus_send_SOURCES}) +target_link_libraries(dbus-send ${DBUS_1}) +install_targets(/bin dbus-send ) -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} ) +add_executable(dbus-launch ${dbus_launch_SOURCES}) +target_link_libraries(dbus-launch ) +install_targets(/bin dbus-launch ) -#dbus_send_LDADD= $(top_builddir)/dbus/libdbus-1.la -#dbus_monitor_LDADD= $(top_builddir)/glib/libdbus-glib-1.la -#dbus_launch_LDADD= $(DBUS_X_LIBS) -#dbus_viewer_LDADD= $(top_builddir)/glib/libdbus-gtool.la $(DBUS_GTK_THREADS_LIBS) $(DBUS_GLIB_TOOL_LIBS) +add_executable(dbus-monitor ${dbus_monitor_SOURCES}) +target_link_libraries(dbus-monitor ${DBUS_1}) +install_targets(/bin dbus-monitor ) -#man_MANS = dbus-send.1 dbus-monitor.1 dbus-launch.1 dbus-cleanup-sockets.1 -#EXTRA_DIST = $(man_MANS) run-with-tmp-session-bus.sh -#CLEANFILES = -# run-with-tmp-session-bus.conf -# dbus-bus-introspect.xml -# dbus-glib-bindings.h +set_target_properties(dbus-send dbus-launch dbus-monitor PROPERTIES DEBUG_POSTFIX d) |