mirror of
https://github.com/Kitware/CMake.git
synced 2026-01-06 05:40:54 -06:00
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>
This commit is contained in:
@@ -1,8 +1,8 @@
|
||||
// A simple program that computes the square root of a number
|
||||
#include "TutorialConfig.h"
|
||||
#include <math.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <math.h>
|
||||
#include "TutorialConfig.h"
|
||||
|
||||
int main (int argc, char *argv[])
|
||||
{
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
#include <stdio.h>
|
||||
#include "MathFunctions.h"
|
||||
#include <stdio.h>
|
||||
|
||||
// a hack square root calculation using simple operations
|
||||
double mysqrt(double x)
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
// A simple program that computes the square root of a number
|
||||
#include "TutorialConfig.h"
|
||||
#include <math.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <math.h>
|
||||
#include "TutorialConfig.h"
|
||||
|
||||
#ifdef USE_MYMATH
|
||||
#include "MathFunctions.h"
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
#include <stdio.h>
|
||||
#include "MathFunctions.h"
|
||||
#include <stdio.h>
|
||||
|
||||
// a hack square root calculation using simple operations
|
||||
double mysqrt(double x)
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
// A simple program that computes the square root of a number
|
||||
#include "TutorialConfig.h"
|
||||
#include <math.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <math.h>
|
||||
#include "TutorialConfig.h"
|
||||
|
||||
#ifdef USE_MYMATH
|
||||
#include "MathFunctions.h"
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#include <stdio.h>
|
||||
#include "MathFunctions.h"
|
||||
#include "TutorialConfig.h"
|
||||
#include <stdio.h>
|
||||
|
||||
#include <math.h>
|
||||
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
// A simple program that computes the square root of a number
|
||||
#include "TutorialConfig.h"
|
||||
#include <math.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <math.h>
|
||||
#include "TutorialConfig.h"
|
||||
|
||||
#ifdef USE_MYMATH
|
||||
#include "MathFunctions.h"
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
// A simple program that builds a sqrt table
|
||||
#include <stdio.h>
|
||||
#include <math.h>
|
||||
#include <stdio.h>
|
||||
|
||||
int main (int argc, char *argv[])
|
||||
{
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#include <stdio.h>
|
||||
#include "MathFunctions.h"
|
||||
#include "TutorialConfig.h"
|
||||
#include <stdio.h>
|
||||
|
||||
// include the generated table
|
||||
#include "Table.h"
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
// A simple program that computes the square root of a number
|
||||
#include "TutorialConfig.h"
|
||||
#include <math.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <math.h>
|
||||
#include "TutorialConfig.h"
|
||||
|
||||
#ifdef USE_MYMATH
|
||||
#include "MathFunctions.h"
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
// A simple program that builds a sqrt table
|
||||
#include <stdio.h>
|
||||
#include <math.h>
|
||||
#include <stdio.h>
|
||||
|
||||
int main (int argc, char *argv[])
|
||||
{
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#include <stdio.h>
|
||||
#include "MathFunctions.h"
|
||||
#include "TutorialConfig.h"
|
||||
#include <stdio.h>
|
||||
|
||||
// include the generated table
|
||||
#include "Table.h"
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
// A simple program that computes the square root of a number
|
||||
#include "TutorialConfig.h"
|
||||
#include <math.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <math.h>
|
||||
#include "TutorialConfig.h"
|
||||
|
||||
#ifdef USE_MYMATH
|
||||
#include "MathFunctions.h"
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
// A simple program that builds a sqrt table
|
||||
#include <stdio.h>
|
||||
#include <math.h>
|
||||
#include <stdio.h>
|
||||
|
||||
int main (int argc, char *argv[])
|
||||
{
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#include <stdio.h>
|
||||
#include "MathFunctions.h"
|
||||
#include "TutorialConfig.h"
|
||||
#include <stdio.h>
|
||||
|
||||
// include the generated table
|
||||
#include "Table.h"
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
// A simple program that computes the square root of a number
|
||||
#include "TutorialConfig.h"
|
||||
#include <math.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <math.h>
|
||||
#include "TutorialConfig.h"
|
||||
|
||||
#ifdef USE_MYMATH
|
||||
#include "MathFunctions.h"
|
||||
|
||||
Reference in New Issue
Block a user