]> git.ipfire.org Git - thirdparty/dbus.git/commitdiff
cmake: Install dbus-daemon-launch-helper even if tests are disabled
authorSimon McVittie <smcv@collabora.com>
Wed, 3 Oct 2018 17:34:13 +0000 (18:34 +0100)
committerSimon McVittie <smcv@collabora.com>
Thu, 25 Oct 2018 16:04:04 +0000 (16:04 +0000)
This is a long-standing bug, spotted while moving test code into
the test directory.

Signed-off-by: Simon McVittie <smcv@collabora.com>
cmake/bus/CMakeLists.txt

index 0523e20eb3a854287b0a302bf97e7f32f6314814..5bba0aef3e03f1753186d16b2364f0402826704c 100644 (file)
@@ -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)