fdo-mirrors/dbus
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/dbus/dbus.git synced 2025-12-25 08:10:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "made session service dirs customizable: cmake part"

Browse source 
This reverts commit 89e453216c.
It makes the tests fail under autotools.
This commit is contained in:
Simon McVittie 2012-01-04 18:20:06 +00:00
parent 4f404b5603
commit f56a55af1a
3 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bus/session.conf.in
View file

@ -14,7 +14,7 @@
<listen>@DBUS_SESSION_BUS_DEFAULT_ADDRESS@</listen>
@DBUS_SESSION_SERVICE_DIRS@
<standard_session_servicedirs />
<policy context="default">
<!-- Allow everything to be sent -->

2
cmake/bus/CMakeLists.txt
View file

@ -10,8 +10,6 @@ set (config_DATA
system.conf
)
# setup parameters for conf generating
set (DBUS_SESSION_SERVICE_DIRS "<standard_session_servicedirs />")
# config files for installation
CONFIGURE_FILE( "${BUS_DIR}/session.conf.in" "${CMAKE_CURRENT_BINARY_DIR}/session.conf" IMMEDIATE @ONLY)
CONFIGURE_FILE( "system.conf.cmake" "${CMAKE_CURRENT_BINARY_DIR}/system.conf" IMMEDIATE @ONLY)

3
cmake/test/CMakeLists.txt
View file

@ -1,8 +1,5 @@
project(test)
set (DBUS_SESSION_SERVICE_DIRS "<servicedir>${CMAKE_BINARY_DIR}/test/data/valid-service-files</servicedir>")
CONFIGURE_FILE( "../../bus/session.conf.in" "${CMAKE_CURRENT_BINARY_DIR}/run-with-tmp-session-bus.conf" IMMEDIATE @ONLY)
add_definitions(${DBUS_INTERNAL_CLIENT_DEFINITIONS})
add_library(dbus-testutils STATIC