Revert "made session service dirs customizable: cmake part"

[platform/upstream/dbus.git] / cmake / bus / CMakeLists.txt

diff --git a/cmake/bus/CMakeLists.txt b/cmake/bus/CMakeLists.txt
index 1cfd147..faf9a8e 100644 (file)
--- a/cmake/bus/CMakeLists.txt
+++ b/cmake/bus/CMakeLists.txt
@@ -11,9 +11,8 @@ set (config_DATA
 )
 
 # config files for installation 
-FOREACH(file ${config_DATA})
-       CONFIGURE_FILE( "${CMAKE_CURRENT_SOURCE_DIR}/${file}.cmake" "${CMAKE_CURRENT_BINARY_DIR}/${file}" IMMEDIATE @ONLY)
-ENDFOREACH(file)
+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)
 
 # copy services for local daemon start to local service dir data/dbus-1/services
 SET (SERVICE_FILES test/data/valid-service-files)
@@ -74,6 +73,12 @@ set (BUS_SOURCES
        ${XML_SOURCES}
        ${DIR_WATCH_SOURCE}
 )
+if(DBUS_ENABLE_STATS)
+       list(APPEND BUS_SOURCES
+               ${BUS_DIR}/stats.c
+               ${BUS_DIR}/stats.h
+       )
+endif()
 
 include_directories(${XML_INCLUDE_DIR})
 
@@ -83,7 +88,8 @@ set_target_properties(dbus-daemon PROPERTIES OUTPUT_NAME ${DBUS_DAEMON_NAME})
 set_target_properties(dbus-daemon PROPERTIES COMPILE_FLAGS ${DBUS_INTERNAL_CLIENT_DEFINITIONS})
 
 install_targets(/bin dbus-daemon)
-install_files(/etc FILES ${config_DATA})
+install_files(/etc/dbus-1 FILES ${config_DATA})
+install(DIRECTORY .  DESTINATION etc/dbus-1/session.d  FILES_MATCHING PATTERN "*.conf")
 
 if (DBUS_SERVICE)
        set (dbus_service_SOURCES