From 11110f64cedcd8373022039c773cb713c047f2eb Mon Sep 17 00:00:00 2001 From: Ralf Habacker Date: Fri, 8 Aug 2014 22:02:08 +0200 Subject: [PATCH] Fix installation of empty directories for cmake build system. The differences has been found out by comparing with the cross compiled mingw..-dbus packages. --- cmake/CMakeLists.txt | 6 +++--- cmake/bus/CMakeLists.txt | 6 +++++- cmake/dbus/CMakeLists.txt | 6 +++++- cmake/tools/CMakeLists.txt | 3 +++ 4 files changed, 16 insertions(+), 5 deletions(-) diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt index 41882d7..f25fccd 100644 --- a/cmake/CMakeLists.txt +++ b/cmake/CMakeLists.txt @@ -73,7 +73,7 @@ set(EXPANDED_DATADIR ${DBUS_INSTALL_DIR}/${DBUS_DATADIR}) set(DBUS_MACHINE_UUID_FILE ${DBUS_INSTALL_DIR}/lib/dbus/machine-id) set(DBUS_BINDIR ${EXPANDED_BINDIR}) set(DBUS_DAEMONDIR ${EXPANDED_BINDIR}) - +set(DBUS_LOCALSTATEDIR ${DBUS_INSTALL_DIR}/var) #enable building of shared library SET(BUILD_SHARED_LIBS ON) @@ -405,7 +405,7 @@ if (WIN32) # bus-test expects a non empty string set (DBUS_SYSTEM_PID_FILE "/dbus-pid") else (WIN32) - set (DBUS_SYSTEM_PID_FILE ${EXPANDED_LOCALSTATEDIR}/run/dbus/pid) + set (DBUS_SYSTEM_PID_FILE ${DBUS_LOCALSTATEDIR}/run/dbus/pid) endif (WIN32) if (WIN32) @@ -428,7 +428,7 @@ set (DEFAULT_MESSAGE_UNIX_FDS 1024) # and also to connect to. If this ever changes, it'll need to be split into # two variables, one for the listening address and one for the connecting # address. -set (DBUS_SYSTEM_BUS_DEFAULT_ADDRESS "unix:path=${EXPANDED_LOCALSTATEDIR}/run/dbus/system_bus_socket" CACHE STRING "system bus default address") +set (DBUS_SYSTEM_BUS_DEFAULT_ADDRESS "unix:path=${DBUS_LOCALSTATEDIR}/run/dbus/system_bus_socket" CACHE STRING "system bus default address") if (WIN32) set (DBUS_SESSION_BUS_LISTEN_ADDRESS "autolaunch:" CACHE STRING "session bus default listening address") diff --git a/cmake/bus/CMakeLists.txt b/cmake/bus/CMakeLists.txt index f5b41cd..b15ce04 100644 --- a/cmake/bus/CMakeLists.txt +++ b/cmake/bus/CMakeLists.txt @@ -89,7 +89,11 @@ set_target_properties(dbus-daemon PROPERTIES COMPILE_FLAGS ${DBUS_INTERNAL_CLIEN install_targets(/bin dbus-daemon) install_files(/etc/dbus-1 FILES ${config_DATA}) -install(DIRECTORY . DESTINATION etc/dbus-1/session.d FILES_MATCHING PATTERN "*.conf") +install(DIRECTORY DESTINATION var/run/dbus) +install(DIRECTORY DESTINATION etc/dbus-1/session.d) +install(DIRECTORY DESTINATION etc/dbus-1/system.d) +install(DIRECTORY DESTINATION etc/dbus-1/services) +install(DIRECTORY DESTINATION etc/dbus-1/system-services) if (DBUS_SERVICE) set (dbus_service_SOURCES diff --git a/cmake/dbus/CMakeLists.txt b/cmake/dbus/CMakeLists.txt index a6aaba0..dda42b7 100644 --- a/cmake/dbus/CMakeLists.txt +++ b/cmake/dbus/CMakeLists.txt @@ -22,6 +22,9 @@ set (dbusinclude_HEADERS ${DBUS_DIR}/dbus-syntax.h ${DBUS_DIR}/dbus-threads.h ${DBUS_DIR}/dbus-types.h +) + +set (dbusarchinclude_HEADERS dbus-arch-deps.h ) @@ -286,7 +289,8 @@ else(WIN32) endif(WIN32) install(TARGETS dbus-1 ${INSTALL_TARGETS_DEFAULT_ARGS}) -install_files(/include/dbus FILES ${dbusinclude_HEADERS}) +install_files(/include/dbus-1.0/dbus FILES ${dbusinclude_HEADERS}) +install_files(/lib/include/dbus-1.0/dbus FILES ${dbusarchinclude_HEADERS}) ### Internal library, used for the daemon, tools and tests, compiled statically. diff --git a/cmake/tools/CMakeLists.txt b/cmake/tools/CMakeLists.txt index ddbd5bc..9f363b7 100644 --- a/cmake/tools/CMakeLists.txt +++ b/cmake/tools/CMakeLists.txt @@ -45,3 +45,6 @@ install_targets(/bin dbus-launch ) add_executable(dbus-monitor ${dbus_monitor_SOURCES}) target_link_libraries(dbus-monitor ${DBUS_LIBRARIES}) install_targets(/bin dbus-monitor ) + +# create the /var/lib/dbus directory for dbus-uuidgen +install(DIRECTORY DESTINATION var/lib/dbus) -- 1.8.4.5