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
|
From: Markus Blatt <markus@dr-blatt.de>
Date: Thu, 15 Apr 2021 21:58:56 +0200
Subject: Always install pkg-config files in multiarch library directory.
Even if we do not ship a library, our pkg-config file will include
architecture dependent library paths and libraries that we depend on.
Hence we still need to install into the multiarch library directory.
---
cmake/Modules/OpmProject.cmake | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/cmake/Modules/OpmProject.cmake b/cmake/Modules/OpmProject.cmake
index 41d4c16..b302e6f 100644
--- a/cmake/Modules/OpmProject.cmake
+++ b/cmake/Modules/OpmProject.cmake
@@ -101,14 +101,10 @@ function (opm_cmake_config name)
APPEND "${${name}_CONFIG_VARS}"
)
- # put this in the right system location; if we have binaries then it
- # should go in the arch-specific lib/ directory, otherwise use the
- # common/noarch lib/ directory (these targets come from UseMultiArch)
- if (${name}_TARGET)
- set (_pkg_dir ${CMAKE_INSTALL_LIBDIR})
- else ()
- set (_pkg_dir lib)
- endif ()
+ # Even if we do not ship a library, our pkg-config file will include
+ # architecture dependent library path and libraries that we depend on.
+ # Hence we still need to install into the multiarch library directory.
+ set (_pkg_dir ${CMAKE_INSTALL_LIBDIR})
# If there is a library then the cmake package configuration file is architecture
# dependent and should move to the corresponding multiarch libdir.
|
