diff options
| author | Robert Tari <robert@tari.in> | 2022-01-27 10:18:50 +0100 |
|---|---|---|
| committer | Robert Tari <robert@tari.in> | 2022-01-27 10:18:50 +0100 |
| commit | 8b83c01761217a2cc01d62c0827ed6373b13ae46 (patch) | |
| tree | 444822e73384d0c55572d7f442c8314185a6642e | |
| parent | 91143cbd7aaf6ba6dac7d22948a551bd02bd40c8 (diff) | |
| parent | b70b1859f4874bc1063fa609ec93e4cdee355b47 (diff) | |
| download | ayatana-indicator-application-8b83c01761217a2cc01d62c0827ed6373b13ae46.tar.gz ayatana-indicator-application-8b83c01761217a2cc01d62c0827ed6373b13ae46.tar.bz2 ayatana-indicator-application-8b83c01761217a2cc01d62c0827ed6373b13ae46.zip | |
Merge branch 'sunweaver-pr/fix-systemd-unit-file-location'
Attributes GH PR #19: https://github.com/AyatanaIndicators/ayatana-indicator-application/pull/19
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | data/CMakeLists.txt | 31 |
2 files changed, 27 insertions, 8 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 3d3fb09..6cb7f5c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.13) -project(ayatana-appindicator-application C) +project(ayatana-indicator-application C) if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) SET(CMAKE_INSTALL_PREFIX "/usr" CACHE PATH "..." FORCE) @@ -33,7 +33,7 @@ pkg_check_modules(PROJECT_DEPS REQUIRED glib-2.0>=2.58 ayatana-indicator3-0.4>=0 include(GNUInstallDirs) set(PROJECT_VERSION "0.8.90") -set(PROJECT_NAME "ayatana-appindicator-application") +set(PROJECT_NAME "ayatana-indicator-application") if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") 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") - - |