diff options
| author | Brad King <brad.king@kitware.com> | 2016-11-04 12:26:09 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-11-04 12:26:09 (GMT) |
| commit | 926a22b8b8131347a61681252f9b27644607cb89 (patch) | |
| tree | 2498532b28f0db8c7d9a6d89822cd671cd9ff57a /Source | |
| parent | 28a9e71c527dd4d9159af2a1e83bdd4ff0925cdc (diff) | |
| parent | 4cb5d3353f488ee7bf3943619e67a5664dbae8df (diff) | |
| download | CMake-926a22b8b8131347a61681252f9b27644607cb89.zip CMake-926a22b8b8131347a61681252f9b27644607cb89.tar.gz CMake-926a22b8b8131347a61681252f9b27644607cb89.tar.bz2 | |
Merge topic 'vs-flag-order'
4cb5d335 VS: Place source-specific AdditionalOptions after target-wide flags
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmVisualStudioGeneratorOptions.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Source/cmVisualStudioGeneratorOptions.cxx b/Source/cmVisualStudioGeneratorOptions.cxx index 4be183d..e751bfc 100644 --- a/Source/cmVisualStudioGeneratorOptions.cxx +++ b/Source/cmVisualStudioGeneratorOptions.cxx @@ -334,8 +334,9 @@ void cmVisualStudioGeneratorOptions::OutputAdditionalOptions( } else { fout << "<AdditionalOptions>"; } - fout << cmVisualStudio10GeneratorOptionsEscapeForXML(this->FlagString) - << " %(AdditionalOptions)</AdditionalOptions>\n"; + fout << "%(AdditionalOptions) " + << cmVisualStudio10GeneratorOptionsEscapeForXML(this->FlagString) + << "</AdditionalOptions>\n"; } else { fout << prefix << "AdditionalOptions=\""; fout << cmVisualStudioGeneratorOptionsEscapeForXML(this->FlagString); |