Skip to content

Commit 94841f4

Browse files
stsoestsoe
authored
Fix XDP plugin release directory to specify RUNTIME for windows (#9244)
The CMake install command for XDP plugins must specify a LIBRARY component for Linux *and* and RUNTIME component for Windows. It should look like this: ``` install (TARGETS ...plugin... RUNTIME DESTINATION ${XDP_PLUGIN_INSTALL_DIR} COMPONENT ${XRT_COMPONENT} LIBRARY DESTINATION ${XDP_PLUGIN_INSTALL_DIR} COMPONENT ${XRT_COMPONENT} ${XRT_NAMELINK_SKIP} ) ``` Signed-off-by: Soren Soe <2106410+stsoe@users.noreply.github.com>
1 parent 51ac67e commit 94841f4

25 files changed

Lines changed: 89 additions & 38 deletions

File tree

‎src/runtime_src/core/include/xrt/detail/abi.h‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@
44
#ifndef XRT_DETAIL_ABI_H
55
#define XRT_DETAIL_ABI_H
66

7-
#include "xrt/detail/version-slim.h"
7+
#if !defined(DISABLE_ABI_CHECK)
8+
# include "xrt/detail/version-slim.h"
9+
#endif
810

911
#ifdef __cplusplus
1012

@@ -20,9 +22,15 @@ namespace xrt { namespace detail {
2022
// The struct is used to guarantee schema compability between old
2123
// version of XRT and new version.
2224
struct abi {
25+
#ifndef DISABLE_ABI_CHECK
2326
const unsigned int major {XRT_MAJOR(XRT_VERSION_CODE)};
2427
const unsigned int minor {XRT_MINOR(XRT_VERSION_CODE)};
2528
const unsigned int code {XRT_VERSION_CODE};
29+
#else
30+
const unsigned int major {0};
31+
const unsigned int minor {0};
32+
const unsigned int code {0};
33+
#endif
2634
};
2735

2836
}} // detail, xrt

‎src/runtime_src/xdp/appdebug/CMakeLists.txt‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,9 @@ target_link_libraries(xdp_appdebug_plugin PRIVATE xrt_coreutil xilinxopencl)
3333
set_target_properties(xdp_appdebug_plugin PROPERTIES VERSION ${XRT_VERSION_STRING} SOVERSION ${XRT_SOVERSION})
3434

3535
install (TARGETS xdp_appdebug_plugin
36-
LIBRARY DESTINATION ${XDP_PLUGIN_INSTALL_DIR} NAMELINK_SKIP)
36+
RUNTIME DESTINATION ${XDP_PLUGIN_INSTALL_DIR} COMPONENT ${XRT_COMPONENT}
37+
LIBRARY DESTINATION ${XDP_PLUGIN_INSTALL_DIR} COMPONENT ${XRT_COMPONENT} ${XRT_NAMELINK_SKIP}
38+
)
3739

3840
# We also need to copy the python scripts that contain the gdb connection.
3941
# Only install these files for PCIe device for now, which is native build

‎src/runtime_src/xdp/debug/CMakeLists.txt‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,9 @@ target_link_libraries(xdp_debug_plugin PRIVATE xrt_coreutil xilinxopencl)
2828

2929
set_target_properties(xdp_debug_plugin PROPERTIES VERSION ${XRT_VERSION_STRING} SOVERSION ${XRT_SOVERSION})
3030

31-
install (TARGETS xdp_debug_plugin
32-
LIBRARY DESTINATION ${XDP_PLUGIN_INSTALL_DIR} NAMELINK_SKIP)
31+
install (TARGETS xdp_debug_plugin
32+
RUNTIME DESTINATION ${XDP_PLUGIN_INSTALL_DIR} COMPONENT ${XRT_COMPONENT}
33+
LIBRARY DESTINATION ${XDP_PLUGIN_INSTALL_DIR} COMPONENT ${XRT_COMPONENT} ${XRT_NAMELINK_SKIP}
34+
)
3335

3436
endif()

