summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2024-02-27 14:06:15 (GMT)
committerKitware Robot <kwrobot@kitware.com>2024-02-27 14:06:24 (GMT)
commit4ff4417b544aa5d1a52f4ffb068481571ce2a029 (patch)
tree16ac44d4dc2f6bbbd9c4efcc9f1d626f53598789
parent9b4bbd26a932a0a6b897a746b211eb163c742c73 (diff)
parent0a18f9baad780deec8fe9952b28dd349252d7d81 (diff)
downloadCMake-4ff4417b544aa5d1a52f4ffb068481571ce2a029.zip
CMake-4ff4417b544aa5d1a52f4ffb068481571ce2a029.tar.gz
CMake-4ff4417b544aa5d1a52f4ffb068481571ce2a029.tar.bz2
Merge topic 'cxxmodules-fileset-cache-fullpath' into release-3.29
0a18f9baad cmGeneratorTarget: collapse paths before querying the fileset cache Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !9286
-rw-r--r--Source/cmGeneratorTarget.cxx3
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 3913c99..7dd9304 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -9547,7 +9547,8 @@ void cmGeneratorTarget::BuildFileSetInfoCache(std::string const& config) const
for (auto const& it : files) {
for (auto const& filename : it.second) {
- per_config.FileSetCache[filename] = file_set;
+ auto collapsedFile = cmSystemTools::CollapseFullPath(filename);
+ per_config.FileSetCache[collapsedFile] = file_set;
}
}
}