Attachment 52955 Details for Bug 41250 – cmake part for more customizable session.conf.in

[patch] cmake part for more customizable session.conf.in

0001-made-session-service-dirs-customizable.patch (text/plain), 1.79 KB, created by Ralf Habacker on 2011-10-31 07:57:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ralf Habacker

Created: 2011-10-31 07:57:59 UTC

Size: 1.79 KB

patch

obsolete

>From cef7ff4c9344da4c0f38439690702c6b1e112677 Mon Sep 17 00:00:00 2001
>From: Ralf Habacker <ralf.habacker@freenet.de>
>Date: Mon, 31 Oct 2011 15:53:25 +0100
>Subject: [PATCH] made session service dirs customizable
>
>---
> bus/session.conf.in       |    2 +-
> cmake/bus/CMakeLists.txt  |    2 ++
> cmake/test/CMakeLists.txt |    3 +++
> 3 files changed, 6 insertions(+), 1 deletions(-)
>
>diff --git a/bus/session.conf.in b/bus/session.conf.in
>index e121ff9..c7b345d 100644
>--- a/bus/session.conf.in
>+++ b/bus/session.conf.in
>@@ -14,7 +14,7 @@
> 
>   <listen>@DBUS_SESSION_BUS_DEFAULT_ADDRESS@</listen>
> 
>-  <standard_session_servicedirs />
>+  @DBUS_SESSION_SERVICE_DIRS@
> 
>   <policy context="default">
>     
>diff --git a/cmake/bus/CMakeLists.txt b/cmake/bus/CMakeLists.txt
>index faf9a8e..e712480 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 8657e4c..014c170 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
>-- 
>1.7.4.msysgit.0
>

Actions: View | Splinter Review

Attachments on bug 41250: 52955

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.