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

Merge topic 'vs-use-full-paths' 

0d048384 VS: Use full path to sources to allow deeper trees with VS >= 10
This commit is contained in:
Brad King 2014-04-17 09:11:01 -04:00 committed by CMake Topic Stage
parent 41c76d5aeb 0d04838469
commit 4c966d90c7
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