mirror of
https://github.com/Kitware/CMake.git
synced 2026-04-22 14:23:10 -05:00
Brad King
e1c7747253
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>
42 lines
733 B
C++
42 lines
733 B
C++
|
|
#include "consumer.h"
|
|
#include "common.h"
|
|
#include "interfaceinclude.h"
|
|
#include "publicinclude.h"
|
|
#include "relative_dir.h"
|
|
#ifdef TEST_LANG_DEFINES
|
|
#include "cxx_only.h"
|
|
#endif
|
|
|
|
#ifdef PRIVATEINCLUDE_DEFINE
|
|
#error Unexpected PRIVATEINCLUDE_DEFINE
|
|
#endif
|
|
|
|
#ifndef PUBLICINCLUDE_DEFINE
|
|
#error Expected PUBLICINCLUDE_DEFINE
|
|
#endif
|
|
|
|
#ifndef INTERFACEINCLUDE_DEFINE
|
|
#error Expected INTERFACEINCLUDE_DEFINE
|
|
#endif
|
|
|
|
#ifndef CURE_DEFINE
|
|
#error Expected CURE_DEFINE
|
|
#endif
|
|
|
|
#ifndef RELATIVE_DIR_DEFINE
|
|
#error Expected RELATIVE_DIR_DEFINE
|
|
#endif
|
|
|
|
#ifndef CONSUMER_DEFINE
|
|
#error Expected CONSUMER_DEFINE
|
|
#endif
|
|
|
|
#ifdef TEST_LANG_DEFINES
|
|
#ifndef CXX_ONLY_DEFINE
|
|
#error Expected CXX_ONLY_DEFINE
|
|
#endif
|
|
#endif
|
|
|
|
int main() { return 0; }
|