diff options
| author | Brad King <brad.king@kitware.com> | 2023-01-12 17:00:56 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2023-01-12 17:05:42 (GMT) |
| commit | 607bccb4efe15d7c33618a2c6324d2dbeccb5119 (patch) | |
| tree | 7142a143198561ec554ed68e38f6cd11f68bbaed | |
| parent | 6b92224f6c8758e5e84b1425273f4abf3b278f54 (diff) | |
| download | CMake-607bccb4efe15d7c33618a2c6324d2dbeccb5119.zip CMake-607bccb4efe15d7c33618a2c6324d2dbeccb5119.tar.gz CMake-607bccb4efe15d7c33618a2c6324d2dbeccb5119.tar.bz2 | |
Restore implicit include directory extraction for adaptive relative paths
Update the logic added by commit ef41d49812 (Fix implicit include
directory extraction for adaptive relative paths, 2019-04-08,
v3.14.2~5^2) to account for the new `try_compile` work directory used
for the ABI check since commit 2edf0fc6d7 (Modules: Use new
keyword-dispatched try_compile signature, 2022-09-13,
v3.25.0-rc1~144^2).
Paths relative to the work directory will now have one more `../`
in them, so update the test data to match.
Fixes: #24279
| -rw-r--r-- | Modules/CMakeParseImplicitIncludeInfo.cmake | 5 | ||||
| -rw-r--r-- | Tests/RunCMake/ParseImplicitData/hand-C-relative.input | 4 | ||||
| -rw-r--r-- | Tests/RunCMake/ParseImplicitData/hand-CXX-relative.input | 4 |
3 files changed, 7 insertions, 6 deletions
diff --git a/Modules/CMakeParseImplicitIncludeInfo.cmake b/Modules/CMakeParseImplicitIncludeInfo.cmake index 5c0eda2..1ebd887 100644 --- a/Modules/CMakeParseImplicitIncludeInfo.cmake +++ b/Modules/CMakeParseImplicitIncludeInfo.cmake @@ -233,8 +233,9 @@ function(cmake_parse_implicit_include_info text lang dir_var log_var state_var) get_filename_component(dir "${d}" ABSOLUTE) list(APPEND implicit_dirs "${dir}") string(APPEND log " collapse include dir [${d}] ==> [${dir}]\n") - elseif("${d}" MATCHES [[^\.\.[\/]\.\.[\/](.*)$]]) - # This relative path is deep enough to get out of the CMakeFiles/CMakeTmp + elseif("${d}" MATCHES [[^\.\.[\/]\.\.[\/]\.\.[\/](.*)$]]) + # This relative path is deep enough to get out of the + # CMakeFiles/CMakeScratch/<unique> # directory where the ABI check is done. Assume that the compiler has # computed this path adaptively based on the current working directory # such that the effective result is absolute. diff --git a/Tests/RunCMake/ParseImplicitData/hand-C-relative.input b/Tests/RunCMake/ParseImplicitData/hand-C-relative.input index 52ac9df..dd0c10b 100644 --- a/Tests/RunCMake/ParseImplicitData/hand-C-relative.input +++ b/Tests/RunCMake/ParseImplicitData/hand-C-relative.input @@ -16,8 +16,8 @@ This is a hand-written test case. #include "..." search starts here: #include <...> search starts here: /usr/local/include - ../../../adaptive/relative/include + ../../../../adaptive/relative/include /usr/include End of search list. -/usr/bin/ld -L/usr/lib64 -L../../../adaptive/relative/lib +/usr/bin/ld -L/usr/lib64 -L../../../../adaptive/relative/lib diff --git a/Tests/RunCMake/ParseImplicitData/hand-CXX-relative.input b/Tests/RunCMake/ParseImplicitData/hand-CXX-relative.input index 0b223a1..568933a 100644 --- a/Tests/RunCMake/ParseImplicitData/hand-CXX-relative.input +++ b/Tests/RunCMake/ParseImplicitData/hand-CXX-relative.input @@ -16,8 +16,8 @@ This is a hand-written test case. #include "..." search starts here: #include <...> search starts here: /usr/local/include - ../../../adaptive/relative/include + ../../../../adaptive/relative/include /usr/include End of search list. -/usr/bin/ld -L/usr/lib64 -L../../../adaptive/relative/lib +/usr/bin/ld -L/usr/lib64 -L../../../../adaptive/relative/lib |