aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2022-02-16 11:16:51 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2022-02-16 11:16:51 +0100
commit26000403c33875ec4152cff78b958ef9736040dd (patch)
tree986592febff8c6bd8c5dd58ae811505a3cb631f7
parentf57b15b8be5f9062fd57f420ad88446956aa9e82 (diff)
parentbab7087b15336e5635289bcd5a47709693a21c4c (diff)
downloadayatana-indicator-display-26000403c33875ec4152cff78b958ef9736040dd.tar.gz
ayatana-indicator-display-26000403c33875ec4152cff78b958ef9736040dd.tar.bz2
ayatana-indicator-display-26000403c33875ec4152cff78b958ef9736040dd.zip
Merge branch 'tari01-pr/drop-cmake-install-full-pkglibexecdir'
Attributes GH PR #49: https://github.com/AyatanaIndicators/ayatana-indicator-display/pull/49
-rw-r--r--.travis.yml2
-rw-r--r--CMakeLists.txt3
-rw-r--r--data/CMakeLists.txt1
-rw-r--r--data/ayatana-indicator-display.conf.in2
-rw-r--r--data/ayatana-indicator-display.service.in2
-rw-r--r--src/CMakeLists.txt2
6 files changed, 4 insertions, 8 deletions
diff --git a/.travis.yml b/.travis.yml
index 9556732..73bc55b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,5 @@
# vim: set ts=2 sts=2 sw=2 expandtab :
-dist: bionic
+dist: focal
language: shell
os: linux
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 63b4d29..c073735 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -38,9 +38,6 @@ elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
add_definitions("-Wall")
endif()
-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 cd052b6..17ddf23 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -32,7 +32,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
diff --git a/data/ayatana-indicator-display.conf.in b/data/ayatana-indicator-display.conf.in
index 1231b5e..0254a34 100644
--- a/data/ayatana-indicator-display.conf.in
+++ b/data/ayatana-indicator-display.conf.in
@@ -6,4 +6,4 @@ stop on desktop-end or ayatana-indicator-services-end
respawn
respawn limit 2 10
-exec @pkglibexecdir@/ayatana-indicator-display-service
+exec @CMAKE_INSTALL_FULL_LIBEXECDIR@/ayatana-indicator-display/ayatana-indicator-display-service
diff --git a/data/ayatana-indicator-display.service.in b/data/ayatana-indicator-display.service.in
index cdfc1e0..4ae5d2b 100644
--- a/data/ayatana-indicator-display.service.in
+++ b/data/ayatana-indicator-display.service.in
@@ -4,7 +4,7 @@ PartOf=graphical-session.target
PartOf=ayatana-indicators.target
[Service]
-ExecStart=@pkglibexecdir@/ayatana-indicator-display-service
+ExecStart=@CMAKE_INSTALL_FULL_LIBEXECDIR@/ayatana-indicator-display/ayatana-indicator-display-service
Restart=on-failure
[Install]
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 57bdc4b..b7e91aa 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -31,5 +31,5 @@ target_link_libraries(${SERVICE_EXEC}
install(
TARGETS
${SERVICE_EXEC}
- RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_PKGLIBEXECDIR}
+ RUNTIME DESTINATION "${CMAKE_INSTALL_FULL_LIBEXECDIR}/${CMAKE_PROJECT_NAME}"
)