Commit a9da30b
[cxxmodules] Fix absolute paths for v7 headers in modulemap
Our CMake code for making path to headers relative is broken
for the v7 headers (as they don't have the 'CURRENT_SOURCE/inc'
prefix we check for). This caused that we have absolute paths for
those headers in the modulemap we ship with ROOT. As the paths
are only valid on the same system in the specific build folder,
they prevent anyone from successfully building any ROOT module
with this modulemap.
This patch adds the additional check for v7 headers and also
adds a fallback where we always remove the current source dir
from the paths (which is necessary for all the tests which
don't follow any directory structure).
Also adds a sanity check that should prevent this error in the
future by checking that paths are not absolute before we write
them to the modulemap.1 parent bea06e8 commit a9da30b
1 file changed
+18
-0
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
262 | 262 | | |
263 | 263 | | |
264 | 264 | | |
| 265 | + | |
| 266 | + | |
265 | 267 | | |
266 | 268 | | |
267 | 269 | | |
| |||
273 | 275 | | |
274 | 276 | | |
275 | 277 | | |
| 278 | + | |
| 279 | + | |
| 280 | + | |
| 281 | + | |
| 282 | + | |
| 283 | + | |
| 284 | + | |
| 285 | + | |
| 286 | + | |
| 287 | + | |
| 288 | + | |
| 289 | + | |
| 290 | + | |
| 291 | + | |
| 292 | + | |
| 293 | + | |
276 | 294 | | |
277 | 295 | | |
278 | 296 | | |
| |||
0 commit comments