diff options
| author | Brad King <brad.king@kitware.com> | 2016-04-29 14:53:13 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-04-29 17:58:54 (GMT) |
| commit | e1c7747253ac71a5215dd32a910b62a1fd8c561a (patch) | |
| tree | dd4f8bf9663bf7a64c01d9391c3559f7b419dcb7 /Source/cmSystemTools.cxx | |
| parent | 180538c70634dd6dc7fc68b4afbc1cd288c5b5c6 (diff) | |
| download | CMake-e1c7747253ac71a5215dd32a910b62a1fd8c561a.zip CMake-e1c7747253ac71a5215dd32a910b62a1fd8c561a.tar.gz CMake-e1c7747253ac71a5215dd32a910b62a1fd8c561a.tar.bz2 | |
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>
Diffstat (limited to 'Source/cmSystemTools.cxx')
| -rw-r--r-- | Source/cmSystemTools.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx index 2cf2546..3177a84 100644 --- a/Source/cmSystemTools.cxx +++ b/Source/cmSystemTools.cxx @@ -12,20 +12,20 @@ #include "cmSystemTools.h" #include "cmAlgorithms.h" +#include <assert.h> #include <ctype.h> #include <errno.h> -#include <time.h> -#include <string.h> #include <stdlib.h> -#include <assert.h> +#include <string.h> +#include <time.h> #ifdef __QNX__ # include <malloc.h> /* for malloc/free on QNX */ #endif +#include <cmsys/Directory.hxx> +#include <cmsys/Encoding.hxx> #include <cmsys/Glob.hxx> #include <cmsys/RegularExpression.hxx> -#include <cmsys/Directory.hxx> #include <cmsys/System.h> -#include <cmsys/Encoding.hxx> #if defined(CMAKE_BUILD_WITH_CMAKE) # include "cmArchiveWrite.h" # include "cmLocale.h" @@ -42,11 +42,11 @@ // include wincrypt.h after windows.h # include <wincrypt.h> #else -# include <sys/time.h> # include <sys/types.h> +# include <sys/time.h> +# include <sys/wait.h> # include <unistd.h> # include <utime.h> -# include <sys/wait.h> #endif #if defined(__APPLE__) |