diff options
| author | Brad King <brad.king@kitware.com> | 2023-01-13 13:45:28 +0000 |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2023-01-13 08:45:37 -0500 |
| commit | 2d9e66a23bd469b5c89fb7951f6dc59738cd2516 (patch) | |
| tree | ea2f375199e2374ab08d9176c313cfd32045483a /Modules | |
| parent | 45da44cc23e3cc3a0fc9309cd9fb0ce53b40b256 (diff) | |
| parent | 607bccb4efe15d7c33618a2c6324d2dbeccb5119 (diff) | |
| download | cmake-2d9e66a23bd469b5c89fb7951f6dc59738cd2516.tar.gz | |
Merge topic 'implicit-includes' into release-3.25
607bccb4ef Restore implicit include directory extraction for adaptive relative paths
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !8067
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/CMakeParseImplicitIncludeInfo.cmake | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Modules/CMakeParseImplicitIncludeInfo.cmake b/Modules/CMakeParseImplicitIncludeInfo.cmake index 5c0eda2703..1ebd887bc4 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. |