diff options
| author | Brad King <brad.king@kitware.com> | 2024-02-15 17:54:04 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2024-02-15 17:54:39 (GMT) |
| commit | b13aca575eed76316128919dfa419b3dde87a751 (patch) | |
| tree | d0ca800e9b94b76d94bd754c24c5edf2366e679e /Source | |
| parent | 2f89f1f5e27a2e85f09de8ea19dfe8b76af64d7b (diff) | |
| parent | 0f0d853de7054f2ed31253b21aabdb0855510b8f (diff) | |
| download | CMake-b13aca575eed76316128919dfa419b3dde87a751.zip CMake-b13aca575eed76316128919dfa419b3dde87a751.tar.gz CMake-b13aca575eed76316128919dfa419b3dde87a751.tar.bz2 | |
Merge topic 'cxxmodules-collapse-source-paths' into release-3.29
0f0d853de7 cmDyndepCollation: collapse full path before looking up
Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !9249
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmDyndepCollation.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Source/cmDyndepCollation.cxx b/Source/cmDyndepCollation.cxx index ea46f03..ed4762b 100644 --- a/Source/cmDyndepCollation.cxx +++ b/Source/cmDyndepCollation.cxx @@ -119,7 +119,8 @@ Json::Value CollationInformationCxxModules( for (auto const& files_per_dir : files_per_dirs) { for (auto const& file : files_per_dir.second) { - auto lookup = sf_map.find(file); + auto const full_file = cmSystemTools::CollapseFullPath(file); + auto lookup = sf_map.find(full_file); if (lookup == sf_map.end()) { gt->Makefile->IssueMessage( MessageType::FATAL_ERROR, @@ -147,7 +148,7 @@ Json::Value CollationInformationCxxModules( Json::Value& tdi_module_info = tdi_cxx_module_info[obj_path] = Json::objectValue; - tdi_module_info["source"] = file; + tdi_module_info["source"] = full_file; tdi_module_info["bmi-only"] = ct == CompileType::BmiOnly; tdi_module_info["relative-directory"] = files_per_dir.first; tdi_module_info["name"] = file_set->GetName(); |