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
|
From e85849e71d76917ed637746ea8583fb356144682 Mon Sep 17 00:00:00 2001
From: Punit Agrawal <punit1.agrawal@toshiba.co.jp>
Date: Thu, 8 Apr 2021 15:26:21 +0900
Subject: [PATCH 4/9] Install pkgconfig files in multiarch aware location
---
src/CMake/embedded_system.cmake | 2 +-
src/CMake/pkgconfig.cmake | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/CMake/embedded_system.cmake b/src/CMake/embedded_system.cmake
index 44b8a2245..729e6d20a 100644
--- a/src/CMake/embedded_system.cmake
+++ b/src/CMake/embedded_system.cmake
@@ -105,7 +105,7 @@ add_subdirectory(runtime_src)
message("-- XRT version: ${XRT_VERSION_STRING}")
message("-- Preparing XRT pkg-config")
-set(XRT_PKG_CONFIG_DIR "/usr/lib/pkgconfig")
+set(XRT_PKG_CONFIG_DIR ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/pkgconfig)
configure_file (
${CMAKE_SOURCE_DIR}/CMake/config/xrt.pc.in
diff --git a/src/CMake/pkgconfig.cmake b/src/CMake/pkgconfig.cmake
index 53000c333..627b7c728 100644
--- a/src/CMake/pkgconfig.cmake
+++ b/src/CMake/pkgconfig.cmake
@@ -3,8 +3,8 @@
#
message("-- Preparing XRT pkg-config")
-if (${LINUX_FLAVOR} MATCHES "^(Ubuntu)")
- set(XRT_PKG_CONFIG_DIR "/usr/lib/pkgconfig")
+if (${LINUX_FLAVOR} MATCHES "^(Debian|Ubuntu)")
+ set(XRT_PKG_CONFIG_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/pkgconfig")
elseif (${LINUX_FLAVOR} MATCHES "^(RedHat|CentOS|Amazon|Fedora|SUSE)")
set(XRT_PKG_CONFIG_DIR "/usr/lib64/pkgconfig")
else ()
--
2.36.1
|
