Package: poco / 1.10.0-6+deb11u1

0013-Install-cmake-files-into-multiarch-dirs.patch Patch series | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
From: Jochen Sprickerhof <git@jochen.sprickerhof.de>
Date: Sun, 28 Nov 2021 08:16:05 +0100
Subject: Install cmake files into multiarch dirs

---
 CMakeLists.txt         | 3 ++-
 cmake/PocoMacros.cmake | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e9d144e..2c4b716 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -438,12 +438,13 @@ write_basic_package_version_file(
 )
 
 configure_file(cmake/${PROJECT_NAME}Config.cmake.in "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}Config.cmake" @ONLY)
+include(GNUInstallDirs)
 install(
     FILES
         ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}Config.cmake
         ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}ConfigVersion.cmake
     DESTINATION
-        "lib${LIB_SUFFIX}/cmake/${PROJECT_NAME}"
+        "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}"
     COMPONENT
         Devel
 )
diff --git a/cmake/PocoMacros.cmake b/cmake/PocoMacros.cmake
index 652fc7d..7070f9c 100644
--- a/cmake/PocoMacros.cmake
+++ b/cmake/PocoMacros.cmake
@@ -235,18 +235,19 @@ configure_file("cmake/Poco${target_name}Config.cmake"
 
 set(ConfigPackageLocation "lib/cmake/${PROJECT_NAME}")
 
+include(GNUInstallDirs)
 install(
     EXPORT "${target_name}Targets"
     FILE "${PROJECT_NAME}${target_name}Targets.cmake"
     NAMESPACE "${PROJECT_NAME}::"
-    DESTINATION "lib${LIB_SUFFIX}/cmake/${PROJECT_NAME}"
+    DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}"
     )
 
 install(
     FILES
         "${CMAKE_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}${target_name}Config.cmake"
         "${CMAKE_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}${target_name}ConfigVersion.cmake"
-    DESTINATION "lib${LIB_SUFFIX}/cmake/${PROJECT_NAME}"
+    DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}"
     COMPONENT Devel
     )
 
@@ -268,7 +269,6 @@ install(
     PATTERN ".svn" EXCLUDE
     )
 
-include(GNUInstallDirs)
 install(
     TARGETS "${target_name}" EXPORT "${target_name}Targets"
     LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"