‎src/runtime_src/xdp/profile/plugin/aie_debug/CMakeLists.txt‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@ if (XDP_VE2_BUILD_CMAKE STREQUAL "yes")
3939
target_include_directories(xdp_aie_debug_plugin PRIVATE ${CMAKE_SOURCE_DIR}/src)
4040

4141
install (TARGETS xdp_aie_debug_plugin
42-
LIBRARY DESTINATION ${XDP_PLUGIN_INSTALL_DIR} NAMELINK_SKIP
42+
RUNTIME DESTINATION ${XDP_PLUGIN_INSTALL_DIR} COMPONENT ${XRT_COMPONENT}
43+
LIBRARY DESTINATION ${XDP_PLUGIN_INSTALL_DIR} COMPONENT ${XRT_COMPONENT} ${XRT_NAMELINK_SKIP}
4344
)
4445

4546
elseif (XDP_CLIENT_BUILD_CMAKE STREQUAL "yes")
@@ -51,7 +52,8 @@ elseif (XDP_CLIENT_BUILD_CMAKE STREQUAL "yes")
5152
set_target_properties(xdp_aie_debug_plugin PROPERTIES VERSION ${XRT_VERSION_STRING} SOVERSION ${XRT_SOVERSION})
5253

5354
install (TARGETS xdp_aie_debug_plugin
54-
LIBRARY DESTINATION ${XDP_PLUGIN_INSTALL_DIR} COMPONENT ${XRT_COMPONENT} NAMELINK_SKIP
55+
RUNTIME DESTINATION ${XDP_PLUGIN_INSTALL_DIR} COMPONENT ${XRT_COMPONENT}
56+
LIBRARY DESTINATION ${XDP_PLUGIN_INSTALL_DIR} COMPONENT ${XRT_COMPONENT} ${XRT_NAMELINK_SKIP}
5557
)
5658

5759
elseif (DEFINED XRT_AIE_BUILD AND XRT_EDGE)
@@ -62,7 +64,8 @@ elseif (DEFINED XRT_AIE_BUILD AND XRT_EDGE)
6264
set_target_properties(xdp_aie_debug_plugin PROPERTIES VERSION ${XRT_VERSION_STRING} SOVERSION ${XRT_SOVERSION})
6365

6466
install (TARGETS xdp_aie_debug_plugin
65-
LIBRARY DESTINATION ${XDP_PLUGIN_INSTALL_DIR} NAMELINK_SKIP
67+
RUNTIME DESTINATION ${XDP_PLUGIN_INSTALL_DIR} COMPONENT ${XRT_COMPONENT}
68+
LIBRARY DESTINATION ${XDP_PLUGIN_INSTALL_DIR} COMPONENT ${XRT_COMPONENT} ${XRT_NAMELINK_SKIP}
6669
)
6770

6871
# Else, on edge-aarch64 don't build at all

‎src/runtime_src/xdp/profile/plugin/aie_halt/CMakeLists.txt‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@ if (XDP_CLIENT_BUILD_CMAKE STREQUAL "yes")
3636
set_target_properties(xdp_aie_halt_plugin PROPERTIES VERSION ${XRT_VERSION_STRING} SOVERSION ${XRT_SOVERSION})
3737

3838
install (TARGETS xdp_aie_halt_plugin
39-
LIBRARY DESTINATION ${XDP_PLUGIN_INSTALL_DIR} COMPONENT ${XRT_COMPONENT} NAMELINK_SKIP
39+
RUNTIME DESTINATION ${XDP_PLUGIN_INSTALL_DIR} COMPONENT ${XRT_COMPONENT}
40+
LIBRARY DESTINATION ${XDP_PLUGIN_INSTALL_DIR} COMPONENT ${XRT_COMPONENT} ${XRT_NAMELINK_SKIP}
4041
)
4142

4243
elseif (XDP_VE2_BUILD_CMAKE STREQUAL "yes")
@@ -51,7 +52,8 @@ elseif (XDP_VE2_BUILD_CMAKE STREQUAL "yes")
5152
set_target_properties(xdp_aie_halt_plugin PROPERTIES VERSION ${XRT_VERSION_STRING} SOVERSION ${XRT_SOVERSION})
5253

5354
install (TARGETS xdp_aie_halt_plugin
54-
LIBRARY DESTINATION ${XDP_PLUGIN_INSTALL_DIR} COMPONENT ${XRT_COMPONENT} NAMELINK_SKIP
55+
RUNTIME DESTINATION ${XDP_PLUGIN_INSTALL_DIR} COMPONENT ${XRT_COMPONENT}
56+
LIBRARY DESTINATION ${XDP_PLUGIN_INSTALL_DIR} COMPONENT ${XRT_COMPONENT} ${XRT_NAMELINK_SKIP}
5557
)
5658

5759
# Else, on edge-aarch64 don't build at all

‎src/runtime_src/xdp/profile/plugin/aie_pc/CMakeLists.txt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,8 @@ if (XDP_CLIENT_BUILD_CMAKE STREQUAL "yes")
3434
set_target_properties(xdp_aie_pc_plugin PROPERTIES VERSION ${XRT_VERSION_STRING} SOVERSION ${XRT_SOVERSION})
3535

3636
install (TARGETS xdp_aie_pc_plugin
37-
LIBRARY DESTINATION ${XDP_PLUGIN_INSTALL_DIR} COMPONENT ${XRT_COMPONENT} NAMELINK_SKIP
37+
RUNTIME DESTINATION ${XDP_PLUGIN_INSTALL_DIR} COMPONENT ${XRT_COMPONENT}
38+
LIBRARY DESTINATION ${XDP_PLUGIN_INSTALL_DIR} COMPONENT ${XRT_COMPONENT} ${XRT_NAMELINK_SKIP}
3839
)
3940

4041
# Else, on edge-aarch64 don't build at all

‎src/runtime_src/xdp/profile/plugin/aie_profile/CMakeLists.txt‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,8 @@ if (XDP_CLIENT_BUILD_CMAKE STREQUAL "yes")
4343
set_target_properties(xdp_aie_profile_plugin PROPERTIES VERSION ${XRT_VERSION_STRING} SOVERSION ${XRT_SOVERSION})
4444

4545
install (TARGETS xdp_aie_profile_plugin
46-
LIBRARY DESTINATION ${XDP_PLUGIN_INSTALL_DIR} COMPONENT ${XRT_COMPONENT} NAMELINK_SKIP
46+
RUNTIME DESTINATION ${XDP_PLUGIN_INSTALL_DIR} COMPONENT ${XRT_COMPONENT}
47+
LIBRARY DESTINATION ${XDP_PLUGIN_INSTALL_DIR} COMPONENT ${XRT_COMPONENT} ${XRT_NAMELINK_SKIP}
4748
)
4849

4950
elseif (DEFINED XRT_AIE_BUILD AND (NOT XRT_EDGE))
@@ -61,7 +62,8 @@ elseif (DEFINED XRT_AIE_BUILD AND (NOT XRT_EDGE))
6162
set_target_properties(xdp_aie_profile_plugin PROPERTIES VERSION ${XRT_VERSION_STRING} SOVERSION ${XRT_SOVERSION})
6263

6364
install (TARGETS xdp_aie_profile_plugin
64-
LIBRARY DESTINATION ${XDP_PLUGIN_INSTALL_DIR} COMPONENT ${XRT_COMPONENT} NAMELINK_SKIP
65+
RUNTIME DESTINATION ${XDP_PLUGIN_INSTALL_DIR} COMPONENT ${XRT_COMPONENT}
66+
LIBRARY DESTINATION ${XDP_PLUGIN_INSTALL_DIR} COMPONENT ${XRT_COMPONENT} ${XRT_NAMELINK_SKIP}
6567
)
6668

6769
else()
@@ -81,7 +83,8 @@ else()
8183
set_target_properties(xdp_aie_profile_plugin_xdna PROPERTIES VERSION ${XRT_VERSION_STRING} SOVERSION ${XRT_SOVERSION})
8284

