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
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
|
From e98257274aedadd74e178734d9dac5773f370e32 Mon Sep 17 00:00:00 2001
From: Punit Agrawal <punit1.agrawal@toshiba.co.jp>
Date: Mon, 12 Apr 2021 15:01:04 +0900
Subject: [PATCH 5/9] Update library install location
By default XRT installs libraries to locations that don't take
multi-arch into account. In some situations, the install location is
prefixed with "xrt".
Make the library install path multiarch aware by using the cmake
variable CMAKE_INSTALL_LIBDIR for all the libraries.
---
src/CMake/embedded_system.cmake | 2 +-
src/CMake/nativeLnx.cmake | 4 ++--
src/xma/src/xmaapi/CMakeLists.txt | 6 +++---
src/xma/src/xmaplugin/CMakeLists.txt | 6 +++---
4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/CMake/embedded_system.cmake b/src/CMake/embedded_system.cmake
index 729e6d20a..0677344c3 100644
--- a/src/CMake/embedded_system.cmake
+++ b/src/CMake/embedded_system.cmake
@@ -82,7 +82,7 @@ set (XRT_INSTALL_DIR "/usr")
set (XRT_INSTALL_BIN_DIR "${XRT_INSTALL_DIR}/bin")
set (XRT_INSTALL_UNWRAPPED_DIR "${XRT_INSTALL_BIN_DIR}/unwrapped")
set (XRT_INSTALL_INCLUDE_DIR "${XRT_INSTALL_DIR}/include/xrt")
-set (XRT_INSTALL_LIB_DIR "${XRT_INSTALL_DIR}/lib${LIB_SUFFIX}")
+set (XRT_INSTALL_LIB_DIR "${XRT_INSTALL_DIR}/${CMAKE_INSTALL_LIBDIR}")
#Setting RPATH variable for cross compilation
if (DEFINED CROSS_COMPILE)
diff --git a/src/CMake/nativeLnx.cmake b/src/CMake/nativeLnx.cmake
index 51a2266cd..36bb947a8 100644
--- a/src/CMake/nativeLnx.cmake
+++ b/src/CMake/nativeLnx.cmake
@@ -119,7 +119,7 @@ set (XRT_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}")
set (XRT_INSTALL_BIN_DIR "${XRT_INSTALL_DIR}/bin")
set (XRT_INSTALL_UNWRAPPED_DIR "${XRT_INSTALL_BIN_DIR}/unwrapped")
set (XRT_INSTALL_INCLUDE_DIR "${XRT_INSTALL_DIR}/include/xrt")
-set (XRT_INSTALL_LIB_DIR "${XRT_INSTALL_DIR}/lib${LIB_SUFFIX}")
+set (XRT_INSTALL_LIB_DIR "${XRT_INSTALL_DIR}/${CMAKE_INSTALL_LIBDIR}")
set (XRT_INSTALL_PYTHON_DIR "${XRT_INSTALL_DIR}/python")
set (XRT_VALIDATE_DIR "${XRT_INSTALL_DIR}/test")
set (XRT_NAMELINK_ONLY NAMELINK_ONLY)
@@ -159,7 +159,7 @@ add_subdirectory(runtime_src)
#XMA settings START
set(XMA_SRC_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
-set(XMA_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/xrt")
+set(XMA_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}")
set(XMA_VERSION_STRING ${XRT_VERSION_MAJOR}.${XRT_VERSION_MINOR}.${XRT_VERSION_PATCH})
set(XMA_SOVERSION ${XRT_SOVERSION})
add_subdirectory(xma)
diff --git a/src/xma/src/xmaapi/CMakeLists.txt b/src/xma/src/xmaapi/CMakeLists.txt
index 9a8f431d0..fb50a2304 100644
--- a/src/xma/src/xmaapi/CMakeLists.txt
+++ b/src/xma/src/xmaapi/CMakeLists.txt
@@ -29,11 +29,11 @@ target_link_libraries(xma2api
)
install(TARGETS xma2api
- LIBRARY DESTINATION ${XMA_INSTALL_DIR}/lib ${XRT_NAMELINK_SKIP}
+ LIBRARY DESTINATION ${XMA_INSTALL_DIR}/${CMAKE_INSTALL_LIBDIR} ${XRT_NAMELINK_SKIP}
RUNTIME DESTINATION ${XMA_INSTALL_DIR}/bin
)
install(TARGETS xma2api
- ARCHIVE DESTINATION ${XMA_INSTALL_DIR}/lib COMPONENT ${XRT_DEV_COMPONENT}
- LIBRARY DESTINATION ${XMA_INSTALL_DIR}/lib COMPONENT ${XRT_DEV_COMPONENT} ${XRT_NAMELINK_ONLY}
+ ARCHIVE DESTINATION ${XMA_INSTALL_DIR}/${CMAKE_INSTALL_LIBDIR} COMPONENT ${XRT_DEV_COMPONENT}
+ LIBRARY DESTINATION ${XMA_INSTALL_DIR}/${CMAKE_INSTALL_LIBDIR} COMPONENT ${XRT_DEV_COMPONENT} ${XRT_NAMELINK_ONLY}
)
diff --git a/src/xma/src/xmaplugin/CMakeLists.txt b/src/xma/src/xmaplugin/CMakeLists.txt
index 51bf8ed2e..d2aeaa851 100644
--- a/src/xma/src/xmaplugin/CMakeLists.txt
+++ b/src/xma/src/xmaplugin/CMakeLists.txt
@@ -17,11 +17,11 @@ set_target_properties(xma2plugin PROPERTIES VERSION ${XMA_VERSION_STRING}
SOVERSION ${XMA_SOVERSION})
install(TARGETS xma2plugin
- LIBRARY DESTINATION ${XMA_INSTALL_DIR}/lib ${XRT_NAMELINK_SKIP}
+ LIBRARY DESTINATION ${XMA_INSTALL_DIR}/${CMAKE_INSTALL_LIBDIR} ${XRT_NAMELINK_SKIP}
RUNTIME DESTINATION ${XMA_INSTALL_DIR}/bin
)
install(TARGETS xma2plugin
- ARCHIVE DESTINATION ${XMA_INSTALL_DIR}/lib COMPONENT ${XRT_DEV_COMPONENT}
- LIBRARY DESTINATION ${XMA_INSTALL_DIR}/lib COMPONENT ${XRT_DEV_COMPONENT} ${XRT_NAMELINK_ONLY}
+ ARCHIVE DESTINATION ${XMA_INSTALL_DIR}/${CMAKE_INSTALL_LIBDIR} COMPONENT ${XRT_DEV_COMPONENT}
+ LIBRARY DESTINATION ${XMA_INSTALL_DIR}/${CMAKE_INSTALL_LIBDIR} COMPONENT ${XRT_DEV_COMPONENT} ${XRT_NAMELINK_ONLY}
)
--
2.36.1
|
