From: Simon McVittie <smcv@collabora.com>
Date: Wed, 3 Oct 2018 17:34:13 +0000 (+0100)
Subject: cmake: Install dbus-daemon-launch-helper even if tests are disabled
X-Git-Tag: dbus-1.13.8~41^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6ce7f5dd582f99923ac307832aed33faae79adc8;p=thirdparty%2Fdbus.git

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>
---

diff --git a/cmake/bus/CMakeLists.txt b/cmake/bus/CMakeLists.txt
index 0523e20eb..5bba0aef3 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)