diff options
| author | Brad King <brad.king@kitware.com> | 2019-03-27 14:09:22 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2019-03-29 12:48:56 (GMT) |
| commit | dad86f1873f6930759795785b5ee4da51ea2050c (patch) | |
| tree | 9ffb30f99ddfd2680cf8312e20500afa8b0e9883 /Tests/RunCMake/ParseImplicitIncludeInfo/data/mingw.org-C-GNU-4.9.3.output | |
| parent | bf02d625325535f485512eba307cff54c08bb257 (diff) | |
| download | CMake-dad86f1873f6930759795785b5ee4da51ea2050c.zip CMake-dad86f1873f6930759795785b5ee4da51ea2050c.tar.gz CMake-dad86f1873f6930759795785b5ee4da51ea2050c.tar.bz2 | |
ParseImplicitIncludeInfo: Canonicalize implicit include dirs
The implicit include directory extraction added by commit 5990ecb741
(Compute implicit include directories from compiler output, 2018-12-07,
v3.14.0-rc1~108^2) leaves paths like `/usr/lib/../include` unchanged.
Fix the logic to canonicalize such paths (e.g. to `/usr/include`)
as we do for implicit link directories already. This is important
to ensure the set of implicit directories is represented in the same
form as the include directories that will be compared to them.
Issue: #19095
Diffstat (limited to 'Tests/RunCMake/ParseImplicitIncludeInfo/data/mingw.org-C-GNU-4.9.3.output')
| -rw-r--r-- | Tests/RunCMake/ParseImplicitIncludeInfo/data/mingw.org-C-GNU-4.9.3.output | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Tests/RunCMake/ParseImplicitIncludeInfo/data/mingw.org-C-GNU-4.9.3.output b/Tests/RunCMake/ParseImplicitIncludeInfo/data/mingw.org-C-GNU-4.9.3.output index cdfb8b2..d23e7fe 100644 --- a/Tests/RunCMake/ParseImplicitIncludeInfo/data/mingw.org-C-GNU-4.9.3.output +++ b/Tests/RunCMake/ParseImplicitIncludeInfo/data/mingw.org-C-GNU-4.9.3.output @@ -1 +1 @@ -c:/mingw/bin/../lib/gcc/mingw32/4.9.3/include;c:/mingw/bin/../lib/gcc/mingw32/4.9.3/../../../../include;c:/mingw/bin/../lib/gcc/mingw32/4.9.3/include-fixed +C:/DoesNotExist/mingw/lib/gcc/mingw32/4.9.3/include;C:/DoesNotExist/mingw/include;C:/DoesNotExist/mingw/lib/gcc/mingw32/4.9.3/include-fixed |