mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-02 20:29:49 -05:00
Code Issues Packages Projects Releases Wiki Activity

Xcode: Fix support for source tree symlink inside build tree

Browse Source 
Since commit 61495cdaae (Fix Xcode project references to the source
tree, 2009-09-22, v2.8.0~43) we force source file references to use
relative paths from the source tree.  If the source tree path is a
symbolic link inside the build tree, the relative `../` sequence
goes to the wrong place.  The problem with debug breakpoints motivating
that change does not seem to occur in modern Xcode versions, so update
the logic to use a relative path only when it does not need to start
in any `../` sequence.
This commit is contained in:
Brad King
2022-02-24 18:12:22 -05:00
parent 55db2cf1e5
commit de766bc7e0
2 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/cmGlobalXCodeGenerator.cxx
+6 -4
View File
@@ -4695,10 +4695,12 @@ std::string cmGlobalXCodeGenerator::ConvertToRelativeForMake(
std::string cmGlobalXCodeGenerator::RelativeToSource(const std::string& p)
{
// We force conversion because Xcode breakpoints do not work unless
// they are in a file named relative to the source tree.
return cmSystemTools::ForceToRelativePath(
this->CurrentRootGenerator->GetCurrentSourceDirectory(), p);
std::string const& rootSrc =
this->CurrentRootGenerator->GetCurrentSourceDirectory();
if (cmSystemTools::IsSubDirectory(p, rootSrc)) {
return cmSystemTools::ForceToRelativePath(rootSrc, p);
}
return p;
}
std::string cmGlobalXCodeGenerator::RelativeToBinary(const std::string& p)