Commit 54f71cd7 authored by Brad King's avatar Brad King
Browse files

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`.
parent 7b6ffa59
......@@ -17,8 +17,8 @@
#include <cmXMLParser.h>
#include <map>
#include <list>
#include <map>
struct cmWIXPatchNode
{
......
......@@ -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"
......
......@@ -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 );
......
......@@ -11,8 +11,8 @@
============================================================================*/
#include "cmExprParserHelper.h"
#include "cmSystemTools.h"
#include "cmMakefile.h"
#include "cmSystemTools.h"
#include "cmExprLexer.h"
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment