Commit e07940e
authored
Simplify detail::xilinx_xrt() to always return compiled prefix (#9511)
When XILINX_XRT is not set, use compile time constant
XRT_INSTALL_PREFIX.
There was a bug in the upstream binaries that used parent_path()*2
relative to sopath, but upstream lib path can contain any number of
components, e.g. lib/x86_64-linux-gnu/libfoo.so so hardwiring
parent_path() * n is not right.
Always used compile time CMAKE_INSTALL_PREFIX for
detail::xilinx_xrt(), for relocatable builds XILINX_XRT should be set,
e.g. do not ever rely on sopath.
Signed-off-by: Soren Soe <2106410+stsoe@users.noreply.github.com>1 parent 933856c commit e07940e
1 file changed
Lines changed: 5 additions & 15 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
31 | 31 | | |
32 | 32 | | |
33 | 33 | | |
34 | | - | |
35 | | - | |
36 | | - | |
37 | | - | |
38 | | - | |
39 | | - | |
40 | | - | |
41 | | - | |
42 | | - | |
43 | | - | |
44 | | - | |
45 | | - | |
46 | | - | |
47 | | - | |
48 | | - | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
49 | 39 | | |
50 | 40 | | |
51 | 41 | | |
| |||
0 commit comments