mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-08-05 13:27:09 +02:00
136 lines
4.1 KiB
Diff
136 lines
4.1 KiB
Diff
From e87aa75b004aef1ce74c6b92290c4c4ed047e8e4 Mon Sep 17 00:00:00 2001
|
|
From: Luca Weiss <luca@z3ntu.xyz>
|
|
Date: Wed, 31 Jan 2024 22:49:40 +0100
|
|
Subject: [PATCH] Use CMAKE_INSTALL_FULL_* for installing
|
|
|
|
While I don't think there should be a difference between the two
|
|
variables for most cases, for SYSCONFDIR we might end up installing into
|
|
/usr/etc/ if we don't use the FULL_SYSCONFDIR variable.
|
|
---
|
|
data/CMakeLists.txt | 8 ++++----
|
|
doc/CMakeLists.txt | 2 +-
|
|
src/libusermetricsinput/CMakeLists.txt | 10 +++++-----
|
|
src/libusermetricsoutput/CMakeLists.txt | 6 +++---
|
|
4 files changed, 13 insertions(+), 13 deletions(-)
|
|
|
|
diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
|
|
index 87db31b..71d812c 100644
|
|
--- a/data/CMakeLists.txt
|
|
+++ b/data/CMakeLists.txt
|
|
@@ -10,7 +10,7 @@ install(
|
|
DIRECTORY
|
|
libusermetrics
|
|
DESTINATION
|
|
- ${CMAKE_INSTALL_DATADIR}
|
|
+ ${CMAKE_INSTALL_FULL_DATADIR}
|
|
)
|
|
|
|
###########################
|
|
@@ -19,7 +19,7 @@ install(
|
|
|
|
set(
|
|
DBUSCONFDIR
|
|
- "${CMAKE_INSTALL_SYSCONFDIR}/dbus-1/system.d"
|
|
+ "${CMAKE_INSTALL_FULL_SYSCONFDIR}/dbus-1/system.d"
|
|
)
|
|
|
|
install(
|
|
@@ -34,7 +34,7 @@ install(
|
|
|
|
set(
|
|
DBUSIFACEDIR
|
|
- "${CMAKE_INSTALL_DATADIR}/dbus-1/interfaces/"
|
|
+ "${CMAKE_INSTALL_FULL_DATADIR}/dbus-1/interfaces/"
|
|
)
|
|
|
|
install(
|
|
@@ -52,7 +52,7 @@ install(
|
|
|
|
set(
|
|
DBUSSERVICEDIR
|
|
- "${CMAKE_INSTALL_DATADIR}/dbus-1/system-services/"
|
|
+ "${CMAKE_INSTALL_FULL_DATADIR}/dbus-1/system-services/"
|
|
)
|
|
|
|
set(USERMETRICS_SERVICE
|
|
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
|
|
index 46941d9..1e4ec27 100644
|
|
--- a/doc/CMakeLists.txt
|
|
+++ b/doc/CMakeLists.txt
|
|
@@ -19,7 +19,7 @@ add_doxygen(
|
|
*::internal*
|
|
*::Priv
|
|
INSTALL
|
|
- ${CMAKE_INSTALL_DATAROOTDIR}/doc/libusermetrics-doc
|
|
+ ${CMAKE_INSTALL_FULL_DATAROOTDIR}/doc/libusermetrics-doc
|
|
XML
|
|
ALL
|
|
)
|
|
diff --git a/src/libusermetricsinput/CMakeLists.txt b/src/libusermetricsinput/CMakeLists.txt
|
|
index 9554117..206ff4a 100644
|
|
--- a/src/libusermetricsinput/CMakeLists.txt
|
|
+++ b/src/libusermetricsinput/CMakeLists.txt
|
|
@@ -84,8 +84,8 @@ set_target_properties(
|
|
|
|
install(
|
|
TARGETS usermetricsinput
|
|
- LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
|
- PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/libusermetrics-${API_VERSION}/libusermetricsinput"
|
|
+ LIBRARY DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}
|
|
+ PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}/libusermetrics-${API_VERSION}/libusermetricsinput"
|
|
)
|
|
|
|
# Package config
|
|
@@ -95,7 +95,7 @@ configure_file("libusermetricsinput.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/${LIBUSE
|
|
|
|
install(
|
|
FILES "${CMAKE_CURRENT_BINARY_DIR}/${LIBUSERMETRICSINPUT_PC}"
|
|
- DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig"
|
|
+ DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}/pkgconfig"
|
|
)
|
|
|
|
##########################
|
|
@@ -115,7 +115,7 @@ set_target_properties(
|
|
|
|
install(
|
|
TARGETS usermetricsinput-bin
|
|
- RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
|
|
+ RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_BINDIR}
|
|
)
|
|
|
|
target_link_libraries(
|
|
@@ -135,7 +135,7 @@ add_executable(
|
|
|
|
install(
|
|
TARGETS usermetricsinput-increment
|
|
- RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
|
|
+ RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_BINDIR}
|
|
)
|
|
|
|
target_link_libraries(
|
|
diff --git a/src/libusermetricsoutput/CMakeLists.txt b/src/libusermetricsoutput/CMakeLists.txt
|
|
index 9cdd56f..775cfa5 100644
|
|
--- a/src/libusermetricsoutput/CMakeLists.txt
|
|
+++ b/src/libusermetricsoutput/CMakeLists.txt
|
|
@@ -76,8 +76,8 @@ set_target_properties(
|
|
|
|
install(
|
|
TARGETS usermetricsoutput
|
|
- LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
|
- PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/libusermetrics-${API_VERSION}/libusermetricsoutput"
|
|
+ LIBRARY DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}
|
|
+ PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}/libusermetrics-${API_VERSION}/libusermetricsoutput"
|
|
)
|
|
|
|
# Package config
|
|
@@ -87,5 +87,5 @@ configure_file("libusermetricsoutput.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/${LIBUS
|
|
|
|
install(
|
|
FILES "${CMAKE_CURRENT_BINARY_DIR}/${LIBUSERMETRICSOUTPUT_PC}"
|
|
- DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig"
|
|
+ DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}/pkgconfig"
|
|
)
|
|
--
|
|
2.43.0
|
|
|