build dbus-daemon-launch-helper-test and friends set all TEST vars needed for the...

diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
index 0793398..2c3707c 100644 (file)
--- a/cmake/CMakeLists.txt
+++ b/cmake/CMakeLists.txt
@@ -498,8 +498,8 @@ if (DBUS_BUILD_TESTS)
     # set variables used for the .in files (substituted by configure_file) in test/data:
     set(TEST_VALID_SERVICE_DIR ${CMAKE_BINARY_DIR}/test/data/valid-service-files)
     set(TEST_VALID_SERVICE_SYSTEM_DIR ${CMAKE_BINARY_DIR}/test/data/valid-service-files-system)
-# TODO: TEST_SOCKET_DIR
-# TODO: TEST_LAUNCH_HELPER_BINARY
+    set(TEST_SOCKET_DIR ${DBUS_SESSION_SOCKET_DIR} )
+    set(TEST_LAUNCH_HELPER_BINARY ${EXECUTABLE_OUTPUT_PATH}/dbus-daemon-launch-helper-test)
 endif  (DBUS_BUILD_TESTS)
 
 ########### subdirs ###############

diff --git a/cmake/bus/CMakeLists.txt b/cmake/bus/CMakeLists.txt
index 4d7e8a1..6be1235 100644 (file)
--- a/cmake/bus/CMakeLists.txt
+++ b/cmake/bus/CMakeLists.txt
@@ -151,6 +151,26 @@ endif(MSVC)
 ##install_file(${configdir}/system.d FILE
 
 
+set(LAUNCH_HELPER_SOURCES ${XML_SOURCES}
+    ${BUS_DIR}/config-parser-common.c
+    ${BUS_DIR}/config-parser-trivial.c
+    ${BUS_DIR}/desktop-file.c
+    ${BUS_DIR}/utils.c
+    ${BUS_DIR}/activation-helper.c
+
+)
+
+add_executable(dbus-daemon-launch-helper ${LAUNCH_HELPER_SOURCES} ${BUS_DIR}/activation-helper-bin.c )
+target_link_libraries(dbus-daemon-launch-helper ${DBUS_1} ${LIBS} )
+
+add_executable(dbus-daemon-launch-helper-test ${LAUNCH_HELPER_SOURCES}     ${BUS_DIR}/activation-helper-bin.c)
+set_target_properties(dbus-daemon-launch-helper-test PROPERTIES COMPILE_FLAGS "-DACTIVATION_LAUNCHER_TEST")
+target_link_libraries(dbus-daemon-launch-helper-test ${DBUS_1} ${LIBS} )
+
+add_executable(bus-test-launch-helper ${LAUNCH_HELPER_SOURCES}  ${BUS_DIR}/test-launch-helper.c)
+set_target_properties(bus-test-launch-helper PROPERTIES COMPILE_FLAGS "-DACTIVATION_LAUNCHER_TEST -DACTIVATION_LAUNCHER_DO_OOM")
+
+target_link_libraries(bus-test-launch-helper ${DBUS_1} ${LIBS} )
 
 #### Init scripts fun
 #SCRIPT_IN_FILES=messagebus.in