Commit 5afac50f authored by Daniel Pfeifer's avatar Daniel Pfeifer
Browse files

cmConfigure: Ensure separate include block in headers

Make sure that `#include <cmConfigure.h>` is followed by an empty line
in header files.  This is necessary to make sure that changing <> to ""
does not affect the include ordering of clang-format.

Automate with:

git grep -l '#include <cmConfigure.h>' | grep -v '.cxx$' \
| xargs sed -i '/#include <cmConfigure.h>/ { N; N; s/\n\{1,2\}/\n\n/ }'
parent ff4fa70c
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
#define cmCPackBundleGenerator_h #define cmCPackBundleGenerator_h
#include <cmConfigure.h> #include <cmConfigure.h>
#include <string> #include <string>
#include "cmCPackDragNDropGenerator.h" #include "cmCPackDragNDropGenerator.h"
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
#define cmCPackDragNDropGenerator_h #define cmCPackDragNDropGenerator_h
#include <cmConfigure.h> #include <cmConfigure.h>
#include <sstream> #include <sstream>
#include <stddef.h> #include <stddef.h>
#include <string> #include <string>
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
#define cmCPackOSXX11Generator_h #define cmCPackOSXX11Generator_h
#include <cmConfigure.h> #include <cmConfigure.h>
#include <string> #include <string>
#include "cmCPackGenerator.h" #include "cmCPackGenerator.h"
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
#define cmCPackPKGGenerator_h #define cmCPackPKGGenerator_h
#include <cmConfigure.h> #include <cmConfigure.h>
#include <set> #include <set>
#include <sstream> #include <sstream>
#include <string> #include <string>
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
#define cmCPackProductBuildGenerator_h #define cmCPackProductBuildGenerator_h
#include <cmConfigure.h> #include <cmConfigure.h>
#include <string> #include <string>
#include "cmCPackGenerator.h" #include "cmCPackGenerator.h"
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
#define cmAddCompileOptionsCommand_h #define cmAddCompileOptionsCommand_h
#include <cmConfigure.h> #include <cmConfigure.h>
#include <string> #include <string>
#include <vector> #include <vector>
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
#define cmAddCustomCommandCommand_h #define cmAddCustomCommandCommand_h
#include <cmConfigure.h> #include <cmConfigure.h>
#include <string> #include <string>
#include <vector> #include <vector>
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
#define cmAddCustomTargetCommand_h #define cmAddCustomTargetCommand_h
#include <cmConfigure.h> #include <cmConfigure.h>
#include <string> #include <string>
#include <vector> #include <vector>
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
#define cmAddDefinitionsCommand_h #define cmAddDefinitionsCommand_h
#include <cmConfigure.h> #include <cmConfigure.h>
#include <string> #include <string>
#include <vector> #include <vector>
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
#define cmDependenciessCommand_h #define cmDependenciessCommand_h
#include <cmConfigure.h> #include <cmConfigure.h>
#include <string> #include <string>
#include <vector> #include <vector>
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
#define cmExecutablesCommand_h #define cmExecutablesCommand_h
#include <cmConfigure.h> #include <cmConfigure.h>
#include <string> #include <string>
#include <vector> #include <vector>
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
#define cmLibrarysCommand_h #define cmLibrarysCommand_h
#include <cmConfigure.h> #include <cmConfigure.h>
#include <string> #include <string>
#include <vector> #include <vector>
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
#define cmAddSubDirectoryCommand_h #define cmAddSubDirectoryCommand_h
#include <cmConfigure.h> #include <cmConfigure.h>
#include <string> #include <string>
#include <vector> #include <vector>
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
#define cmAddTestCommand_h #define cmAddTestCommand_h
#include <cmConfigure.h> #include <cmConfigure.h>
#include <string> #include <string>
#include <vector> #include <vector>
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
#define cmAuxSourceDirectoryCommand_h #define cmAuxSourceDirectoryCommand_h
#include <cmConfigure.h> #include <cmConfigure.h>
#include <string> #include <string>
#include <vector> #include <vector>
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
#define cmBreakCommand_h #define cmBreakCommand_h
#include <cmConfigure.h> #include <cmConfigure.h>
#include <string> #include <string>
#include <vector> #include <vector>
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
#define cmBuildCommand_h #define cmBuildCommand_h
#include <cmConfigure.h> #include <cmConfigure.h>
#include <string> #include <string>
#include <vector> #include <vector>
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
#define cmBuildNameCommand_h #define cmBuildNameCommand_h
#include <cmConfigure.h> #include <cmConfigure.h>
#include <string> #include <string>
#include <vector> #include <vector>
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
#define cmCMakeHostSystemInformationCommand_h #define cmCMakeHostSystemInformationCommand_h
#include <cmConfigure.h> #include <cmConfigure.h>
#include <stddef.h> #include <stddef.h>
#include <string> #include <string>
#include <vector> #include <vector>
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
#define cmCMakeMinimumRequired_h #define cmCMakeMinimumRequired_h
#include <cmConfigure.h> #include <cmConfigure.h>
#include <string> #include <string>
#include <vector> #include <vector>
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
#define cmCMakePolicyCommand_h #define cmCMakePolicyCommand_h
#include <cmConfigure.h> #include <cmConfigure.h>
#include <string> #include <string>
#include <vector> #include <vector>
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
#define cmCommand_h #define cmCommand_h
#include <cmConfigure.h> #include <cmConfigure.h>
#include <string> #include <string>
#include <vector> #include <vector>
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
#define cmCommonTargetGenerator_h #define cmCommonTargetGenerator_h
#include <cmConfigure.h> // IWYU pragma: keep #include <cmConfigure.h> // IWYU pragma: keep
#include <map> #include <map>
#include <string> #include <string>
#include <vector> #include <vector>
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
#define cmConfigureFileCommand_h #define cmConfigureFileCommand_h
#include <cmConfigure.h> #include <cmConfigure.h>
#include <string> #include <string>
#include <vector> #include <vector>
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
#define cmContinueCommand_h #define cmContinueCommand_h
#include <cmConfigure.h> #include <cmConfigure.h>
#include <string> #include <string>
#include <vector> #include <vector>
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
#define cmDefinesPropertyCommand_h #define cmDefinesPropertyCommand_h
#include <cmConfigure.h> #include <cmConfigure.h>
#include <string> #include <string>
#include <vector> #include <vector>
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
#define cmFortran_h #define cmFortran_h
#include <cmConfigure.h> #include <cmConfigure.h>
#include <iosfwd> #include <iosfwd>
#include <set> #include <set>
#include <string> #include <string>
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
#define cmDisallowedCommand_h #define cmDisallowedCommand_h
#include <cmConfigure.h> #include <cmConfigure.h>
#include <string> #include <string>
#include <vector> #include <vector>
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
#define cmEnableLanguageCommand_h #define cmEnableLanguageCommand_h
#include <cmConfigure.h> #include <cmConfigure.h>
#include <string> #include <string>
#include <vector> #include <vector>
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
#define cmEnableTestingCommand_h #define cmEnableTestingCommand_h
#include <cmConfigure.h> #include <cmConfigure.h>
#include <string> #include <string>
#include <vector> #include <vector>
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
#define cmExecProgramCommand_h #define cmExecProgramCommand_h
#include <cmConfigure.h> #include <cmConfigure.h>
#include <string> #include <string>
#include <vector> #include <vector>
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
#define cmExecuteProcessCommand_h #define cmExecuteProcessCommand_h
#include <cmConfigure.h> #include <cmConfigure.h>
#include <string> #include <string>
#include <vector> #include <vector>
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
#define cmExportCommand_h #define cmExportCommand_h
#include <cmConfigure.h> #include <cmConfigure.h>
#include <string> #include <string>
#include <vector> #include <vector>
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
#define cmExportLibraryDependenciesCommand_h #define cmExportLibraryDependenciesCommand_h
#include <cmConfigure.h> #include <cmConfigure.h>
#include <string> #include <string>
#include <vector> #include <vector>
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
#define cmFLTKWrapUICommand_h #define cmFLTKWrapUICommand_h
#include <cmConfigure.h> #include <cmConfigure.h>
#include <string> #include <string>
#include <vector> #include <vector>
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
#define cmFileCommand_h #define cmFileCommand_h
#include <cmConfigure.h> #include <cmConfigure.h>
#include <string> #include <string>
#include <vector> #include <vector>
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
#define cmFindFileCommand_h #define cmFindFileCommand_h
#include <cmConfigure.h> #include <cmConfigure.h>
#include <string> #include <string>
#include "cmFindPathCommand.h" #include "cmFindPathCommand.h"
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
#define cmFindLibraryCommand_h #define cmFindLibraryCommand_h
#include <cmConfigure.h> #include <cmConfigure.h>
#include <string> #include <string>
#include <vector> #include <vector>
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
#define cmFindPackageCommand_h #define cmFindPackageCommand_h
#include <cmConfigure.h> #include <cmConfigure.h>
#include <cm_kwiml.h> #include <cm_kwiml.h>
#include <map> #include <map>
#include <set> #include <set>
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
#define cmFindPathCommand_h #define cmFindPathCommand_h
#include <cmConfigure.h> #include <cmConfigure.h>
#include <string> #include <string>
#include <vector> #include <vector>
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
#define cmFindProgramCommand_h #define cmFindProgramCommand_h
#include <cmConfigure.h> #include <cmConfigure.h>
#include <string> #include <string>
#include <vector> #include <vector>
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
#define cmForEachCommand_h #define cmForEachCommand_h
#include <cmConfigure.h> #include <cmConfigure.h>
#include <string> #include <string>
#include <vector> #include <vector>
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
#define cmFunctionCommand_h #define cmFunctionCommand_h
#include <cmConfigure.h> #include <cmConfigure.h>
#include <string> #include <string>
#include <vector> #include <vector>
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
#define cmGetCMakePropertyCommand_h #define cmGetCMakePropertyCommand_h
#include <cmConfigure.h> #include <cmConfigure.h>
#include <string> #include <string>
#include <vector> #include <vector>
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
#define cmGetDirectoryPropertyCommand_h #define cmGetDirectoryPropertyCommand_h
#include <cmConfigure.h> #include <cmConfigure.h>