diff options
| author | Vitaly Stakhovsky <vvs31415@gitlab.org> | 2018-08-24 13:43:35 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2018-08-27 19:48:57 (GMT) |
| commit | 50fbfee3a02e7099a3909d81597f4b8047847ece (patch) | |
| tree | c8f6053448e3428b1d9f32c0c1141c41cd1d9f59 /Source/cmVisualStudio10TargetGenerator.cxx | |
| parent | e33c6c357b61ed0cc5b9f7c01e4ea04deca26b39 (diff) | |
| download | CMake-50fbfee3a02e7099a3909d81597f4b8047847ece.zip CMake-50fbfee3a02e7099a3909d81597f4b8047847ece.tar.gz CMake-50fbfee3a02e7099a3909d81597f4b8047847ece.tar.bz2 | |
cmLocalGenerator: return directories as const std::string&
Diffstat (limited to 'Source/cmVisualStudio10TargetGenerator.cxx')
| -rw-r--r-- | Source/cmVisualStudio10TargetGenerator.cxx | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx index 56d7243..a6396a5 100644 --- a/Source/cmVisualStudio10TargetGenerator.cxx +++ b/Source/cmVisualStudio10TargetGenerator.cxx @@ -250,7 +250,7 @@ cmVisualStudio10TargetGenerator::cmVisualStudio10TargetGenerator( this->TargetCompileAsWinRT = false; this->IsMissingFiles = false; this->DefaultArtifactDir = - this->LocalGenerator->GetCurrentBinaryDirectory() + std::string("/") + + this->LocalGenerator->GetCurrentBinaryDirectory() + "/" + this->LocalGenerator->GetTargetDirectory(this->GeneratorTarget); this->InSourceBuild = (strcmp(this->Makefile->GetCurrentSourceDirectory(), @@ -1877,7 +1877,7 @@ void cmVisualStudio10TargetGenerator::WriteSource(Elem& e2, std::string sourceRel = this->ConvertPath(sf->GetFullPath(), true); size_t const maxLen = 250; if (sf->GetCustomCommand() || - ((strlen(this->LocalGenerator->GetCurrentBinaryDirectory()) + 1 + + ((this->LocalGenerator->GetCurrentBinaryDirectory().length() + 1 + sourceRel.length()) <= maxLen)) { forceRelative = true; sourceFile = sourceRel; @@ -4131,8 +4131,7 @@ void cmVisualStudio10TargetGenerator::WriteMissingFilesWP80(Elem& e1) // this can cause an overwrite problem if projects aren't organized in // folders std::string manifestFile = - this->LocalGenerator->GetCurrentBinaryDirectory() + - std::string("/WMAppManifest.xml"); + this->LocalGenerator->GetCurrentBinaryDirectory() + "/WMAppManifest.xml"; std::string artifactDir = this->LocalGenerator->GetTargetDirectory(this->GeneratorTarget); ConvertToWindowsSlash(artifactDir); |