From 4cb5d3353f488ee7bf3943619e67a5664dbae8df Mon Sep 17 00:00:00 2001 From: Brad King Date: Wed, 2 Nov 2016 13:08:14 -0400 Subject: 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 --- Help/release/dev/vs-flag-order.rst | 9 +++++++++ Source/cmVisualStudioGeneratorOptions.cxx | 5 +++-- 2 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 Help/release/dev/vs-flag-order.rst diff --git a/Help/release/dev/vs-flag-order.rst b/Help/release/dev/vs-flag-order.rst new file mode 100644 index 0000000..21cea37 --- /dev/null +++ b/Help/release/dev/vs-flag-order.rst @@ -0,0 +1,9 @@ +vs-flag-order +------------- + +* The :ref:`Visual Studio Generators` for VS 2010 and above now place + per-source file flags after target-wide flags when they are classified + as raw flags with no project file setting (``AdditionalOptions``). + This behavior is more consistent with the ordering of flags produced + by other generators, and allows flags on more-specific properties + (per-source) to override those on more general ones (per-target). 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 << ""; } - fout << cmVisualStudio10GeneratorOptionsEscapeForXML(this->FlagString) - << " %(AdditionalOptions)\n"; + fout << "%(AdditionalOptions) " + << cmVisualStudio10GeneratorOptionsEscapeForXML(this->FlagString) + << "\n"; } else { fout << prefix << "AdditionalOptions=\""; fout << cmVisualStudioGeneratorOptionsEscapeForXML(this->FlagString); -- cgit v0.12