[Cmake-commits] CMake branch, next, updated. v3.7.0-rc2-928-g54eed9a

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  54eed9ada656ea5f43d55d4e7b03945889365689 (commit)
       via  4cb5d3353f488ee7bf3943619e67a5664dbae8df (commit)
      from  a279f9378ad9b8692230ddb9d74d8825d19c2a27 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=54eed9ada656ea5f43d55d4e7b03945889365689
commit 54eed9ada656ea5f43d55d4e7b03945889365689
Merge: a279f93 4cb5d33
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Nov 3 09:01:41 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Nov 3 09:01:41 2016 -0400

    Merge topic 'vs-flag-order' into next
    
    4cb5d335 VS: Place source-specific AdditionalOptions after target-wide flags


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4cb5d3353f488ee7bf3943619e67a5664dbae8df
commit 4cb5d3353f488ee7bf3943619e67a5664dbae8df
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Nov 2 13:08:14 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Nov 2 13:11:08 2016 -0400

    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

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 << "<AdditionalOptions>";
       }
-      fout << cmVisualStudio10GeneratorOptionsEscapeForXML(this->FlagString)
-           << " %(AdditionalOptions)</AdditionalOptions>\n";
+      fout << "%(AdditionalOptions) "
+           << cmVisualStudio10GeneratorOptionsEscapeForXML(this->FlagString)
+           << "</AdditionalOptions>\n";
     } else {
       fout << prefix << "AdditionalOptions=\"";
       fout << cmVisualStudioGeneratorOptionsEscapeForXML(this->FlagString);

-----------------------------------------------------------------------

Summary of changes:
 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


hooks/post-receive
-- 
CMake