mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-04-18 15:36:59 +02:00
125 lines
4.1 KiB
Diff
125 lines
4.1 KiB
Diff
From a5117d6b6e2bb7cf3181d2e07021c6dc55069252 Mon Sep 17 00:00:00 2001
|
|
From: Luca Weiss <luca@z3ntu.xyz>
|
|
Date: Wed, 31 Jan 2024 22:29:26 +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 | 6 +++---
|
|
doc/CMakeLists.txt | 2 +-
|
|
include/CMakeLists.txt | 2 +-
|
|
include/biometry/CMakeLists.txt | 2 +-
|
|
include/biometry/hardware/CMakeLists.txt | 2 +-
|
|
src/biometry/CMakeLists.txt | 4 ++--
|
|
src/biometry/qml/Biometryd/CMakeLists.txt | 2 +-
|
|
7 files changed, 10 insertions(+), 10 deletions(-)
|
|
|
|
diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
|
|
index 64d61b5..0b8a542 100644
|
|
--- a/data/CMakeLists.txt
|
|
+++ b/data/CMakeLists.txt
|
|
@@ -7,17 +7,17 @@ configure_file(
|
|
|
|
install(
|
|
FILES ${CMAKE_CURRENT_BINARY_DIR}/biometryd.pc
|
|
- DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
|
|
+ DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/pkgconfig
|
|
)
|
|
|
|
install(
|
|
FILES ${CMAKE_CURRENT_SOURCE_DIR}/com.ubports.biometryd.Service.conf
|
|
- DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/dbus-1/system.d/
|
|
+ DESTINATION ${CMAKE_INSTALL_FULL_SYSCONFDIR}/dbus-1/system.d/
|
|
)
|
|
|
|
install(
|
|
FILES ${CMAKE_CURRENT_BINARY_DIR}/biometryd.conf
|
|
- DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/init
|
|
+ DESTINATION ${CMAKE_INSTALL_FULL_SYSCONFDIR}/init
|
|
)
|
|
|
|
if (USE_SYSTEMD)
|
|
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
|
|
index 94d5928..bd283f2 100644
|
|
--- a/doc/CMakeLists.txt
|
|
+++ b/doc/CMakeLists.txt
|
|
@@ -22,7 +22,7 @@ if (DOXYGEN_FOUND)
|
|
COMMENT "Generating API documentation with Doxygen" VERBATIM)
|
|
install(
|
|
DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html
|
|
- DESTINATION ${CMAKE_INSTALL_DOCDIR})
|
|
+ DESTINATION ${CMAKE_INSTALL_FULL_DOCDIR})
|
|
|
|
endif ()
|
|
endif ()
|
|
diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt
|
|
index 572e4e3..084af7c 100644
|
|
--- a/include/CMakeLists.txt
|
|
+++ b/include/CMakeLists.txt
|
|
@@ -2,5 +2,5 @@ add_subdirectory(biometry)
|
|
|
|
install(
|
|
DIRECTORY biometry
|
|
- DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
|
|
+ DESTINATION ${CMAKE_INSTALL_FULL_INCLUDEDIR}
|
|
)
|
|
diff --git a/include/biometry/CMakeLists.txt b/include/biometry/CMakeLists.txt
|
|
index ad66907..d9de0bc 100644
|
|
--- a/include/biometry/CMakeLists.txt
|
|
+++ b/include/biometry/CMakeLists.txt
|
|
@@ -2,7 +2,7 @@ configure_file(version.h.in version.h)
|
|
|
|
install(
|
|
FILES ${CMAKE_CURRENT_BINARY_DIR}/version.h
|
|
- DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/biometry
|
|
+ DESTINATION ${CMAKE_INSTALL_FULL_INCLUDEDIR}/biometry
|
|
)
|
|
|
|
add_subdirectory(hardware)
|
|
\ No newline at end of file
|
|
diff --git a/include/biometry/hardware/CMakeLists.txt b/include/biometry/hardware/CMakeLists.txt
|
|
index a0236b8..98179dd 100644
|
|
--- a/include/biometry/hardware/CMakeLists.txt
|
|
+++ b/include/biometry/hardware/CMakeLists.txt
|
|
@@ -5,5 +5,5 @@ set(
|
|
|
|
install(
|
|
FILES ${BIOMETRY_HARDWARE_HEADERS}
|
|
- DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/biometry/hardware
|
|
+ DESTINATION ${CMAKE_INSTALL_FULL_INCLUDEDIR}/biometry/hardware
|
|
)
|
|
diff --git a/src/biometry/CMakeLists.txt b/src/biometry/CMakeLists.txt
|
|
index e36fbb1..3ad7f94 100644
|
|
--- a/src/biometry/CMakeLists.txt
|
|
+++ b/src/biometry/CMakeLists.txt
|
|
@@ -174,10 +174,10 @@ target_link_libraries(
|
|
|
|
install(
|
|
TARGETS biometry
|
|
- LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
|
+ LIBRARY DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}
|
|
)
|
|
|
|
install(
|
|
TARGETS biometryd
|
|
- RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
|
|
+ RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_BINDIR}
|
|
)
|
|
diff --git a/src/biometry/qml/Biometryd/CMakeLists.txt b/src/biometry/qml/Biometryd/CMakeLists.txt
|
|
index 1ac216c..7a1cc5b 100644
|
|
--- a/src/biometry/qml/Biometryd/CMakeLists.txt
|
|
+++ b/src/biometry/qml/Biometryd/CMakeLists.txt
|
|
@@ -43,7 +43,7 @@ target_link_libraries(biometryd-qml biometry Qt5::Core Qt5::Qml Qt5::Quick)
|
|
# can test the module within the build env.
|
|
configure_file(qmldir qmldir COPYONLY)
|
|
|
|
-set(PLUGIN_DIR ${CMAKE_INSTALL_LIBDIR}/qt5/qml/Biometryd)
|
|
+set(PLUGIN_DIR ${CMAKE_INSTALL_FULL_LIBDIR}/qt5/qml/Biometryd)
|
|
|
|
install(
|
|
TARGETS biometryd-qml
|
|
--
|
|
2.43.0
|
|
|