8385
install (TARGETS xdp_aie_profile_plugin_xdna
84-
LIBRARY DESTINATION ${XDP_PLUGIN_INSTALL_DIR} COMPONENT ${XRT_COMPONENT} NAMELINK_SKIP
86+
RUNTIME DESTINATION ${XDP_PLUGIN_INSTALL_DIR} COMPONENT ${XRT_COMPONENT}
87+
LIBRARY DESTINATION ${XDP_PLUGIN_INSTALL_DIR} COMPONENT ${XRT_COMPONENT} ${XRT_NAMELINK_SKIP}
8588
)
8689
endif()
8790

@@ -103,7 +106,8 @@ else()
103106
set_target_properties(xdp_aie_profile_plugin PROPERTIES VERSION ${XRT_VERSION_STRING} SOVERSION ${XRT_SOVERSION})
104107

105108
install (TARGETS xdp_aie_profile_plugin
106-
LIBRARY DESTINATION ${XDP_PLUGIN_INSTALL_DIR} COMPONENT ${XRT_COMPONENT} NAMELINK_SKIP
109+
RUNTIME DESTINATION ${XDP_PLUGIN_INSTALL_DIR} COMPONENT ${XRT_COMPONENT}
110+
LIBRARY DESTINATION ${XDP_PLUGIN_INSTALL_DIR} COMPONENT ${XRT_COMPONENT} ${XRT_NAMELINK_SKIP}
107111
)
108112
endif()
109113

‎src/runtime_src/xdp/profile/plugin/aie_status/CMakeLists.txt‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@ if (XDP_VE2_BUILD_CMAKE STREQUAL "yes")
2323
set_target_properties(xdp_aie_status_plugin PROPERTIES VERSION ${XRT_VERSION_STRING} SOVERSION ${XRT_SOVERSION})
2424

2525
install (TARGETS xdp_aie_status_plugin
26-
LIBRARY DESTINATION ${XDP_PLUGIN_INSTALL_DIR} COMPONENT ${XRT_COMPONENT} NAMELINK_SKIP
26+
RUNTIME DESTINATION ${XDP_PLUGIN_INSTALL_DIR} COMPONENT ${XRT_COMPONENT}
27+
LIBRARY DESTINATION ${XDP_PLUGIN_INSTALL_DIR} COMPONENT ${XRT_COMPONENT} ${XRT_NAMELINK_SKIP}
2728
)
2829

2930
elseif (DEFINED XRT_AIE_BUILD AND XRT_EDGE)
@@ -35,7 +36,8 @@ elseif (DEFINED XRT_AIE_BUILD AND XRT_EDGE)
3536
set_target_properties(xdp_aie_status_plugin PROPERTIES VERSION ${XRT_VERSION_STRING} SOVERSION ${XRT_SOVERSION})
3637

3738
install (TARGETS xdp_aie_status_plugin
38-
LIBRARY DESTINATION ${XDP_PLUGIN_INSTALL_DIR} COMPONENT ${XRT_COMPONENT} NAMELINK_SKIP
39+
RUNTIME DESTINATION ${XDP_PLUGIN_INSTALL_DIR} COMPONENT ${XRT_COMPONENT}
40+
LIBRARY DESTINATION ${XDP_PLUGIN_INSTALL_DIR} COMPONENT ${XRT_COMPONENT} ${XRT_NAMELINK_SKIP}
3941
)
4042

4143
endif()

‎src/runtime_src/xdp/profile/plugin/aie_trace/CMakeLists.txt‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,8 @@ if (XDP_CLIENT_BUILD_CMAKE STREQUAL "yes")
5252
set_target_properties(xdp_aie_trace_plugin PROPERTIES VERSION ${XRT_VERSION_STRING} SOVERSION ${XRT_SOVERSION})
5353

5454
install (TARGETS xdp_aie_trace_plugin
55-
LIBRARY DESTINATION ${XDP_PLUGIN_INSTALL_DIR} COMPONENT ${XRT_COMPONENT} NAMELINK_SKIP
55+
RUNTIME DESTINATION ${XDP_PLUGIN_INSTALL_DIR} COMPONENT ${XRT_COMPONENT}
56+
LIBRARY DESTINATION ${XDP_PLUGIN_INSTALL_DIR} COMPONENT ${XRT_COMPONENT} ${XRT_NAMELINK_SKIP}
5657
)
5758

