Makefile: Fix regression in dependencies on relative includes
Since commit a13a5c94 (Replace use of CollapseCombinedPath with CollapseFullPath, 2019-03-19, v3.15.0-rc1~361^2~1), one code path now calls `CollapseFullPath` with a base path that may be relative. Backport KWSys commit c6f8e24a3 (SystemTools: Fix CollapseFullPath with relative base path, 2019-07-24) to handle such base paths. This case occurs when a build tree is placed in a directory inside a source tree such that CMake is willing to generate a relative path from the build tree to the source tree. Add a test covering this case. Fixes: #19507
Status | Job ID | Name | Coverage | ||||||
---|---|---|---|---|---|---|---|---|---|
External | |||||||||
passed |
#4555447
external
|
cdash |
|
||||||
passed |
#4555584
external
|
cmake-dash3win10-windows-release-ninja |
|
||||||
passed |
#4555702
external
|
cmake-hythloth-linux-debug-makefiles+sphinx |
|
||||||
passed |
#4555527
external
|
cmake-minoc-linux-release-lint-iwyu-tidy |
|
||||||
passed |
#4555518
external
|
cmake-moonshade-osx-debug-ninja |
|
||||||
passed |
#4555593
external
|
cmake-moonshade-osx-release-makefiles |
|
||||||
passed |
#4555720
external
|
cmake-terfin-windows-release-vs2019 |
|
||||||
passed |
#4555446
external
|
ghostflow-check-master |
|
||||||
passed |
#4557690
external
|
ghostflow-stager |
|
||||||
passed |
#4555581
external
retried
|
cmake-dash3win10-windows-release-ninja |
|
||||||
passed |
#4555582
external
retried
|
cmake-dash3win10-windows-release-ninja |
|
||||||
passed |
#4555452
external
retried
|
cmake-dash3win10-windows-release-ninja |
00:19:44
|
||||||
passed |
#4555583
external
retried
|
cmake-dash3win10-windows-release-ninja |
|
||||||
passed |
#4555699
external
retried
|
cmake-hythloth-linux-debug-makefiles+sphinx |
|
||||||
passed |
#4555701
external
retried
|
cmake-hythloth-linux-debug-makefiles+sphinx |
|
||||||
passed |
#4555700
external
retried
|
cmake-hythloth-linux-debug-makefiles+sphinx |
|
||||||
passed |
#4555449
external
retried
|
cmake-hythloth-linux-debug-makefiles+sphinx |
00:45:20
|
||||||
passed |
#4555526
external
retried
|
cmake-minoc-linux-release-lint-iwyu-tidy |
|
||||||
passed |
#4555450
external
retried
|
cmake-minoc-linux-release-lint-iwyu-tidy |
00:12:14
|
||||||
passed |
#4555524
external
retried
|
cmake-minoc-linux-release-lint-iwyu-tidy |
|
||||||
passed |
#4555525
external
retried
|
cmake-minoc-linux-release-lint-iwyu-tidy |
|
||||||
passed |
#4555448
external
retried
|
cmake-moonshade-osx-debug-ninja |
00:10:18
|
||||||
passed |
#4555517
external
retried
|
cmake-moonshade-osx-debug-ninja |
|
||||||
passed |
#4555516
external
retried
|
cmake-moonshade-osx-debug-ninja |
|
||||||
passed |
#4555515
external
retried
|
cmake-moonshade-osx-debug-ninja |
|
||||||
passed |
#4555592
external
retried
|
cmake-moonshade-osx-release-makefiles |
|
||||||
passed |
#4555591
external
retried
|
cmake-moonshade-osx-release-makefiles |
|
||||||
passed |
#4555590
external
retried
|
cmake-moonshade-osx-release-makefiles |
|
||||||
passed |
#4555519
external
retried
|
cmake-moonshade-osx-release-makefiles |
00:12:33
|
||||||
passed |
#4555718
external
retried
|
cmake-terfin-windows-release-vs2019 |
|
||||||
passed |
#4555719
external
retried
|
cmake-terfin-windows-release-vs2019 |
|
||||||
passed |
#4555451
external
retried
|
cmake-terfin-windows-release-vs2019 |
00:47:47
|
||||||
passed |
#4555717
external
retried
|
cmake-terfin-windows-release-vs2019 |
|
||||||
passed |
#4557421
external
retried
|
ghostflow-stager |
|
||||||
passed |
#4557425
external
retried
|
ghostflow-stager |
|
||||||
passed |
#4557680
external
retried
|
ghostflow-stager |
|
||||||
passed |
#4557670
external
retried
|
ghostflow-stager |
|
||||||
passed |
#4555840
external
retried
|
ghostflow-stager |
|
||||||
passed |
#4555943
external
retried
|
ghostflow-stager |
|
||||||
passed |
#4557232
external
retried
|
ghostflow-stager |
|
||||||