diff options
| author | Brad King <brad.king@kitware.com> | 2015-06-04 13:13:33 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-06-04 13:13:33 (GMT) |
| commit | d6fe79f3abc211361f0aee909e08fd6a1531a68b (patch) | |
| tree | e3eae036938dfe9fd8744d86d85a164126ebf200 /Source/cmVisualStudio10TargetGenerator.cxx | |
| parent | 5a1c8806bfded9e68280542fa7573f21eb125e95 (diff) | |
| parent | 6e570f857acd3322640db72112f2dc37b69396cf (diff) | |
| download | CMake-d6fe79f3abc211361f0aee909e08fd6a1531a68b.zip CMake-d6fe79f3abc211361f0aee909e08fd6a1531a68b.tar.gz CMake-d6fe79f3abc211361f0aee909e08fd6a1531a68b.tar.bz2 | |
Merge topic 'remove-CMAKE_USE_RELATIVE_PATHS'
6e570f85 cmLocalGenerator: Remove 'optional' parameter from Convert.
3d8c6cd9 cmLocalGenerator: Remove obsolete method.
e44e6bcc Port away from obsolete method.
1335992c Remove CMAKE_USE_RELATIVE_PATHS variable.
Diffstat (limited to 'Source/cmVisualStudio10TargetGenerator.cxx')
| -rw-r--r-- | Source/cmVisualStudio10TargetGenerator.cxx | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx index 0be1335..9b78df3 100644 --- a/Source/cmVisualStudio10TargetGenerator.cxx +++ b/Source/cmVisualStudio10TargetGenerator.cxx @@ -922,10 +922,7 @@ cmVisualStudio10TargetGenerator::ConvertPath(std::string const& path, return forceRelative ? cmSystemTools::RelativePath( this->Makefile->GetCurrentBinaryDirectory(), path.c_str()) - : this->LocalGenerator->Convert(path.c_str(), - cmLocalGenerator::START_OUTPUT, - cmLocalGenerator::UNCHANGED, - /* optional = */ true); + : path.c_str(); } void cmVisualStudio10TargetGenerator::ConvertToWindowsSlash(std::string& s) |