5859
elseif (DEFINED XRT_AIE_BUILD AND (NOT XRT_EDGE))
@@ -76,7 +77,8 @@ elseif (DEFINED XRT_AIE_BUILD AND (NOT XRT_EDGE))
7677
set_target_properties(xdp_aie_trace_plugin PROPERTIES VERSION ${XRT_VERSION_STRING} SOVERSION ${XRT_SOVERSION})
7778

7879
install (TARGETS xdp_aie_trace_plugin
79-
LIBRARY DESTINATION ${XDP_PLUGIN_INSTALL_DIR} COMPONENT ${XRT_COMPONENT} NAMELINK_SKIP
80+
RUNTIME DESTINATION ${XDP_PLUGIN_INSTALL_DIR} COMPONENT ${XRT_COMPONENT}
81+
LIBRARY DESTINATION ${XDP_PLUGIN_INSTALL_DIR} COMPONENT ${XRT_COMPONENT} ${XRT_NAMELINK_SKIP}
8082
)
8183

8284
else()
@@ -102,7 +104,8 @@ else()
102104
set_target_properties(xdp_aie_trace_plugin_xdna PROPERTIES VERSION ${XRT_VERSION_STRING} SOVERSION ${XRT_SOVERSION})
103105

104106
install (TARGETS xdp_aie_trace_plugin_xdna
105-
LIBRARY DESTINATION ${XDP_PLUGIN_INSTALL_DIR} COMPONENT ${XRT_COMPONENT} NAMELINK_SKIP
107+
RUNTIME DESTINATION ${XDP_PLUGIN_INSTALL_DIR} COMPONENT ${XRT_COMPONENT}
108+
LIBRARY DESTINATION ${XDP_PLUGIN_INSTALL_DIR} COMPONENT ${XRT_COMPONENT} ${XRT_NAMELINK_SKIP}
106109
)
107110
endif()
108111

@@ -131,7 +134,8 @@ else()
131134
set_target_properties(xdp_aie_trace_plugin PROPERTIES VERSION ${XRT_VERSION_STRING} SOVERSION ${XRT_SOVERSION})
132135

133136
install (TARGETS xdp_aie_trace_plugin
134-
LIBRARY DESTINATION ${XDP_PLUGIN_INSTALL_DIR} COMPONENT ${XRT_COMPONENT} NAMELINK_SKIP
137+
RUNTIME DESTINATION ${XDP_PLUGIN_INSTALL_DIR} COMPONENT ${XRT_COMPONENT}
138+
LIBRARY DESTINATION ${XDP_PLUGIN_INSTALL_DIR} COMPONENT ${XRT_COMPONENT} ${XRT_NAMELINK_SKIP}
135139
)
136140
endif()
137141

‎src/runtime_src/xdp/profile/plugin/device_offload/hal/CMakeLists.txt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,6 @@ target_link_libraries(xdp_hal_device_offload_plugin PRIVATE xdp_core xrt_core xr
2626
set_target_properties(xdp_hal_device_offload_plugin PROPERTIES VERSION ${XRT_VERSION_STRING} SOVERSION ${XRT_SOVERSION})
2727

2828
install (TARGETS xdp_hal_device_offload_plugin
29-
LIBRARY DESTINATION ${XDP_PLUGIN_INSTALL_DIR} COMPONENT ${XRT_COMPONENT} NAMELINK_SKIP
29+
RUNTIME DESTINATION ${XDP_PLUGIN_INSTALL_DIR} COMPONENT ${XRT_COMPONENT}
30+
LIBRARY DESTINATION ${XDP_PLUGIN_INSTALL_DIR} COMPONENT ${XRT_COMPONENT} ${XRT_NAMELINK_SKIP}
3031
)

0 commit comments

Comments
 (0)