[Cmake-commits] CMake branch, next, updated. v3.7.0-rc2-612-g01c0024

[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  01c002450510e33e7f66da1af4b7d14de97156ca (commit)
       via  437d9ffa10541a43c9af08e0d8da52728506d536 (commit)
      from  ec25bfbe1a2623245fb3b7bc047b5243d3916dfd (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=01c002450510e33e7f66da1af4b7d14de97156ca
commit 01c002450510e33e7f66da1af4b7d14de97156ca
Merge: ec25bfb 437d9ff
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Oct 19 16:26:31 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Oct 19 16:26:31 2016 -0400

    Merge topic 'split-cmState' into next
    
    437d9ffa Fix style of topic 'split-cmState'


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=437d9ffa10541a43c9af08e0d8da52728506d536
commit 437d9ffa10541a43c9af08e0d8da52728506d536
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Oct 19 16:26:05 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Oct 19 16:26:05 2016 -0400

    Fix style of topic 'split-cmState'

diff --git a/Source/cmGlobalJOMMakefileGenerator.cxx b/Source/cmGlobalJOMMakefileGenerator.cxx
index 6d85861..78bf5bd 100644
--- a/Source/cmGlobalJOMMakefileGenerator.cxx
+++ b/Source/cmGlobalJOMMakefileGenerator.cxx
@@ -3,8 +3,8 @@
 #include "cmGlobalJOMMakefileGenerator.h"
 
 #include "cmLocalUnixMakefileGenerator3.h"
-#include "cmState.h"
 #include "cmMakefile.h"
+#include "cmState.h"
 
 cmGlobalJOMMakefileGenerator::cmGlobalJOMMakefileGenerator(cmake* cm)
   : cmGlobalUnixMakefileGenerator3(cm)
diff --git a/Source/cmGlobalMinGWMakefileGenerator.cxx b/Source/cmGlobalMinGWMakefileGenerator.cxx
index 4a14df9..255c0f5 100644
--- a/Source/cmGlobalMinGWMakefileGenerator.cxx
+++ b/Source/cmGlobalMinGWMakefileGenerator.cxx
@@ -3,8 +3,8 @@
 #include "cmGlobalMinGWMakefileGenerator.h"
 
 #include "cmLocalUnixMakefileGenerator3.h"
-#include "cmState.h"
 #include "cmMakefile.h"
+#include "cmState.h"
 
 cmGlobalMinGWMakefileGenerator::cmGlobalMinGWMakefileGenerator(cmake* cm)
   : cmGlobalUnixMakefileGenerator3(cm)
diff --git a/Source/cmGlobalNMakeMakefileGenerator.cxx b/Source/cmGlobalNMakeMakefileGenerator.cxx
index 92af8a9..06aba73 100644
--- a/Source/cmGlobalNMakeMakefileGenerator.cxx
+++ b/Source/cmGlobalNMakeMakefileGenerator.cxx
@@ -2,9 +2,9 @@
    file Copyright.txt or https://cmake.org/licensing for details.  */
 #include "cmGlobalNMakeMakefileGenerator.h"
 
-#include "cmState.h"
 #include "cmLocalUnixMakefileGenerator3.h"
 #include "cmMakefile.h"
+#include "cmState.h"
 
 cmGlobalNMakeMakefileGenerator::cmGlobalNMakeMakefileGenerator(cmake* cm)
   : cmGlobalUnixMakefileGenerator3(cm)
diff --git a/Source/cmGlobalVisualStudioGenerator.cxx b/Source/cmGlobalVisualStudioGenerator.cxx
index d6209db..0782182 100644
--- a/Source/cmGlobalVisualStudioGenerator.cxx
+++ b/Source/cmGlobalVisualStudioGenerator.cxx
@@ -9,8 +9,8 @@
 #include "cmGeneratorTarget.h"
 #include "cmLocalVisualStudioGenerator.h"
 #include "cmMakefile.h"
-#include "cmState.h"
 #include "cmSourceFile.h"
+#include "cmState.h"
 #include "cmTarget.h"
 #include <cmsys/Encoding.hxx>
 
diff --git a/Source/cmTargetPropertyComputer.h b/Source/cmTargetPropertyComputer.h
index 817e8c2..352d858 100644
--- a/Source/cmTargetPropertyComputer.h
+++ b/Source/cmTargetPropertyComputer.h
@@ -5,9 +5,9 @@
 
 #include <cmConfigure.h> // IWYU pragma: keep
 
+#include "cmAlgorithms.h"
 #include "cmListFileCache.h"
 #include "cmSystemTools.h"
-#include "cmAlgorithms.h"
 
 #include <map>
 #include <string>

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

Summary of changes:
 Source/cmGlobalJOMMakefileGenerator.cxx   |    2 +-
 Source/cmGlobalMinGWMakefileGenerator.cxx |    2 +-
 Source/cmGlobalNMakeMakefileGenerator.cxx |    2 +-
 Source/cmGlobalVisualStudioGenerator.cxx  |    2 +-
 Source/cmTargetPropertyComputer.h         |    2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
CMake