Merge topic 'clang-format-include-order'

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

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,

Source/CPack/WiX/cmWIXPatchParser.h

@@ -17,8 +17,8 @@
 
 #include <cmXMLParser.h>
 
-#include <map>
 #include <list>
+#include <map>
 
 struct cmWIXPatchNode
 {

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>

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>
 
 //----------------------------------------------------------------------

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>
 
 //----------------------------------------------------------------------------

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>
 
 //----------------------------------------------------------------------------

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"
 

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 );

Source/cmExprParserHelper.cxx

@@ -11,8 +11,8 @@
 ============================================================================*/
 #include "cmExprParserHelper.h"
 
-#include "cmSystemTools.h"
 #include "cmMakefile.h"
+#include "cmSystemTools.h"
 
 #include "cmExprLexer.h"
 

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>

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;
 

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>

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>
 
 //----------------------------------------------------------------------------

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

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>

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>

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)