diff options
| author | Ralf Habacker <ralf.habacker@freenet.de> | 2011-10-31 15:53:25 +0100 |
|---|---|---|
| committer | Ralf Habacker <ralf.habacker@freenet.de> | 2011-11-21 12:21:01 +0100 |
| commit | 89e453216c02bb85c5e53d459997f8bc3b2c73d4 (patch) | |
| tree | dd2ab53a043700a3cf53412bd7f7fb195c276143 /cmake | |
| parent | a2c623b881f605619f3f4965aff123689cacf9bf (diff) | |
| download | dbus-89e453216c02bb85c5e53d459997f8bc3b2c73d4.tar.gz | |
made session service dirs customizable: cmake part
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/bus/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | cmake/test/CMakeLists.txt | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/cmake/bus/CMakeLists.txt b/cmake/bus/CMakeLists.txt index faf9a8e9..e7124801 100644 --- a/cmake/bus/CMakeLists.txt +++ b/cmake/bus/CMakeLists.txt @@ -10,6 +10,8 @@ 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) diff --git a/cmake/test/CMakeLists.txt b/cmake/test/CMakeLists.txt index 8657e4c7..014c1709 100644 --- a/cmake/test/CMakeLists.txt +++ b/cmake/test/CMakeLists.txt @@ -1,5 +1,8 @@ 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 |