From 6ce7f5dd582f99923ac307832aed33faae79adc8 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Wed, 3 Oct 2018 18:34:13 +0100 Subject: 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 --- cmake/bus/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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) -- cgit v1.2.1 From ef1f53eed87a15010192e2ecfe1c0cdf76c39dde Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Mon, 22 Oct 2018 10:15:44 +0100 Subject: cmake: Use non-deprecated install mechanism for d-d-launch-helper As suggested by Ralf Habacker on !9. Signed-off-by: Simon McVittie --- cmake/bus/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/bus/CMakeLists.txt b/cmake/bus/CMakeLists.txt index 5bba0aef..3168ad2e 100644 --- a/cmake/bus/CMakeLists.txt +++ b/cmake/bus/CMakeLists.txt @@ -148,7 +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) + install(TARGETS dbus-daemon-launch-helper ${INSTALL_TARGETS_DEFAULT_ARGS} RUNTIME DESTINATION lib) endif(NOT WIN32) if (DBUS_ENABLE_EMBEDDED_TESTS) -- cgit v1.2.1 From 84aa8c99341670100f8399951d31de403a47a0c3 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Mon, 22 Oct 2018 10:20:37 +0100 Subject: cmake: Install d-d-launch-helper to ${CMAKE_INSTALL_LIBEXECDIR} Instead of hard-coding the lib subdirectory of the installation prefix, use the ${CMAKE_INSTALL_LIBEXECDIR} provided by the GNUInstallDirs module, which defaults to the libexec subdirectory of the installation prefix. This is consistent with the Autotools build system, which installs to ${exec_prefix}/libexec unless modified with --libexecdir. Signed-off-by: Simon McVittie --- cmake/bus/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/bus/CMakeLists.txt b/cmake/bus/CMakeLists.txt index 3168ad2e..a9b681d4 100644 --- a/cmake/bus/CMakeLists.txt +++ b/cmake/bus/CMakeLists.txt @@ -148,7 +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 lib) + install(TARGETS dbus-daemon-launch-helper ${INSTALL_TARGETS_DEFAULT_ARGS} RUNTIME DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}) endif(NOT WIN32) if (DBUS_ENABLE_EMBEDDED_TESTS) -- cgit v1.2.1