diff options
| author | Brad King <brad.king@kitware.com> | 2014-07-23 18:59:23 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-07-23 19:01:46 (GMT) |
| commit | 29a0642ba78392ab20037e677d28eae2eea23de7 (patch) | |
| tree | 08dc8bdebf9ea58128e6844ea23e476dc10135a1 /Source | |
| parent | 8fa087ab38c41e76e502f438eff42d412962108f (diff) | |
| download | CMake-29a0642ba78392ab20037e677d28eae2eea23de7.zip CMake-29a0642ba78392ab20037e677d28eae2eea23de7.tar.gz CMake-29a0642ba78392ab20037e677d28eae2eea23de7.tar.bz2 | |
VS: Encode mapped flag values in XML project files (#15031)
Teach cmVisualStudioGeneratorOptions to encode FlagMap entries
and the FlagString value properly in vcproj/vcxproj XML files.
Update the one existing call site that pre-encoded the value
to not do so.
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmLocalVisualStudio7Generator.cxx | 2 | ||||
| -rw-r--r-- | Source/cmVisualStudioGeneratorOptions.cxx | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx index e0fe0fd..3ed4a48 100644 --- a/Source/cmLocalVisualStudio7Generator.cxx +++ b/Source/cmLocalVisualStudio7Generator.cxx @@ -1013,7 +1013,7 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout, if(!this->ModuleDefinitionFile.empty()) { std::string defFile = - this->ConvertToXMLOutputPath(this->ModuleDefinitionFile.c_str()); + this->ConvertToOptionallyRelativeOutputPath(this->ModuleDefinitionFile); linkOptions.AddFlag("ModuleDefinitionFile", defFile.c_str()); } switch(target.GetType()) diff --git a/Source/cmVisualStudioGeneratorOptions.cxx b/Source/cmVisualStudioGeneratorOptions.cxx index 2c43ad2..b14fc45 100644 --- a/Source/cmVisualStudioGeneratorOptions.cxx +++ b/Source/cmVisualStudioGeneratorOptions.cxx @@ -321,7 +321,7 @@ cmVisualStudioGeneratorOptions for(std::vector<std::string>::iterator i = m->second.begin(); i != m->second.end(); ++i) { - fout << sep << *i; + fout << sep << cmVisualStudio10GeneratorOptionsEscapeForXML(*i); sep = ";"; } if (m->first == "AdditionalIncludeDirectories") @@ -341,7 +341,7 @@ cmVisualStudioGeneratorOptions for(std::vector<std::string>::iterator i = m->second.begin(); i != m->second.end(); ++i) { - fout << sep << *i; + fout << sep << cmVisualStudioGeneratorOptionsEscapeForXML(*i); sep = ";"; } fout << "\"\n"; @@ -373,7 +373,7 @@ cmVisualStudioGeneratorOptions { fout << "<AdditionalOptions>"; } - fout << this->FlagString.c_str() + fout << cmVisualStudio10GeneratorOptionsEscapeForXML(this->FlagString) << " %(AdditionalOptions)</AdditionalOptions>\n"; } else |