diff options
| author | Brad King <brad.king@kitware.com> | 2014-04-17 13:11:01 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-04-17 13:11:01 (GMT) |
| commit | 4c966d90c7a2afaffa97ae3d0d4fbc26b614a2eb (patch) | |
| tree | 9b17c71c68f6e2b8928ac2c15ce5755e685d9a74 /Source | |
| parent | 41c76d5aeb86e082b3e3c093c960a4e7ce1f7faa (diff) | |
| parent | 0d048384694b7285ef739153757b57791d4ebb93 (diff) | |
| download | CMake-4c966d90c7a2afaffa97ae3d0d4fbc26b614a2eb.zip CMake-4c966d90c7a2afaffa97ae3d0d4fbc26b614a2eb.tar.gz CMake-4c966d90c7a2afaffa97ae3d0d4fbc26b614a2eb.tar.bz2 | |
Merge topic 'vs-use-full-paths'
0d048384 VS: Use full path to sources to allow deeper trees with VS >= 10
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmVisualStudio10TargetGenerator.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx index a999b2d..72bb020 100644 --- a/Source/cmVisualStudio10TargetGenerator.cxx +++ b/Source/cmVisualStudio10TargetGenerator.cxx @@ -685,7 +685,8 @@ cmVisualStudio10TargetGenerator::ConvertPath(std::string const& path, this->Makefile->GetCurrentOutputDirectory(), path.c_str()) : this->LocalGenerator->Convert(path.c_str(), cmLocalGenerator::START_OUTPUT, - cmLocalGenerator::UNCHANGED); + cmLocalGenerator::UNCHANGED, + /* optional = */ true); } void cmVisualStudio10TargetGenerator::ConvertToWindowsSlash(std::string& s) @@ -941,7 +942,7 @@ void cmVisualStudio10TargetGenerator::WriteSource( // c:\path\to\current\dir\..\..\..\relative\path\to\source.c // // 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; std::string sourceFile = this->ConvertPath(sf->GetFullPath(), false); if(this->LocalGenerator->GetVersion() == cmLocalVisualStudioGenerator::VS10 |