[Cmake-commits] CMake branch, next, updated. v3.5.2-1226-g2d070e5
Brad King
brad.king at kitware.com
Tue May 3 10:09:22 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 2d070e5637eba6b87ed5a2aa660e724d74941230 (commit)
via 54f71cd72cb6e50ca72004aba80ff1d94f4a6a5a (commit)
via 7b6ffa59b12aaa11f435578cb67e59570bef0453 (commit)
via be14fe4857299ccd5918e6b1f8db0f0587db2850 (commit)
via 5e871f708907d0d70cf3f0f68da6b9cc617f376e (commit)
via a20d7d482113a5eba59bd7a51857c9403e75d7fd (commit)
from 8303318b7f3ff9fe892e3d5e519b37130ae40052 (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=2d070e5637eba6b87ed5a2aa660e724d74941230
commit 2d070e5637eba6b87ed5a2aa660e724d74941230
Merge: 8303318 54f71cd
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue May 3 10:09:21 2016 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue May 3 10:09:21 2016 -0400
Merge topic 'clang-format-include-order' into next
54f71cd7 Source: Sort includes the way clang-format would
7b6ffa59 Source: Sort includes of sys/types.h as clang-format would
be14fe48 Source: Stabilize include order of sys/types.h before sys/stat.h
5e871f70 Tests: Sort includes of sys/types.h as clang-format would
a20d7d48 Tests: Fix Plugin test include order
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=54f71cd72cb6e50ca72004aba80ff1d94f4a6a5a
commit 54f71cd72cb6e50ca72004aba80ff1d94f4a6a5a
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon May 2 15:42:32 2016 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue May 3 10:08:41 2016 -0400
Source: Sort includes the way clang-format would
Re-apply the approach from commit e1c77472 (Format include directive
blocks and ordering with clang-format, 2016-04-29) but this time be
more careful about exclusion of parser generator sources:
$ git ls-files -z -- \
'*.c' '*.cc' '*.cpp' '*.cxx' '*.h' '*.hh' '*.hpp' '*.hxx' |
egrep -z -v '^Source/cmCommandArgumentLexer\.' |
egrep -z -v '^Source/cmCommandArgumentParser\.' |
egrep -z -v '^Source/cmDependsJavaLexer\.' |
egrep -z -v '^Source/cmDependsJavaParser\.' |
egrep -z -v '^Source/cmExprLexer\.' |
egrep -z -v '^Source/cmExprParser\.' |
egrep -z -v '^Source/cmFortranLexer\.' |
egrep -z -v '^Source/cmFortranParser\.' |
egrep -z -v '^Source/cmListFileLexer\.' |
egrep -z -v '^Source/cm_sha2' |
egrep -z -v '^Source/(kwsys|CursesDialog/form)/' |
egrep -z -v '^Utilities/(KW|cm).*/' |
egrep -z -v '^Tests/Module/GenerateExportHeader' |
egrep -z -v '^Tests/RunCMake/CommandLine/cmake_depends/test_UTF-16LE.h' |
xargs -0 clang-format -i
Also drop use of custom sorting for `sys/types.h`.
diff --git a/Source/CPack/WiX/cmWIXPatchParser.h b/Source/CPack/WiX/cmWIXPatchParser.h
index 42c0787..8ce4026 100644
--- a/Source/CPack/WiX/cmWIXPatchParser.h
+++ b/Source/CPack/WiX/cmWIXPatchParser.h
@@ -17,8 +17,8 @@
#include <cmXMLParser.h>
-#include <map>
#include <list>
+#include <map>
struct cmWIXPatchNode
{
diff --git a/Source/cmCommandArgumentParserHelper.cxx b/Source/cmCommandArgumentParserHelper.cxx
index 15ab746..0b2fd81 100644
--- a/Source/cmCommandArgumentParserHelper.cxx
+++ b/Source/cmCommandArgumentParserHelper.cxx
@@ -11,10 +11,10 @@
============================================================================*/
#include "cmCommandArgumentParserHelper.h"
-#include "cmSystemTools.h"
#include "cmMakefile.h"
-#include "cmState.h"
#include "cmOutputConverter.h"
+#include "cmState.h"
+#include "cmSystemTools.h"
#include "cmCommandArgumentLexer.h"
diff --git a/Source/cmDependsJavaParserHelper.cxx b/Source/cmDependsJavaParserHelper.cxx
index 3c02325..51a1cb4 100644
--- a/Source/cmDependsJavaParserHelper.cxx
+++ b/Source/cmDependsJavaParserHelper.cxx
@@ -11,8 +11,8 @@
============================================================================*/
#include "cmDependsJavaParserHelper.h"
-#include "cmSystemTools.h"
#include "cmDependsJavaLexer.h"
+#include "cmSystemTools.h"
#include <cmsys/FStream.hxx>
int cmDependsJava_yyparse( yyscan_t yyscanner );
diff --git a/Source/cmExprParserHelper.cxx b/Source/cmExprParserHelper.cxx
index 6016c4c..c5ecde4 100644
--- a/Source/cmExprParserHelper.cxx
+++ b/Source/cmExprParserHelper.cxx
@@ -11,8 +11,8 @@
============================================================================*/
#include "cmExprParserHelper.h"
-#include "cmSystemTools.h"
#include "cmMakefile.h"
+#include "cmSystemTools.h"
#include "cmExprLexer.h"
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7b6ffa59b12aaa11f435578cb67e59570bef0453
commit 7b6ffa59b12aaa11f435578cb67e59570bef0453
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon May 2 15:05:39 2016 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue May 3 10:08:41 2016 -0400
Source: Sort includes of sys/types.h as clang-format would
When this header is included in blocks where order does not matter, just
place it in lexicographic order as clang-format would by default.
diff --git a/Source/CTest/cmCTestGIT.cxx b/Source/CTest/cmCTestGIT.cxx
index 3ff12c1..19d869c 100644
--- a/Source/CTest/cmCTestGIT.cxx
+++ b/Source/CTest/cmCTestGIT.cxx
@@ -19,8 +19,8 @@
#include <cmsys/Process.h>
#include <cmsys/RegularExpression.hxx>
-#include <sys/types.h>
#include <ctype.h>
+#include <sys/types.h>
#include <time.h>
//----------------------------------------------------------------------------
diff --git a/Source/CTest/cmCTestP4.cxx b/Source/CTest/cmCTestP4.cxx
index f7c960c..b801cfc 100644
--- a/Source/CTest/cmCTestP4.cxx
+++ b/Source/CTest/cmCTestP4.cxx
@@ -17,8 +17,8 @@
#include <cmsys/Process.h>
#include <cmsys/RegularExpression.hxx>
-#include <sys/types.h>
#include <ctype.h>
+#include <sys/types.h>
#include <time.h>
//----------------------------------------------------------------------------
diff --git a/Source/cmGeneratorExpressionEvaluationFile.h b/Source/cmGeneratorExpressionEvaluationFile.h
index f34dadc..b8c824b 100644
--- a/Source/cmGeneratorExpressionEvaluationFile.h
+++ b/Source/cmGeneratorExpressionEvaluationFile.h
@@ -14,8 +14,8 @@
#include "cmGeneratorExpression.h"
-#include <sys/types.h>
#include <cmsys/auto_ptr.hxx>
+#include <sys/types.h>
class cmLocalGenerator;
diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx
index 3177a84..68c1eb8 100644
--- a/Source/cmSystemTools.cxx
+++ b/Source/cmSystemTools.cxx
@@ -42,8 +42,8 @@
// include wincrypt.h after windows.h
# include <wincrypt.h>
#else
-# include <sys/types.h>
# include <sys/time.h>
+# include <sys/types.h>
# include <sys/wait.h>
# include <unistd.h>
# include <utime.h>
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=be14fe4857299ccd5918e6b1f8db0f0587db2850
commit be14fe4857299ccd5918e6b1f8db0f0587db2850
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon May 2 15:03:45 2016 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue May 3 10:08:41 2016 -0400
Source: Stabilize include order of sys/types.h before sys/stat.h
Include the two headers in an isolated block with a comment separating
them so that tools that re-order includes do not re-order these.
diff --git a/Source/CPack/WiX/cmWIXFilesSourceWriter.cxx b/Source/CPack/WiX/cmWIXFilesSourceWriter.cxx
index 446ce96..2833d53 100644
--- a/Source/CPack/WiX/cmWIXFilesSourceWriter.cxx
+++ b/Source/CPack/WiX/cmWIXFilesSourceWriter.cxx
@@ -17,6 +17,7 @@
#include <cmInstalledFile.h>
#include <sys/types.h>
+// include sys/stat.h after sys/types.h
#include <sys/stat.h>
cmWIXFilesSourceWriter::cmWIXFilesSourceWriter(cmCPackLog* logger,
diff --git a/Source/CPack/cmCPackDebGenerator.cxx b/Source/CPack/cmCPackDebGenerator.cxx
index 9e17bc8..794955f 100644
--- a/Source/CPack/cmCPackDebGenerator.cxx
+++ b/Source/CPack/cmCPackDebGenerator.cxx
@@ -761,6 +761,7 @@ std::string cmCPackDebGenerator::GetComponentInstallDirNameSuffix(
*/
#include <sys/types.h>
+// include sys/stat.h after sys/types.h
#include <sys/stat.h>
#include <stdio.h>
diff --git a/Source/CPack/cmCPackSTGZGenerator.cxx b/Source/CPack/cmCPackSTGZGenerator.cxx
index 8a83666..4a8754e 100644
--- a/Source/CPack/cmCPackSTGZGenerator.cxx
+++ b/Source/CPack/cmCPackSTGZGenerator.cxx
@@ -18,8 +18,10 @@
#include "cmSystemTools.h"
#include "cmake.h"
-#include <sys/types.h>
#include <cmsys/FStream.hxx>
+
+#include <sys/types.h>
+// include sys/stat.h after sys/types.h
#include <sys/stat.h>
//----------------------------------------------------------------------
diff --git a/Source/cmFileCommand.cxx b/Source/cmFileCommand.cxx
index 035b97f..575051e 100644
--- a/Source/cmFileCommand.cxx
+++ b/Source/cmFileCommand.cxx
@@ -28,8 +28,10 @@
#endif
#undef GetCurrentDirectory
-#include <sys/types.h>
#include <assert.h>
+
+#include <sys/types.h>
+// include sys/stat.h after sys/types.h
#include <sys/stat.h>
#include <cmsys/Directory.hxx>
diff --git a/Source/cmTimestamp.cxx b/Source/cmTimestamp.cxx
index 7d1ba32..b5c9d8e 100644
--- a/Source/cmTimestamp.cxx
+++ b/Source/cmTimestamp.cxx
@@ -13,9 +13,10 @@
#include <cstdlib>
#include <cstring>
+#include <sstream>
#include <sys/types.h>
-#include <sstream>
+// include sys/stat.h after sys/types.h
#include <sys/stat.h>
//----------------------------------------------------------------------------
diff --git a/Source/cmWriteFileCommand.cxx b/Source/cmWriteFileCommand.cxx
index d52d6b5..c4468f3 100644
--- a/Source/cmWriteFileCommand.cxx
+++ b/Source/cmWriteFileCommand.cxx
@@ -14,6 +14,7 @@
#include <cmsys/FStream.hxx>
#include <sys/types.h>
+// include sys/stat.h after sys/types.h
#include <sys/stat.h>
// cmLibraryCommand
diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index da6e59e..f176cc1 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -99,11 +99,12 @@
# include "cmGlobalXCodeGenerator.h"
# define CMAKE_USE_XCODE 1
# endif
-# include <sys/types.h>
# include <sys/resource.h>
# include <sys/time.h>
#endif
+#include <sys/types.h>
+// include sys/stat.h after sys/types.h
#include <sys/stat.h> // struct stat
#include <list>
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5e871f708907d0d70cf3f0f68da6b9cc617f376e
commit 5e871f708907d0d70cf3f0f68da6b9cc617f376e
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon May 2 15:09:33 2016 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue May 3 10:08:41 2016 -0400
Tests: Sort includes of sys/types.h as clang-format would
diff --git a/Tests/TestsWorkingDirectory/main.c b/Tests/TestsWorkingDirectory/main.c
index 3616f8e..d4b760c 100644
--- a/Tests/TestsWorkingDirectory/main.c
+++ b/Tests/TestsWorkingDirectory/main.c
@@ -38,8 +38,8 @@ static const char* Getcwd(char* buf, unsigned int len)
}
#else
-#include <sys/types.h>
#include <fcntl.h>
+#include <sys/types.h>
#include <unistd.h>
static const char* Getcwd(char* buf, unsigned int len)
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a20d7d482113a5eba59bd7a51857c9403e75d7fd
commit a20d7d482113a5eba59bd7a51857c9403e75d7fd
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue May 3 09:20:42 2016 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue May 3 10:08:41 2016 -0400
Tests: Fix Plugin test include order
Fix the order accidentally broken by commit e1c77472 (Format include
directive blocks and ordering with clang-format, 2016-04-29). Include
the KWSys header first in its own block so that it is not moved by tools
that re-order includes. It must be included first to define large file
support macros consistently.
diff --git a/Tests/Plugin/src/example_exe.cxx b/Tests/Plugin/src/example_exe.cxx
index 393bb68..fd23e8f 100644
--- a/Tests/Plugin/src/example_exe.cxx
+++ b/Tests/Plugin/src/example_exe.cxx
@@ -1,9 +1,10 @@
+#include <kwsys/DynamicLoader.hxx>
+
#include <example.h>
#include <example_exe.h>
#include <iostream>
-#include <kwsys/DynamicLoader.hxx>
#include <string>
#include <stdio.h>
-----------------------------------------------------------------------
Summary of changes:
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list