diff options
| author | Brad King <brad.king@kitware.com> | 2016-11-02 17:08:14 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-11-02 17:11:08 (GMT) |
| commit | 4cb5d3353f488ee7bf3943619e67a5664dbae8df (patch) | |
| tree | a711386a9b0cd0d3e49c315222ea45a914499726 /Source/cmVisualStudioGeneratorOptions.cxx | |
| parent | ab2ae4823c3b60347825da4b851cd4e676f8bed1 (diff) | |
| download | CMake-4cb5d3353f488ee7bf3943619e67a5664dbae8df.zip CMake-4cb5d3353f488ee7bf3943619e67a5664dbae8df.tar.gz CMake-4cb5d3353f488ee7bf3943619e67a5664dbae8df.tar.bz2 | |
VS: Place source-specific AdditionalOptions after target-wide flags
Flags specified in the `COMPILE_FLAGS` source-file property should
be placed after those in target-wide properties so that those on
individual source files can override those on the whole target.
This is already done by most generators but was not implemented
correctly for VS 2010 and above.
Closes: #16400
Diffstat (limited to 'Source/cmVisualStudioGeneratorOptions.cxx')
| -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); |