Format include directive blocks and ordering with clang-format

Sort include directives within each block (separated by a blank line) in
lexicographic order (except to prioritize `sys/types.h` first).  First
run `clang-format` with the config file:

    ---
    SortIncludes: false
    ...

Commit the result temporarily.  Then run `clang-format` again with:

    ---
    SortIncludes: true
    IncludeCategories:
      - Regex:    'sys/types.h'
        Priority: -1
    ...

Commit the result temporarily.  Start a new branch and cherry-pick the
second commit.  Manually resolve conflicts to preserve indentation of
re-ordered includes.  This cleans up the include ordering without
changing any other style.

Use the following command to run `clang-format`:

    $ git ls-files -z -- \
        '*.c' '*.cc' '*.cpp' '*.cxx' '*.h' '*.hh' '*.hpp' '*.hxx' |
      egrep -z -v '(Lexer|Parser|ParserHelper)\.' |
      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

This selects source files that do not come from a third-party.

Inspired-by: Daniel Pfeifer <daniel@pfeifer-mail.de>

1 files changed, 13 insertions, 13 deletions

diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 29b947c..3bc1181 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -11,37 +11,37 @@
 ============================================================================*/
 #include "cmMakefile.h"
 
-#include "cmVersion.h"
 #include "cmCommand.h"
-#include "cmSourceFile.h"
-#include "cmSourceFileLocation.h"
-#include "cmSystemTools.h"
-#include "cmGlobalGenerator.h"
+#include "cmCommandArgumentParserHelper.h"
 #include "cmCommands.h"
-#include "cmState.h"
-#include "cmOutputConverter.h"
 #include "cmFunctionBlocker.h"
+#include "cmGeneratorExpression.h"
 #include "cmGeneratorExpressionEvaluationFile.h"
+#include "cmGlobalGenerator.h"
 #include "cmListFileCache.h"
-#include "cmCommandArgumentParserHelper.h"
-#include "cmGeneratorExpression.h"
+#include "cmOutputConverter.h"
+#include "cmSourceFile.h"
+#include "cmSourceFileLocation.h"
+#include "cmState.h"
+#include "cmSystemTools.h"
 #include "cmTest.h"
+#include "cmVersion.h"
 #ifdef CMAKE_BUILD_WITH_CMAKE
 #  include "cmVariableWatch.h"
 #endif
+#include "cmAlgorithms.h"
 #include "cmInstallGenerator.h"
 #include "cmTestGenerator.h"
-#include "cmAlgorithms.h"
 #include "cmake.h"
 #include <stdlib.h> // required for atoi
 
-#include <cmsys/RegularExpression.hxx>
 #include <cmsys/FStream.hxx>
+#include <cmsys/RegularExpression.hxx>
 #include <cmsys/auto_ptr.hxx>
 
-#include <list>
-#include <ctype.h> // for isspace
 #include <assert.h>
+#include <ctype.h> // for isspace
+#include <list>
 
 // default is not to be building executables
 cmMakefile::cmMakefile(cmGlobalGenerator* globalGenerator,