Commit b2acf68
committed
[CMake] Set
When using the `rpath=ON` option, the global CMake variable
`CMAKE_INSTALL_RPATH` is mutated, which is problematic in several corner
cases.
This commit suggests to append the rpaths at the target property level,
and also set the rpaths for the build tree separately so they make
sense.
A new ROOT macro is introduced for this rpath setting, which are also
used for the PyROOT libraries, which also need custom rpaths.
Closes #19327 and #19134.rpath for individual targets and not globally1 parent 63a25f7 commit b2acf68
File tree
4 files changed
+37
-52
lines changed- bindings/pyroot
- cppyy/CPyCppyy
- pythonizations
- cmake/modules
4 files changed
+37
-52
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
112 | 112 | | |
113 | 113 | | |
114 | 114 | | |
| 115 | + | |
| 116 | + | |
| 117 | + | |
115 | 118 | | |
116 | 119 | | |
117 | | - | |
118 | | - | |
119 | | - | |
120 | | - | |
121 | | - | |
122 | | - | |
123 | | - | |
124 | | - | |
125 | | - | |
126 | | - | |
127 | | - | |
128 | | - | |
129 | | - | |
130 | | - | |
131 | | - | |
132 | | - | |
| 120 | + | |
133 | 121 | | |
134 | 122 | | |
135 | | - | |
136 | | - | |
137 | | - | |
138 | 123 | | |
139 | 124 | | |
140 | 125 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
227 | 227 | | |
228 | 228 | | |
229 | 229 | | |
230 | | - | |
231 | | - | |
232 | | - | |
233 | | - | |
234 | | - | |
235 | | - | |
236 | | - | |
237 | | - | |
238 | | - | |
239 | | - | |
240 | | - | |
241 | | - | |
242 | | - | |
243 | | - | |
244 | | - | |
245 | | - | |
| 230 | + | |
246 | 231 | | |
247 | 232 | | |
248 | 233 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
423 | 423 | | |
424 | 424 | | |
425 | 425 | | |
426 | | - | |
427 | | - | |
428 | | - | |
429 | | - | |
430 | | - | |
431 | | - | |
432 | | - | |
433 | | - | |
434 | | - | |
435 | | - | |
436 | | - | |
437 | | - | |
438 | | - | |
439 | | - | |
440 | | - | |
441 | | - | |
442 | | - | |
443 | 426 | | |
444 | 427 | | |
445 | 428 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
975 | 975 | | |
976 | 976 | | |
977 | 977 | | |
| 978 | + | |
| 979 | + | |
| 980 | + | |
978 | 981 | | |
979 | 982 | | |
980 | 983 | | |
| |||
1437 | 1440 | | |
1438 | 1441 | | |
1439 | 1442 | | |
| 1443 | + | |
| 1444 | + | |
| 1445 | + | |
1440 | 1446 | | |
1441 | 1447 | | |
1442 | 1448 | | |
| |||
2073 | 2079 | | |
2074 | 2080 | | |
2075 | 2081 | | |
| 2082 | + | |
| 2083 | + | |
| 2084 | + | |
| 2085 | + | |
| 2086 | + | |
| 2087 | + | |
| 2088 | + | |
| 2089 | + | |
| 2090 | + | |
| 2091 | + | |
| 2092 | + | |
| 2093 | + | |
| 2094 | + | |
| 2095 | + | |
| 2096 | + | |
| 2097 | + | |
| 2098 | + | |
| 2099 | + | |
| 2100 | + | |
| 2101 | + | |
| 2102 | + | |
| 2103 | + | |
| 2104 | + | |
| 2105 | + | |
| 2106 | + | |
| 2107 | + | |
2076 | 2108 | | |
2077 | 2109 | | |
2078 | 2110 | | |
| |||
0 commit comments