From c90f385012cdfd295e1b8a9b46e6d23cd2e042f4 Mon Sep 17 00:00:00 2001 From: Ralf Habacker Date: Sun, 15 Nov 2015 20:48:30 +0100 Subject: [PATCH] Fix test-autolaunch test by generating session.conf in /share/dbus-1 for cmake. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=92899 --- cmake/bus/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/bus/CMakeLists.txt b/cmake/bus/CMakeLists.txt index 0dcae65..9a2933e 100644 --- a/cmake/bus/CMakeLists.txt +++ b/cmake/bus/CMakeLists.txt @@ -4,12 +4,12 @@ SET(EFENCE "") SET(BUS_DIR ${CMAKE_SOURCE_DIR}/../bus) # config files for installation -CONFIGURE_FILE( "${BUS_DIR}/session.conf.in" "${CMAKE_CURRENT_BINARY_DIR}/session.conf" IMMEDIATE @ONLY) +CONFIGURE_FILE( "${BUS_DIR}/session.conf.in" "${CMAKE_BINARY_DIR}/share/dbus-1/session.conf" IMMEDIATE @ONLY) CONFIGURE_FILE( "${BUS_DIR}/legacy-config/session.conf.in" "${CMAKE_CURRENT_BINARY_DIR}/legacy-config/session.conf" IMMEDIATE @ONLY) FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/session.d) if(NOT WIN32) - CONFIGURE_FILE( "${BUS_DIR}/system.conf.in" "${CMAKE_CURRENT_BINARY_DIR}/system.conf" IMMEDIATE @ONLY) + CONFIGURE_FILE( "${BUS_DIR}/system.conf.in" "${CMAKE_BINARY_DIR}/share/dbus-1/system.conf" IMMEDIATE @ONLY) CONFIGURE_FILE( "${BUS_DIR}/legacy-config/system.conf.in" "${CMAKE_CURRENT_BINARY_DIR}/legacy-config/system.conf" IMMEDIATE @ONLY) FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/system.d) endif() -- 1.8.4.5