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/ParseImplicitIncludeInfo.cmake | |
| 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/ParseImplicitIncludeInfo.cmake')
| -rw-r--r-- | Tests/RunCMake/ParseImplicitIncludeInfo/ParseImplicitIncludeInfo.cmake | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/Tests/RunCMake/ParseImplicitIncludeInfo/ParseImplicitIncludeInfo.cmake b/Tests/RunCMake/ParseImplicitIncludeInfo/ParseImplicitIncludeInfo.cmake index ce8d45b..a39a529 100644 --- a/Tests/RunCMake/ParseImplicitIncludeInfo/ParseImplicitIncludeInfo.cmake +++ b/Tests/RunCMake/ParseImplicitIncludeInfo/ParseImplicitIncludeInfo.cmake @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.0) +cmake_minimum_required(VERSION 3.14) project(Minimal NONE) # @@ -37,6 +37,14 @@ set(targets sunos-C-SunPro-5.13.0 sunos-CXX-SunPro-5.13.0 sunos-Fortran-SunPro-8.8.0 ) +if(CMAKE_HOST_WIN32) + # The KWSys actual-case cache breaks case sensitivity on Windows. + list(FILTER targets EXCLUDE REGEX "-XL|-SunPro") +else() + # Windows drive letters are not recognized as absolute on other platforms. + list(FILTER targets EXCLUDE REGEX "mingw") +endif() + include(${CMAKE_ROOT}/Modules/CMakeParseImplicitIncludeInfo.cmake) # |