diff options
| author | Robert Tari <robert@tari.in> | 2022-02-15 15:55:32 +0100 |
|---|---|---|
| committer | Robert Tari <robert@tari.in> | 2022-02-15 15:55:32 +0100 |
| commit | db513536f9451fbeb1b70f81743b53022f2b0ab4 (patch) | |
| tree | 31aeae24e4509ef6774476a47eccd818b707d92c | |
| parent | 135696428d71de5be305fe331abc93f44d2c095c (diff) | |
| download | ayatana-indicator-notifications-db513536f9451fbeb1b70f81743b53022f2b0ab4.tar.gz ayatana-indicator-notifications-db513536f9451fbeb1b70f81743b53022f2b0ab4.tar.bz2 ayatana-indicator-notifications-db513536f9451fbeb1b70f81743b53022f2b0ab4.zip | |
Drop pkglibexecdir and use native CMake file configuration
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | data/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | data/ayatana-indicator-notifications.desktop.in | 2 | ||||
| -rw-r--r-- | data/ayatana-indicator-notifications.service.in | 2 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 2 |
5 files changed, 3 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index d11322d..092f8af 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -32,8 +32,6 @@ endif() ## include (GNUInstallDirs) -set (CMAKE_INSTALL_PKGLIBEXECDIR "${CMAKE_INSTALL_LIBEXECDIR}/${CMAKE_PROJECT_NAME}") -set (CMAKE_INSTALL_FULL_PKGLIBEXECDIR "${CMAKE_INSTALL_FULL_LIBEXECDIR}/${CMAKE_PROJECT_NAME}") ## ## Gettext diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt index 3fb8430..aa5dddd 100644 --- a/data/CMakeLists.txt +++ b/data/CMakeLists.txt @@ -29,7 +29,6 @@ if (${SYSTEMD_FOUND}) 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 @@ -50,7 +49,6 @@ set (XDG_AUTOSTART_FILE "${CMAKE_CURRENT_BINARY_DIR}/${XDG_AUTOSTART_NAME}") set (XDG_AUTOSTART_FILE_IN "${CMAKE_CURRENT_SOURCE_DIR}/${XDG_AUTOSTART_NAME}.in") # build it -set (pkglibexecdir "${CMAKE_INSTALL_FULL_PKGLIBEXECDIR}") configure_file ("${XDG_AUTOSTART_FILE_IN}" "${XDG_AUTOSTART_FILE}") # install it diff --git a/data/ayatana-indicator-notifications.desktop.in b/data/ayatana-indicator-notifications.desktop.in index 7dac4fd..4a085a7 100644 --- a/data/ayatana-indicator-notifications.desktop.in +++ b/data/ayatana-indicator-notifications.desktop.in @@ -1,7 +1,7 @@ [Desktop Entry] Type=Application Name=Ayatana Indicator Notifications -Exec=@pkglibexecdir@/ayatana-indicator-notifications-service +Exec=@CMAKE_INSTALL_FULL_LIBEXECDIR@/ayatana-indicator-notifications/ayatana-indicator-notifications-service OnlyShowIn=Unity;MATE;XFCE; NoDisplay=true StartupNotify=false diff --git a/data/ayatana-indicator-notifications.service.in b/data/ayatana-indicator-notifications.service.in index 223cea9..f0207ee 100644 --- a/data/ayatana-indicator-notifications.service.in +++ b/data/ayatana-indicator-notifications.service.in @@ -4,7 +4,7 @@ PartOf=graphical-session.target PartOf=ayatana-indicators.target [Service] -ExecStart=@pkglibexecdir@/ayatana-indicator-notifications-service +ExecStart=@CMAKE_INSTALL_FULL_LIBEXECDIR@/ayatana-indicator-notifications/ayatana-indicator-notifications-service Restart=on-failure [Install] diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 5bd56b5..2e6f4ae 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -20,4 +20,4 @@ link_directories(${SERVICE_DEPS_LIBRARY_DIRS}) # the executable: lib + main() add_executable (${SERVICE_EXEC} main.c) target_link_libraries (${SERVICE_EXEC} ${SERVICE_LIB} ${SERVICE_DEPS_LIBRARIES}) -install (TARGETS ${SERVICE_EXEC} RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_PKGLIBEXECDIR}) +install (TARGETS ${SERVICE_EXEC} RUNTIME DESTINATION "${CMAKE_INSTALL_FULL_LIBEXECDIR}/${CMAKE_PROJECT_NAME}") |