diff options
| author | Ralf Habacker <ralf.habacker@freenet.de> | 2020-09-23 16:32:54 +0200 |
|---|---|---|
| committer | Ralf Habacker <ralf.habacker@freenet.de> | 2020-09-23 17:21:40 +0200 |
| commit | 5b1870a5bd89934307aa730511c7da187ae4dc06 (patch) | |
| tree | de77d6c5e8fb545a18ae6905d894f91af4d53acc /bus | |
| parent | 82942171a827349f083ef3401d8456d2647a9a4b (diff) | |
| download | dbus-5b1870a5bd89934307aa730511c7da187ae4dc06.tar.gz | |
cmake: make support for traditional activation optional
Traditional activation is enabled/disabled with the cmake configure
parameter -DENABLE_TRADITIONAL_ACTIVATION, which is enabled by default.
This was added to the Autotools build system as part of dbus/dbus!107
but until now was not possible to disable when building with CMake.
Diffstat (limited to 'bus')
| -rw-r--r-- | bus/CMakeLists.txt | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/bus/CMakeLists.txt b/bus/CMakeLists.txt index a52c1bfb..26f07dd2 100644 --- a/bus/CMakeLists.txt +++ b/bus/CMakeLists.txt @@ -143,15 +143,18 @@ set(LAUNCH_HELPER_SOURCES ) if(NOT WIN32) + # test-bus-system depends on this library add_library(launch-helper-internal STATIC ${LAUNCH_HELPER_SOURCES}) target_link_libraries(launch-helper-internal ${DBUS_INTERNAL_LIBRARIES} ${EXPAT_LIBRARIES}) - add_executable(dbus-daemon-launch-helper activation-helper.c activation-helper-bin.c ) - target_link_libraries(dbus-daemon-launch-helper launch-helper-internal) - install(TARGETS dbus-daemon-launch-helper RUNTIME DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}) - # It is intended not to check here that uid is 0 - see https://gitlab.freedesktop.org/dbus/dbus/-/merge_requests/154#note_478876 - install(CODE "message(\"-- Note: Not installing \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBEXECDIR}/dbus-daemon-launch-helper binary setuid!\")") - install(CODE "message(\"-- Note: You'll need to manually set permissions to 'root:${DBUS_USER}' and permissions '4750'\")") + if(ENABLE_TRADITIONAL_ACTIVATION) + add_executable(dbus-daemon-launch-helper activation-helper.c activation-helper-bin.c ) + target_link_libraries(dbus-daemon-launch-helper launch-helper-internal) + install(TARGETS dbus-daemon-launch-helper RUNTIME DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}) + # It is intended not to check here that uid is 0 - see https://gitlab.freedesktop.org/dbus/dbus/-/merge_requests/154#note_478876 + install(CODE "message(\"-- Note: Not installing \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBEXECDIR}/dbus-daemon-launch-helper binary setuid!\")") + install(CODE "message(\"-- Note: You'll need to manually set permissions to 'root:${DBUS_USER}' and permissions '4750'\")") + endif() endif() if(MSVC) |