made session service dirs customizable: cmake part

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

diff --git a/cmake/test/CMakeLists.txt b/cmake/test/CMakeLists.txt
index 4ec702d..014c170 100644 (file)
--- 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
@@ -54,7 +57,7 @@ target_link_libraries(test-names dbus-testutils)
 
 add_executable(shell-test ${shell-test_SOURCES})
 target_link_libraries(shell-test ${DBUS_INTERNAL_LIBRARIES})
-ADD_TEST(shell-test ${EXECUTABLE_OUTPUT_PATH}/shell-test${EXT})
+ADD_TEST(shell-test ${EXECUTABLE_OUTPUT_PATH}/shell-test${EXEEXT})
 
 add_executable(test-shell-service ${test-shell-service_SOURCES})
 target_link_libraries(test-shell-service dbus-testutils)
@@ -128,10 +131,6 @@ FOREACH(FILE_TYPE *.conf.in *.service.in)
       GET_FILENAME_COMPONENT(FILENAME ${FILE} NAME)
       STRING(REGEX REPLACE "\\.in$" "" FILENAME ${FILENAME})
       SET (TARGET ${CMAKE_BINARY_DIR}/${DIR}/${FILENAME})
-      STRING(REGEX REPLACE "\\.in$" ".cmake" _file ${FILE})
-      IF (EXISTS ${_file})
-        SET (FILE ${_file})
-      ENDIF (EXISTS ${_file})
       configure_file(${FILE} ${TARGET} @ONLY IMMEDIATE)
       IF (CONFIG_VERBOSE)
         MESSAGE("${FILE}")