fdo-mirrors/dbus
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/dbus/dbus.git synced 2026-06-07 05:58:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'cmake-build-missing-tools' into 'master'

Browse source 
Build missing tools with cmake

See merge request dbus/dbus!154
This commit is contained in:
Ralf Habacker 2020-04-30 00:31:04 +00:00
commit df7d444fdb
3 changed files with 19 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
cmake/config.h.cmake
View file

@ -29,6 +29,7 @@
#cmakedefine DBUS_PREFIX "@DBUS_PREFIX@"
#cmakedefine DBUS_SYSTEM_CONFIG_FILE "@DBUS_SYSTEM_CONFIG_FILE@"
#cmakedefine DBUS_SESSION_CONFIG_FILE "@DBUS_SESSION_CONFIG_FILE@"
#cmakedefine DBUS_SESSION_SOCKET_DIR "@DBUS_SESSION_SOCKET_DIR@"
#cmakedefine DBUS_DAEMON_NAME "@DBUS_DAEMON_NAME@"
#cmakedefine DBUS_SYSTEM_BUS_DEFAULT_ADDRESS "@DBUS_SYSTEM_BUS_DEFAULT_ADDRESS@"
#cmakedefine DBUS_SESSION_BUS_CONNECT_ADDRESS "@DBUS_SESSION_BUS_CONNECT_ADDRESS@"

2
dbus/CMakeLists.txt
View file

@ -61,6 +61,7 @@ set(DBUS_LIB_SOURCES
if(UNIX)
set(DBUS_LIB_SOURCES ${DBUS_LIB_SOURCES}
dbus-uuidgen.c
dbus-transport-unix.c
dbus-server-unix.c
)
@ -95,6 +96,7 @@ set(DBUS_LIB_HEADERS
dbus-threads-internal.h
dbus-transport.h
dbus-transport-protected.h
dbus-uuidgen.h
dbus-watch.h
${CMAKE_BINARY_DIR}/config.h
)

16
tools/CMakeLists.txt
View file

@ -59,6 +59,16 @@ set(dbus_run_session_SOURCES
dbus-run-session.c
)
set(dbus_uuidgen_SOURCES
dbus-uuidgen.c
)
if(NOT WIN32)
add_executable(dbus-cleanup-sockets ${dbus_cleanup_sockets_SOURCES})
target_link_libraries(dbus-cleanup-sockets ${DBUS_LIBRARIES})
install(TARGETS dbus-cleanup-sockets ${INSTALL_TARGETS_DEFAULT_ARGS})
endif()
if(WIN32)
add_executable_version_info(dbus_send_SOURCES "dbus-send")
endif()
@ -112,6 +122,12 @@ add_executable(dbus-run-session ${dbus_run_session_SOURCES})
target_link_libraries(dbus-run-session ${DBUS_INTERNAL_LIBRARIES})
install(TARGETS dbus-run-session ${INSTALL_TARGETS_DEFAULT_ARGS})
if(NOT WIN32)
add_executable(dbus-uuidgen ${dbus_uuidgen_SOURCES})
target_link_libraries(dbus-uuidgen ${DBUS_LIBRARIES})
install(TARGETS dbus-uuidgen ${INSTALL_TARGETS_DEFAULT_ARGS})
endif()
# create the /var/lib/dbus directory for dbus-uuidgen
install(DIRECTORY DESTINATION ${CMAKE_INSTALL_LOCALSTATEDIR}/lib/dbus)