From b70b1859f4874bc1063fa609ec93e4cdee355b47 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Wed, 26 Jan 2022 22:43:29 +0100 Subject: data/CMakeLists.txt: Update detection of SYSTEMD_USER_DIR, use systemd's pkg-config variable if possible. --- data/CMakeLists.txt | 31 +++++++++++++++++++++++++------ 1 file changed, 25 insertions(+), 6 deletions(-) diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt index 21f7cba..867db2f 100644 --- a/data/CMakeLists.txt +++ b/data/CMakeLists.txt @@ -1,19 +1,38 @@ # ayatana-indicator-application.service -pkg_check_modules(SYSTEMD systemd) +########################### +# Systemd Job +########################### +pkg_check_modules(SYSTEMD systemd) if (${SYSTEMD_FOUND}) - configure_file("${CMAKE_CURRENT_SOURCE_DIR}/ayatana-indicator-application.service.in" "${CMAKE_CURRENT_BINARY_DIR}/ayatana-indicator-application.service" @ONLY) - install(FILES "${CMAKE_CURRENT_BINARY_DIR}/ayatana-indicator-application.service" DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}/systemd/user") + + # where to install + pkg_get_variable(SYSTEMD_USER_DIR systemd systemduserunitdir) + message (STATUS "${SYSTEMD_USER_DIR} is the systemd user unit file install dir") + + set (SYSTEMD_USER_NAME "${CMAKE_PROJECT_NAME}.service") + set (SYSTEMD_USER_FILE "${CMAKE_CURRENT_BINARY_DIR}/${SYSTEMD_USER_NAME}") + set (SYSTEMD_USER_FILE_IN "${CMAKE_CURRENT_SOURCE_DIR}/${SYSTEMD_USER_NAME}.in") + + # build it + set (pkglibexecdir "${CMAKE_INSTALL_FULL_PKGLIBEXECDIR}") + configure_file ("${SYSTEMD_USER_FILE_IN}" "${SYSTEMD_USER_FILE}") + + # install it + install (FILES "${SYSTEMD_USER_FILE}" + DESTINATION "${SYSTEMD_USER_DIR}") endif() -# ayatana-indicator-application.desktop +########################### +# XDG Autostart +########################### configure_file("${CMAKE_CURRENT_SOURCE_DIR}/ayatana-indicator-application.desktop.in" "${CMAKE_CURRENT_BINARY_DIR}/ayatana-indicator-application.desktop" @ONLY) install(FILES "${CMAKE_CURRENT_BINARY_DIR}/ayatana-indicator-application.desktop" DESTINATION "/etc/xdg/autostart") +########################### # ordering-override.keyfile +########################### install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/ordering-override.keyfile" DESTINATION "${CMAKE_INSTALL_FULL_DATADIR}/ayatana-indicator-application") - - -- cgit v1.2.3