summaryrefslogtreecommitdiff
path: root/cmake/bus
diff options
context:
space:
mode:
authorSimon McVittie <smcv@collabora.com>2018-10-03 18:34:13 +0100
committerSimon McVittie <smcv@collabora.com>2018-10-25 16:04:04 +0000
commit6ce7f5dd582f99923ac307832aed33faae79adc8 (patch)
tree62c5782bb1099608f1e78f9320933a06c6f029c9 /cmake/bus
parent0d9e031361d018e23dc8f1dd90a779ddf305bbd8 (diff)
downloaddbus-6ce7f5dd582f99923ac307832aed33faae79adc8.tar.gz
cmake: Install dbus-daemon-launch-helper even if tests are disabled
This is a long-standing bug, spotted while moving test code into the test directory. Signed-off-by: Simon McVittie <smcv@collabora.com>
Diffstat (limited to 'cmake/bus')
-rw-r--r--cmake/bus/CMakeLists.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/cmake/bus/CMakeLists.txt b/cmake/bus/CMakeLists.txt
index 0523e20e..5bba0aef 100644
--- a/cmake/bus/CMakeLists.txt
+++ b/cmake/bus/CMakeLists.txt
@@ -148,6 +148,7 @@ set(LAUNCH_HELPER_SOURCES
if(NOT WIN32)
add_executable(dbus-daemon-launch-helper ${LAUNCH_HELPER_SOURCES} ${BUS_DIR}/activation-helper-bin.c )
target_link_libraries(dbus-daemon-launch-helper ${DBUS_INTERNAL_LIBRARIES} ${EXPAT_LIBRARIES} )
+ install_targets(/lib dbus-daemon-launch-helper)
endif(NOT WIN32)
if (DBUS_ENABLE_EMBEDDED_TESTS)
@@ -171,7 +172,6 @@ if (DBUS_ENABLE_EMBEDDED_TESTS)
set (SOURCES ${LAUNCH_HELPER_SOURCES} ${BUS_DIR}/test-launch-helper.c)
add_test_executable(test-bus-launch-helper "${SOURCES}" ${DBUS_INTERNAL_LIBRARIES} ${EXPAT_LIBRARIES})
set_target_properties(test-bus-launch-helper PROPERTIES COMPILE_FLAGS "-DACTIVATION_LAUNCHER_TEST -DACTIVATION_LAUNCHER_DO_OOM")
- install_targets(/lib dbus-daemon-launch-helper)
endif()
endif (DBUS_ENABLE_EMBEDDED_TESTS)