diff options
| author | Simon McVittie <smcv@collabora.com> | 2018-10-25 16:56:04 +0000 |
|---|---|---|
| committer | Simon McVittie <smcv@collabora.com> | 2018-10-25 16:56:04 +0000 |
| commit | e87a3ba5601943687b09a5f119b9a637ce955b93 (patch) | |
| tree | ff978a0c51294c2bf0f4640b3166155d77a8bc0c | |
| parent | 0d9e031361d018e23dc8f1dd90a779ddf305bbd8 (diff) | |
| parent | 84aa8c99341670100f8399951d31de403a47a0c3 (diff) | |
| download | dbus-e87a3ba5601943687b09a5f119b9a637ce955b93.tar.gz | |
Merge branch 'cmake-ddlh' into 'master'
cmake: Install dbus-daemon-launch-helper even if tests are disabled
See merge request dbus/dbus!9
Reviewed-by: rhabacker
| -rw-r--r-- | cmake/bus/CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmake/bus/CMakeLists.txt b/cmake/bus/CMakeLists.txt index 0523e20e..a9b681d4 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 dbus-daemon-launch-helper ${INSTALL_TARGETS_DEFAULT_ARGS} RUNTIME DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}) 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) |