kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

VS: Use full path to sources to allow deeper trees with VS >= 10 

As explained in cmVisualStudio10TargetGenerator::WriteSource comments,
VS tools append relative paths to the current directory, e.g.

 c:\path\to\current\dir\..\..\..\relative\path\to\source.c

and fail if this is over 250 charaters or so.  Previously we used a full
path only if no relative path could be constructed with a leading "../"
sequence that does not escape the source or build tree.  This means that
long relative paths can be generated when the build tree is inside the
source tree, and can cause build failures due to the above path
concatenation problem.

Teach cmVisualStudio10TargetGenerator::ConvertPath to ask the Convert
method to honor CMAKE_USE_RELATIVE_PATHS.  This will cause it to use
full paths by default but still give users the option of getting the
relative paths when possible.

Suggested-by: Josh Green <inbilla@gmail.com>
This commit is contained in:
Brad King 2014-04-15 11:47:54 -04:00
parent 8472ef243f
commit 0d04838469
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Source/cmVisualStudio10TargetGenerator.cxx
View File

@ -685,7 +685,8 @@ cmVisualStudio10TargetGenerator::ConvertPath(std::string const& path,
this->Makefile->GetCurrentOutputDirectory(), path.c_str()) this->Makefile->GetCurrentOutputDirectory(), path.c_str())
: this->LocalGenerator->Convert(path.c_str(), : this->LocalGenerator->Convert(path.c_str(),
cmLocalGenerator::START_OUTPUT, cmLocalGenerator::START_OUTPUT,
cmLocalGenerator::UNCHANGED); cmLocalGenerator::UNCHANGED,
/* optional = */ true);
} }
void cmVisualStudio10TargetGenerator::ConvertToWindowsSlash(std::string& s) void cmVisualStudio10TargetGenerator::ConvertToWindowsSlash(std::string& s)
@ -941,7 +942,7 @@ void cmVisualStudio10TargetGenerator::WriteSource(
// c:\path\to\current\dir\..\..\..\relative\path\to\source.c // c:\path\to\current\dir\..\..\..\relative\path\to\source.c
// //
// and fail if this exceeds the maximum allowed path length. Our path // and fail if this exceeds the maximum allowed path length. Our path
// conversion uses full paths outside the build tree to allow deeper trees. // conversion uses full paths when possible to allow deeper trees.
bool forceRelative = false; bool forceRelative = false;
std::string sourceFile = this->ConvertPath(sf->GetFullPath(), false); std::string sourceFile = this->ConvertPath(sf->GetFullPath(), false);
if(this->LocalGenerator->GetVersion() == cmLocalVisualStudioGenerator::VS10 if(this->LocalGenerator->GetVersion() == cmLocalVisualStudioGenerator::VS10