[Cmake-commits] CMake branch, next, updated. v3.5.2-1147-g76499b4
Brad King
brad.king at kitware.com
Fri Apr 29 08:54:50 EDT 2016
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 76499b4e676225eb770fc880457e7271114f41a1 (commit)
via 0cee282f263b0ddaf5044835c774d8ae10dab61b (commit)
via ec06b4efb3e8cd6d051fae27ca6f2f3c9cad8722 (commit)
from d16ef7569c910e139befe1b80aa5971388afcd12 (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=76499b4e676225eb770fc880457e7271114f41a1
commit 76499b4e676225eb770fc880457e7271114f41a1
Merge: d16ef75 0cee282
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Apr 29 08:54:49 2016 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Apr 29 08:54:49 2016 -0400
Merge topic 'clang-format-include-order' into next
0cee282f Utilities/Release: Stablize include order in custom action
ec06b4ef CursesDialog: Fix include order to be consistent with rest of CMake
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0cee282f263b0ddaf5044835c774d8ae10dab61b
commit 0cee282f263b0ddaf5044835c774d8ae10dab61b
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Apr 29 08:49:35 2016 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Fri Apr 29 08:49:35 2016 -0400
Utilities/Release: Stablize include order in custom action
In detect_nsis_overwrite.cpp we include windows.h first, and we must
preserve that. Place the include in an isolated block so that tools
that sort includes do not move it.
diff --git a/Utilities/Release/WiX/CustomAction/detect_nsis_overwrite.cpp b/Utilities/Release/WiX/CustomAction/detect_nsis_overwrite.cpp
index d6b7ad3..d4f628c 100644
--- a/Utilities/Release/WiX/CustomAction/detect_nsis_overwrite.cpp
+++ b/Utilities/Release/WiX/CustomAction/detect_nsis_overwrite.cpp
@@ -1,6 +1,7 @@
+#include <windows.h>
+
#include <msi.h>
#include <msiquery.h>
-#include <windows.h>
#include <string>
#include <vector>
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ec06b4efb3e8cd6d051fae27ca6f2f3c9cad8722
commit ec06b4efb3e8cd6d051fae27ca6f2f3c9cad8722
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Apr 29 08:12:13 2016 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Fri Apr 29 08:35:41 2016 -0400
CursesDialog: Fix include order to be consistent with rest of CMake
Include cmStandardIncludes.h first in curses dialog translation units.
While at it, ensure that all sources include their first header in a
separate block at the top to preserve it when tools sort includes.
diff --git a/Source/CursesDialog/ccmake.cxx b/Source/CursesDialog/ccmake.cxx
index cf138ee..b7c22b1 100644
--- a/Source/CursesDialog/ccmake.cxx
+++ b/Source/CursesDialog/ccmake.cxx
@@ -9,6 +9,8 @@
implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the License for more information.
============================================================================*/
+#include "cmCursesStandardIncludes.h"
+
#include "../cmDocumentation.h"
#include "../cmSystemTools.h"
#include "../cmake.h"
@@ -17,7 +19,6 @@
#include <sys/ioctl.h>
#include "cmCursesMainForm.h"
-#include "cmCursesStandardIncludes.h"
#include <cmsys/Encoding.hxx>
#include <form.h>
diff --git a/Source/CursesDialog/cmCursesBoolWidget.cxx b/Source/CursesDialog/cmCursesBoolWidget.cxx
index 29d9cb2..0529b78 100644
--- a/Source/CursesDialog/cmCursesBoolWidget.cxx
+++ b/Source/CursesDialog/cmCursesBoolWidget.cxx
@@ -10,6 +10,7 @@
See the License for more information.
============================================================================*/
#include "cmCursesBoolWidget.h"
+
#include "cmCursesMainForm.h"
cmCursesBoolWidget::cmCursesBoolWidget(int width, int height,
diff --git a/Source/CursesDialog/cmCursesBoolWidget.h b/Source/CursesDialog/cmCursesBoolWidget.h
index 8a57c73..65a8ddb 100644
--- a/Source/CursesDialog/cmCursesBoolWidget.h
+++ b/Source/CursesDialog/cmCursesBoolWidget.h
@@ -13,6 +13,7 @@
#define cmCursesBoolWidget_h
#include "cmCursesWidget.h"
+
class cmCursesMainForm;
class cmCursesBoolWidget : public cmCursesWidget
diff --git a/Source/CursesDialog/cmCursesCacheEntryComposite.cxx b/Source/CursesDialog/cmCursesCacheEntryComposite.cxx
index 0e23cc8..40c0eb6 100644
--- a/Source/CursesDialog/cmCursesCacheEntryComposite.cxx
+++ b/Source/CursesDialog/cmCursesCacheEntryComposite.cxx
@@ -10,6 +10,7 @@
See the License for more information.
============================================================================*/
#include "cmCursesCacheEntryComposite.h"
+
#include "../cmState.h"
#include "../cmSystemTools.h"
#include "../cmake.h"
diff --git a/Source/CursesDialog/cmCursesForm.h b/Source/CursesDialog/cmCursesForm.h
index 9837f5a..2c45494 100644
--- a/Source/CursesDialog/cmCursesForm.h
+++ b/Source/CursesDialog/cmCursesForm.h
@@ -12,8 +12,8 @@
#ifndef cmCursesForm_h
#define cmCursesForm_h
-#include "../cmStandardIncludes.h"
#include "cmCursesStandardIncludes.h"
+
#include <cmsys/FStream.hxx>
class cmCursesForm
diff --git a/Source/CursesDialog/cmCursesLabelWidget.h b/Source/CursesDialog/cmCursesLabelWidget.h
index b998eed..c31a58c 100644
--- a/Source/CursesDialog/cmCursesLabelWidget.h
+++ b/Source/CursesDialog/cmCursesLabelWidget.h
@@ -12,7 +12,6 @@
#ifndef cmCursesLabelWidget_h
#define cmCursesLabelWidget_h
-#include "cmCursesStandardIncludes.h"
#include "cmCursesWidget.h"
class cmCursesMainForm;
diff --git a/Source/CursesDialog/cmCursesLongMessageForm.cxx b/Source/CursesDialog/cmCursesLongMessageForm.cxx
index 0bcd387..776d828 100644
--- a/Source/CursesDialog/cmCursesLongMessageForm.cxx
+++ b/Source/CursesDialog/cmCursesLongMessageForm.cxx
@@ -10,6 +10,7 @@
See the License for more information.
============================================================================*/
#include "cmCursesLongMessageForm.h"
+
#include "../cmSystemTools.h"
#include "../cmVersion.h"
#include "../cmake.h"
diff --git a/Source/CursesDialog/cmCursesLongMessageForm.h b/Source/CursesDialog/cmCursesLongMessageForm.h
index 6e37eea..e9bd542 100644
--- a/Source/CursesDialog/cmCursesLongMessageForm.h
+++ b/Source/CursesDialog/cmCursesLongMessageForm.h
@@ -12,10 +12,10 @@
#ifndef cmCursesLongMessageForm_h
#define cmCursesLongMessageForm_h
-#include "../cmStandardIncludes.h"
-#include "cmCursesForm.h"
#include "cmCursesStandardIncludes.h"
+#include "cmCursesForm.h"
+
class cmCursesCacheEntryComposite;
class cmCursesLongMessageForm : public cmCursesForm
diff --git a/Source/CursesDialog/cmCursesMainForm.cxx b/Source/CursesDialog/cmCursesMainForm.cxx
index cda6798..2aafc8b 100644
--- a/Source/CursesDialog/cmCursesMainForm.cxx
+++ b/Source/CursesDialog/cmCursesMainForm.cxx
@@ -10,6 +10,7 @@
See the License for more information.
============================================================================*/
#include "cmCursesMainForm.h"
+
#include "../cmSystemTools.h"
#include "../cmVersion.h"
#include "../cmake.h"
diff --git a/Source/CursesDialog/cmCursesMainForm.h b/Source/CursesDialog/cmCursesMainForm.h
index d194168..9a80ba2 100644
--- a/Source/CursesDialog/cmCursesMainForm.h
+++ b/Source/CursesDialog/cmCursesMainForm.h
@@ -12,10 +12,10 @@
#ifndef cmCursesMainForm_h
#define cmCursesMainForm_h
-#include "../cmStandardIncludes.h"
+#include "cmCursesStandardIncludes.h"
+
#include "../cmState.h"
#include "cmCursesForm.h"
-#include "cmCursesStandardIncludes.h"
class cmCursesCacheEntryComposite;
class cmCursesWidget;
diff --git a/Source/CursesDialog/cmCursesOptionsWidget.cxx b/Source/CursesDialog/cmCursesOptionsWidget.cxx
index 30110a4..05aeab1 100644
--- a/Source/CursesDialog/cmCursesOptionsWidget.cxx
+++ b/Source/CursesDialog/cmCursesOptionsWidget.cxx
@@ -10,6 +10,7 @@
See the License for more information.
============================================================================*/
#include "cmCursesOptionsWidget.h"
+
#include "cmCursesMainForm.h"
inline int ctrl(int z)
diff --git a/Source/CursesDialog/cmCursesOptionsWidget.h b/Source/CursesDialog/cmCursesOptionsWidget.h
index 324014e..ba359d3 100644
--- a/Source/CursesDialog/cmCursesOptionsWidget.h
+++ b/Source/CursesDialog/cmCursesOptionsWidget.h
@@ -13,6 +13,7 @@
#define cmCursesOptionsWidget_h
#include "cmCursesWidget.h"
+
class cmCursesMainForm;
class cmCursesOptionsWidget : public cmCursesWidget
diff --git a/Source/CursesDialog/cmCursesStandardIncludes.h b/Source/CursesDialog/cmCursesStandardIncludes.h
index 6047ec5..69a05b2 100644
--- a/Source/CursesDialog/cmCursesStandardIncludes.h
+++ b/Source/CursesDialog/cmCursesStandardIncludes.h
@@ -11,6 +11,9 @@
============================================================================*/
#ifndef cmCursesStandardIncludes_h
#define cmCursesStandardIncludes_h
+
+#include "../cmStandardIncludes.h"
+
#if defined(__sun__) && defined(__GNUC__)
#define _MSE_INT_H
#endif
diff --git a/Source/CursesDialog/cmCursesStringWidget.cxx b/Source/CursesDialog/cmCursesStringWidget.cxx
index 1c832dd..6bd7b45 100644
--- a/Source/CursesDialog/cmCursesStringWidget.cxx
+++ b/Source/CursesDialog/cmCursesStringWidget.cxx
@@ -10,6 +10,7 @@
See the License for more information.
============================================================================*/
#include "cmCursesStringWidget.h"
+
#include "cmCursesMainForm.h"
inline int ctrl(int z)
diff --git a/Source/CursesDialog/cmCursesWidget.h b/Source/CursesDialog/cmCursesWidget.h
index 7bbdff1..1f53786 100644
--- a/Source/CursesDialog/cmCursesWidget.h
+++ b/Source/CursesDialog/cmCursesWidget.h
@@ -12,9 +12,10 @@
#ifndef cmCursesWidget_h
#define cmCursesWidget_h
-#include "../cmState.h"
#include "cmCursesStandardIncludes.h"
+#include "../cmState.h"
+
class cmCursesMainForm;
class cmCursesWidget
-----------------------------------------------------------------------
Summary of changes:
Source/CursesDialog/ccmake.cxx | 3 ++-
Source/CursesDialog/cmCursesBoolWidget.cxx | 1 +
Source/CursesDialog/cmCursesBoolWidget.h | 1 +
Source/CursesDialog/cmCursesCacheEntryComposite.cxx | 1 +
Source/CursesDialog/cmCursesForm.h | 2 +-
Source/CursesDialog/cmCursesLabelWidget.h | 1 -
Source/CursesDialog/cmCursesLongMessageForm.cxx | 1 +
Source/CursesDialog/cmCursesLongMessageForm.h | 4 ++--
Source/CursesDialog/cmCursesMainForm.cxx | 1 +
Source/CursesDialog/cmCursesMainForm.h | 4 ++--
Source/CursesDialog/cmCursesOptionsWidget.cxx | 1 +
Source/CursesDialog/cmCursesOptionsWidget.h | 1 +
Source/CursesDialog/cmCursesStandardIncludes.h | 3 +++
Source/CursesDialog/cmCursesStringWidget.cxx | 1 +
Source/CursesDialog/cmCursesWidget.h | 3 ++-
Utilities/Release/WiX/CustomAction/detect_nsis_overwrite.cpp | 3 ++-
16 files changed, 22 insertions(+), 9 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list