[Cmake-commits] CMake branch, next, updated. v3.5.2-1159-g4c7ab27
Brad King
brad.king at kitware.com
Fri Apr 29 13:25:18 EDT 2016
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via 4c7ab27d204dadee1463a35ac31b7ffc26c44ed6 (commit)
via 1be9bc2241f1039adaab0cc2ae80d7a8d8b7b8fe (commit)
via b0c37083f7705ab448562dfe351ce248a0c28397 (commit)
via 0e7bca923e65df8fda37dd50ca68c7207eb3acbe (commit)
via eb817be034e0fd50b7abfc3ae032e2e06cbfd040 (commit)
via eda313b485a9252c176090a8c358127a2116551d (commit)
via 7110b754fe8dc82c4e18c7de72e8eedcec4561da (commit)
via d7a5f25599552b0d4dc7af59fef8af1addc090f1 (commit)
from 7026a451c7f7ed69095de04a9415b7f9bf38f5bd (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4c7ab27d204dadee1463a35ac31b7ffc26c44ed6
commit 4c7ab27d204dadee1463a35ac31b7ffc26c44ed6
Merge: 7026a45 1be9bc2
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Apr 29 13:25:10 2016 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Apr 29 13:25:10 2016 -0400
Merge topic 'clang-format-include-order' into next
1be9bc22 Format include directive blocks and ordering with clang-format
b0c37083 Source: Stabilize include order
0e7bca92 Utilities/Release: Stabilize include order in WiX custom action
eb817be0 Tests: Stabilize include order in MFC, VSXaml, and VSWinStorePhone
eda313b4 Tests: Stabilize include order in StringFileTest
7110b754 CursesDialog: add missing cmState include
d7a5f255 Modules: Remove unused CMakeTestWatcomVersion.c file
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1be9bc2241f1039adaab0cc2ae80d7a8d8b7b8fe
commit 1be9bc2241f1039adaab0cc2ae80d7a8d8b7b8fe
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Apr 29 10:53:13 2016 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Fri Apr 29 11:23:25 2016 -0400
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 at pfeifer-mail.de>
diff --git a/Modules/CheckForPthreads.c b/Modules/CheckForPthreads.c
index 344c81b..9629a66 100644
--- a/Modules/CheckForPthreads.c
+++ b/Modules/CheckForPthreads.c
@@ -1,5 +1,5 @@
-#include <stdio.h>
#include <pthread.h>
+#include <stdio.h>
#include <unistd.h>
void* runner(void*);
diff --git a/Source/CPack/IFW/cmCPackIFWGenerator.cxx b/Source/CPack/IFW/cmCPackIFWGenerator.cxx
index 50ac971..c10803c 100644
--- a/Source/CPack/IFW/cmCPackIFWGenerator.cxx
+++ b/Source/CPack/IFW/cmCPackIFWGenerator.cxx
@@ -12,24 +12,24 @@
#include "cmCPackIFWGenerator.h"
-#include "cmCPackIFWPackage.h"
#include "cmCPackIFWInstaller.h"
+#include "cmCPackIFWPackage.h"
-#include <CPack/cmCPackLog.h>
#include <CPack/cmCPackComponentGroup.h>
+#include <CPack/cmCPackLog.h>
-#include <cmsys/SystemTools.hxx>
-#include <cmsys/Glob.hxx>
#include <cmsys/Directory.hxx>
+#include <cmsys/Glob.hxx>
#include <cmsys/RegularExpression.hxx>
+#include <cmsys/SystemTools.hxx>
+#include <cmGeneratedFileStream.h>
#include <cmGlobalGenerator.h>
-#include <cmSystemTools.h>
#include <cmMakefile.h>
-#include <cmGeneratedFileStream.h>
-#include <cmXMLWriter.h>
-#include <cmVersionConfig.h>
+#include <cmSystemTools.h>
#include <cmTimestamp.h>
+#include <cmVersionConfig.h>
+#include <cmXMLWriter.h>
//----------------------------------------------------------------------------
cmCPackIFWGenerator::cmCPackIFWGenerator()
diff --git a/Source/CPack/IFW/cmCPackIFWGenerator.h b/Source/CPack/IFW/cmCPackIFWGenerator.h
index 5770451..001c8c7 100644
--- a/Source/CPack/IFW/cmCPackIFWGenerator.h
+++ b/Source/CPack/IFW/cmCPackIFWGenerator.h
@@ -15,8 +15,8 @@
#include <CPack/cmCPackGenerator.h>
-#include "cmCPackIFWPackage.h"
#include "cmCPackIFWInstaller.h"
+#include "cmCPackIFWPackage.h"
class cmXMLWriter;
diff --git a/Source/CPack/OSXScriptLauncher.cxx b/Source/CPack/OSXScriptLauncher.cxx
index c271517..b3ddeee 100644
--- a/Source/CPack/OSXScriptLauncher.cxx
+++ b/Source/CPack/OSXScriptLauncher.cxx
@@ -9,9 +9,9 @@
implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the License for more information.
============================================================================*/
-#include <cmsys/SystemTools.hxx>
-#include <cmsys/Process.h>
#include <cmsys/FStream.hxx>
+#include <cmsys/Process.h>
+#include <cmsys/SystemTools.hxx>
#include <iostream>
diff --git a/Source/CPack/WiX/cmCPackWIXGenerator.cxx b/Source/CPack/WiX/cmCPackWIXGenerator.cxx
index ece327a..a98c684 100644
--- a/Source/CPack/WiX/cmCPackWIXGenerator.cxx
+++ b/Source/CPack/WiX/cmCPackWIXGenerator.cxx
@@ -12,23 +12,23 @@
#include "cmCPackWIXGenerator.h"
-#include <cmSystemTools.h>
-#include <cmGeneratedFileStream.h>
+#include <CPack/cmCPackComponentGroup.h>
+#include <CPack/cmCPackLog.h>
#include <cmCryptoHash.h>
+#include <cmGeneratedFileStream.h>
#include <cmInstalledFile.h>
-#include <CPack/cmCPackLog.h>
-#include <CPack/cmCPackComponentGroup.h>
+#include <cmSystemTools.h>
-#include "cmWIXSourceWriter.h"
#include "cmWIXDirectoriesSourceWriter.h"
#include "cmWIXFeaturesSourceWriter.h"
#include "cmWIXFilesSourceWriter.h"
#include "cmWIXRichTextFormatWriter.h"
+#include "cmWIXSourceWriter.h"
-#include <cmsys/SystemTools.hxx>
#include <cmsys/Directory.hxx>
#include <cmsys/Encoding.hxx>
#include <cmsys/FStream.hxx>
+#include <cmsys/SystemTools.hxx>
#include <rpc.h> // for GUID generation
diff --git a/Source/CPack/WiX/cmCPackWIXGenerator.h b/Source/CPack/WiX/cmCPackWIXGenerator.h
index 8372cd6..871527b 100644
--- a/Source/CPack/WiX/cmCPackWIXGenerator.h
+++ b/Source/CPack/WiX/cmCPackWIXGenerator.h
@@ -18,8 +18,8 @@
#include "cmWIXPatch.h"
#include "cmWIXShortcut.h"
-#include <string>
#include <map>
+#include <string>
class cmWIXSourceWriter;
class cmWIXDirectoriesSourceWriter;
diff --git a/Source/CPack/WiX/cmWIXAccessControlList.h b/Source/CPack/WiX/cmWIXAccessControlList.h
index 54c2c19..7293995 100644
--- a/Source/CPack/WiX/cmWIXAccessControlList.h
+++ b/Source/CPack/WiX/cmWIXAccessControlList.h
@@ -15,8 +15,8 @@
#include "cmWIXSourceWriter.h"
-#include <cmInstalledFile.h>
#include <CPack/cmCPackLog.h>
+#include <cmInstalledFile.h>
class cmWIXAccessControlList
{
diff --git a/Source/CPack/WiX/cmWIXFilesSourceWriter.h b/Source/CPack/WiX/cmWIXFilesSourceWriter.h
index 9df955b..734f901 100644
--- a/Source/CPack/WiX/cmWIXFilesSourceWriter.h
+++ b/Source/CPack/WiX/cmWIXFilesSourceWriter.h
@@ -15,8 +15,8 @@
#include "cmWIXSourceWriter.h"
-#include "cmWIXShortcut.h"
#include "cmWIXPatch.h"
+#include "cmWIXShortcut.h"
#include <CPack/cmCPackGenerator.h>
diff --git a/Source/CPack/WiX/cmWIXPatch.h b/Source/CPack/WiX/cmWIXPatch.h
index 2f31a01..5b0eb3b 100644
--- a/Source/CPack/WiX/cmWIXPatch.h
+++ b/Source/CPack/WiX/cmWIXPatch.h
@@ -13,8 +13,8 @@
#ifndef cmWIXPatch_h
#define cmWIXPatch_h
-#include "cmWIXSourceWriter.h"
#include "cmWIXPatchParser.h"
+#include "cmWIXSourceWriter.h"
#include <string>
diff --git a/Source/CPack/WiX/cmWIXShortcut.h b/Source/CPack/WiX/cmWIXShortcut.h
index 2a72394..598aa0d 100644
--- a/Source/CPack/WiX/cmWIXShortcut.h
+++ b/Source/CPack/WiX/cmWIXShortcut.h
@@ -15,9 +15,9 @@
#include <cmInstalledFile.h>
-#include <string>
#include <map>
#include <set>
+#include <string>
#include <vector>
class cmWIXFilesSourceWriter;
diff --git a/Source/CPack/WiX/cmWIXSourceWriter.h b/Source/CPack/WiX/cmWIXSourceWriter.h
index be0c169..2bf9674 100644
--- a/Source/CPack/WiX/cmWIXSourceWriter.h
+++ b/Source/CPack/WiX/cmWIXSourceWriter.h
@@ -17,8 +17,8 @@
#include <cmsys/FStream.hxx>
-#include <vector>
#include <string>
+#include <vector>
/** \class cmWIXSourceWriter
* \brief Helper class to generate XML WiX source files
diff --git a/Source/CPack/cmCPackArchiveGenerator.cxx b/Source/CPack/cmCPackArchiveGenerator.cxx
index db985db..37e8bf0 100644
--- a/Source/CPack/cmCPackArchiveGenerator.cxx
+++ b/Source/CPack/cmCPackArchiveGenerator.cxx
@@ -12,17 +12,17 @@
#include "cmCPackArchiveGenerator.h"
-#include "cmake.h"
+#include "cmCPackLog.h"
+#include "cmGeneratedFileStream.h"
#include "cmGlobalGenerator.h"
-#include "cmSystemTools.h"
#include "cmMakefile.h"
-#include "cmGeneratedFileStream.h"
-#include "cmCPackLog.h"
+#include "cmSystemTools.h"
+#include "cmake.h"
#include <errno.h>
-#include <cmsys/SystemTools.hxx>
-#include <cmsys/Directory.hxx>
#include <cm_libarchive.h>
+#include <cmsys/Directory.hxx>
+#include <cmsys/SystemTools.hxx>
//----------------------------------------------------------------------
cmCPackArchiveGenerator::cmCPackArchiveGenerator(cmArchiveWrite::Compress t,
diff --git a/Source/CPack/cmCPackComponentGroup.cxx b/Source/CPack/cmCPackComponentGroup.cxx
index 2d41e59..b847589 100644
--- a/Source/CPack/cmCPackComponentGroup.cxx
+++ b/Source/CPack/cmCPackComponentGroup.cxx
@@ -14,8 +14,8 @@
#include "cmSystemTools.h"
-#include <vector>
#include <string>
+#include <vector>
//----------------------------------------------------------------------
unsigned long cmCPackComponent::GetInstalledSize(
diff --git a/Source/CPack/cmCPackCygwinBinaryGenerator.cxx b/Source/CPack/cmCPackCygwinBinaryGenerator.cxx
index 1f905c0..687689c 100644
--- a/Source/CPack/cmCPackCygwinBinaryGenerator.cxx
+++ b/Source/CPack/cmCPackCygwinBinaryGenerator.cxx
@@ -12,12 +12,12 @@
#include "cmCPackCygwinBinaryGenerator.h"
-#include "cmake.h"
+#include "cmCPackLog.h"
+#include "cmGeneratedFileStream.h"
#include "cmGlobalGenerator.h"
-#include "cmSystemTools.h"
#include "cmMakefile.h"
-#include "cmGeneratedFileStream.h"
-#include "cmCPackLog.h"
+#include "cmSystemTools.h"
+#include "cmake.h"
#include <cmsys/SystemTools.hxx>
diff --git a/Source/CPack/cmCPackCygwinSourceGenerator.cxx b/Source/CPack/cmCPackCygwinSourceGenerator.cxx
index f5cb53c..d84b1ee 100644
--- a/Source/CPack/cmCPackCygwinSourceGenerator.cxx
+++ b/Source/CPack/cmCPackCygwinSourceGenerator.cxx
@@ -12,12 +12,12 @@
#include "cmCPackCygwinSourceGenerator.h"
-#include "cmake.h"
+#include "cmCPackLog.h"
+#include "cmGeneratedFileStream.h"
#include "cmGlobalGenerator.h"
-#include "cmSystemTools.h"
#include "cmMakefile.h"
-#include "cmGeneratedFileStream.h"
-#include "cmCPackLog.h"
+#include "cmSystemTools.h"
+#include "cmake.h"
#include <cmsys/SystemTools.hxx>
@@ -25,8 +25,8 @@
// system tools because it is not implemented robustly enough to move
// files across directories.
#ifdef _WIN32
-# include <windows.h>
# include <sys/stat.h>
+# include <windows.h>
#endif
//----------------------------------------------------------------------
diff --git a/Source/CPack/cmCPackDebGenerator.cxx b/Source/CPack/cmCPackDebGenerator.cxx
index 9673942..9e17bc8 100644
--- a/Source/CPack/cmCPackDebGenerator.cxx
+++ b/Source/CPack/cmCPackDebGenerator.cxx
@@ -12,14 +12,14 @@
#include "cmCPackDebGenerator.h"
-#include "cmSystemTools.h"
-#include "cmMakefile.h"
-#include "cmGeneratedFileStream.h"
-#include "cmCPackLog.h"
#include "cmArchiveWrite.h"
+#include "cmCPackLog.h"
+#include "cmGeneratedFileStream.h"
+#include "cmMakefile.h"
+#include "cmSystemTools.h"
-#include <cmsys/SystemTools.hxx>
#include <cmsys/Glob.hxx>
+#include <cmsys/SystemTools.hxx>
#include <limits.h> // USHRT_MAX
#include <sys/stat.h>
@@ -764,8 +764,8 @@ std::string cmCPackDebGenerator::GetComponentInstallDirNameSuffix(
#include <sys/stat.h>
#include <stdio.h>
-#include <string.h>
#include <stdlib.h>
+#include <string.h>
#define ARMAG "!<arch>\n" /* ar "magic number" */
#define SARMAG 8 /* strlen(ARMAG); */
diff --git a/Source/CPack/cmCPackDragNDropGenerator.cxx b/Source/CPack/cmCPackDragNDropGenerator.cxx
index eccc5cf..b9c9c85 100644
--- a/Source/CPack/cmCPackDragNDropGenerator.cxx
+++ b/Source/CPack/cmCPackDragNDropGenerator.cxx
@@ -13,11 +13,11 @@
#include "cmCPackDragNDropGenerator.h"
#include "cmCPackLog.h"
-#include "cmSystemTools.h"
#include "cmGeneratedFileStream.h"
+#include "cmSystemTools.h"
-#include <cmsys/RegularExpression.hxx>
#include <cmsys/FStream.hxx>
+#include <cmsys/RegularExpression.hxx>
#include <iomanip>
diff --git a/Source/CPack/cmCPackGenerator.cxx b/Source/CPack/cmCPackGenerator.cxx
index 3eca280..6cc67e7 100644
--- a/Source/CPack/cmCPackGenerator.cxx
+++ b/Source/CPack/cmCPackGenerator.cxx
@@ -12,18 +12,18 @@
#include "cmCPackGenerator.h"
-#include "cmMakefile.h"
+#include "cmCPackComponentGroup.h"
#include "cmCPackLog.h"
-#include "cmake.h"
-#include "cmGlobalGenerator.h"
#include "cmGeneratedFileStream.h"
-#include "cmCPackComponentGroup.h"
+#include "cmGlobalGenerator.h"
+#include "cmMakefile.h"
#include "cmXMLSafe.h"
+#include "cmake.h"
-#include <cmsys/SystemTools.hxx>
-#include <cmsys/Glob.hxx>
-#include <cmsys/FStream.hxx>
#include <algorithm>
+#include <cmsys/FStream.hxx>
+#include <cmsys/Glob.hxx>
+#include <cmsys/SystemTools.hxx>
#include <list>
#if defined(__HAIKU__)
diff --git a/Source/CPack/cmCPackGeneratorFactory.cxx b/Source/CPack/cmCPackGeneratorFactory.cxx
index 4626142..669964d 100644
--- a/Source/CPack/cmCPackGeneratorFactory.cxx
+++ b/Source/CPack/cmCPackGeneratorFactory.cxx
@@ -12,22 +12,22 @@
#include "cmCPackGeneratorFactory.h"
+#include "IFW/cmCPackIFWGenerator.h"
+#include "cmCPack7zGenerator.h"
#include "cmCPackGenerator.h"
+#include "cmCPackNSISGenerator.h"
+#include "cmCPackSTGZGenerator.h"
#include "cmCPackTGZGenerator.h"
#include "cmCPackTXZGenerator.h"
#include "cmCPackTarBZip2Generator.h"
#include "cmCPackTarCompressGenerator.h"
#include "cmCPackZIPGenerator.h"
-#include "cmCPack7zGenerator.h"
-#include "cmCPackSTGZGenerator.h"
-#include "cmCPackNSISGenerator.h"
-#include "IFW/cmCPackIFWGenerator.h"
#ifdef __APPLE__
-# include "cmCPackDragNDropGenerator.h"
-# include "cmCPackBundleGenerator.h"
-# include "cmCPackPackageMakerGenerator.h"
-# include "cmCPackOSXX11Generator.h"
+# include "cmCPackBundleGenerator.h"
+# include "cmCPackDragNDropGenerator.h"
+# include "cmCPackOSXX11Generator.h"
+# include "cmCPackPackageMakerGenerator.h"
#endif
#ifdef __CYGWIN__
@@ -45,8 +45,8 @@
# include "WiX/cmCPackWIXGenerator.h"
#endif
-#include "cmCPackLog.h"
#include "cmAlgorithms.h"
+#include "cmCPackLog.h"
//----------------------------------------------------------------------
diff --git a/Source/CPack/cmCPackNSISGenerator.cxx b/Source/CPack/cmCPackNSISGenerator.cxx
index 5ba639f..eeb46fd 100644
--- a/Source/CPack/cmCPackNSISGenerator.cxx
+++ b/Source/CPack/cmCPackNSISGenerator.cxx
@@ -12,17 +12,17 @@
#include "cmCPackNSISGenerator.h"
+#include "cmCPackComponentGroup.h"
+#include "cmCPackLog.h"
+#include "cmGeneratedFileStream.h"
#include "cmGlobalGenerator.h"
-#include "cmSystemTools.h"
#include "cmMakefile.h"
-#include "cmGeneratedFileStream.h"
-#include "cmCPackLog.h"
-#include "cmCPackComponentGroup.h"
+#include "cmSystemTools.h"
-#include <cmsys/SystemTools.hxx>
-#include <cmsys/Glob.hxx>
#include <cmsys/Directory.hxx>
+#include <cmsys/Glob.hxx>
#include <cmsys/RegularExpression.hxx>
+#include <cmsys/SystemTools.hxx>
/* NSIS uses different command line syntax on Windows and others */
#ifdef _WIN32
diff --git a/Source/CPack/cmCPackOSXX11Generator.cxx b/Source/CPack/cmCPackOSXX11Generator.cxx
index cde08b1..1d7ef69 100644
--- a/Source/CPack/cmCPackOSXX11Generator.cxx
+++ b/Source/CPack/cmCPackOSXX11Generator.cxx
@@ -12,15 +12,15 @@
#include "cmCPackOSXX11Generator.h"
-#include "cmake.h"
+#include "cmCPackLog.h"
+#include "cmGeneratedFileStream.h"
#include "cmGlobalGenerator.h"
-#include "cmSystemTools.h"
#include "cmMakefile.h"
-#include "cmGeneratedFileStream.h"
-#include "cmCPackLog.h"
+#include "cmSystemTools.h"
+#include "cmake.h"
-#include <cmsys/SystemTools.hxx>
#include <cmsys/Glob.hxx>
+#include <cmsys/SystemTools.hxx>
#include <sys/stat.h>
//----------------------------------------------------------------------
diff --git a/Source/CPack/cmCPackPackageMakerGenerator.cxx b/Source/CPack/cmCPackPackageMakerGenerator.cxx
index 8fdc036..4f6238e 100644
--- a/Source/CPack/cmCPackPackageMakerGenerator.cxx
+++ b/Source/CPack/cmCPackPackageMakerGenerator.cxx
@@ -11,17 +11,17 @@
============================================================================*/
#include "cmCPackPackageMakerGenerator.h"
-#include "cmake.h"
-#include "cmGlobalGenerator.h"
-#include "cmSystemTools.h"
-#include "cmMakefile.h"
-#include "cmGeneratedFileStream.h"
#include "cmCPackComponentGroup.h"
#include "cmCPackLog.h"
+#include "cmGeneratedFileStream.h"
+#include "cmGlobalGenerator.h"
+#include "cmMakefile.h"
+#include "cmSystemTools.h"
+#include "cmake.h"
-#include <cmsys/SystemTools.hxx>
-#include <cmsys/Glob.hxx>
#include <cmsys/FStream.hxx>
+#include <cmsys/Glob.hxx>
+#include <cmsys/SystemTools.hxx>
#include <assert.h>
diff --git a/Source/CPack/cmCPackSTGZGenerator.cxx b/Source/CPack/cmCPackSTGZGenerator.cxx
index 68b893f..8a83666 100644
--- a/Source/CPack/cmCPackSTGZGenerator.cxx
+++ b/Source/CPack/cmCPackSTGZGenerator.cxx
@@ -12,14 +12,14 @@
#include "cmCPackSTGZGenerator.h"
-#include "cmake.h"
+#include "cmCPackLog.h"
#include "cmGlobalGenerator.h"
-#include "cmSystemTools.h"
#include "cmMakefile.h"
-#include "cmCPackLog.h"
+#include "cmSystemTools.h"
+#include "cmake.h"
-#include <cmsys/FStream.hxx>
#include <sys/types.h>
+#include <cmsys/FStream.hxx>
#include <sys/stat.h>
//----------------------------------------------------------------------
diff --git a/Source/CPack/cpack.cxx b/Source/CPack/cpack.cxx
index c08897f..813fb01 100644
--- a/Source/CPack/cpack.cxx
+++ b/Source/CPack/cpack.cxx
@@ -12,19 +12,19 @@
#include "cmSystemTools.h"
// Need these for documentation support.
-#include "cmake.h"
-#include "cmDocumentation.h"
-#include "cmCPackGeneratorFactory.h"
#include "cmCPackGenerator.h"
-#include "cmake.h"
+#include "cmCPackGeneratorFactory.h"
+#include "cmDocumentation.h"
#include "cmGlobalGenerator.h"
#include "cmMakefile.h"
+#include "cmake.h"
+#include "cmake.h"
#include "cmCPackLog.h"
#include <cmsys/CommandLineArguments.hxx>
-#include <cmsys/SystemTools.hxx>
#include <cmsys/Encoding.hxx>
+#include <cmsys/SystemTools.hxx>
//----------------------------------------------------------------------------
static const char * cmDocumentationName[][2] =
diff --git a/Source/CTest/cmCTestBatchTestHandler.cxx b/Source/CTest/cmCTestBatchTestHandler.cxx
index e462d4a..41f4f12 100644
--- a/Source/CTest/cmCTestBatchTestHandler.cxx
+++ b/Source/CTest/cmCTestBatchTestHandler.cxx
@@ -12,9 +12,9 @@
#include "cmCTestBatchTestHandler.h"
+#include "cmCTest.h"
#include "cmProcess.h"
#include "cmStandardIncludes.h"
-#include "cmCTest.h"
#include "cmSystemTools.h"
#include <stdlib.h>
diff --git a/Source/CTest/cmCTestBatchTestHandler.h b/Source/CTest/cmCTestBatchTestHandler.h
index 5ff0025..b0fc8d5 100644
--- a/Source/CTest/cmCTestBatchTestHandler.h
+++ b/Source/CTest/cmCTestBatchTestHandler.h
@@ -15,9 +15,9 @@
#include <cmStandardIncludes.h>
-#include <cmCTestTestHandler.h>
#include <cmCTestMultiProcessHandler.h>
#include <cmCTestRunTest.h>
+#include <cmCTestTestHandler.h>
#include <cmsys/FStream.hxx>
/** \class cmCTestBatchTestHandler
diff --git a/Source/CTest/cmCTestBuildAndTestHandler.cxx b/Source/CTest/cmCTestBuildAndTestHandler.cxx
index 20d303d..52433da 100644
--- a/Source/CTest/cmCTestBuildAndTestHandler.cxx
+++ b/Source/CTest/cmCTestBuildAndTestHandler.cxx
@@ -12,12 +12,12 @@
#include "cmCTestBuildAndTestHandler.h"
-#include "cmSystemTools.h"
#include "cmCTest.h"
-#include "cmake.h"
+#include "cmCTestTestHandler.h"
#include "cmGlobalGenerator.h"
+#include "cmSystemTools.h"
+#include "cmake.h"
#include <cmsys/Process.h>
-#include "cmCTestTestHandler.h"
//----------------------------------------------------------------------
cmCTestBuildAndTestHandler::cmCTestBuildAndTestHandler()
diff --git a/Source/CTest/cmCTestBuildCommand.cxx b/Source/CTest/cmCTestBuildCommand.cxx
index 27e22c4..0cfcc64 100644
--- a/Source/CTest/cmCTestBuildCommand.cxx
+++ b/Source/CTest/cmCTestBuildCommand.cxx
@@ -12,10 +12,10 @@
#include "cmCTestBuildCommand.h"
#include "cmCTest.h"
-#include "cmCTestGenericHandler.h"
#include "cmCTestBuildHandler.h"
-#include "cmake.h"
+#include "cmCTestGenericHandler.h"
#include "cmGlobalGenerator.h"
+#include "cmake.h"
//----------------------------------------------------------------------------
diff --git a/Source/CTest/cmCTestBuildHandler.cxx b/Source/CTest/cmCTestBuildHandler.cxx
index 0d74f48..1b31533 100644
--- a/Source/CTest/cmCTestBuildHandler.cxx
+++ b/Source/CTest/cmCTestBuildHandler.cxx
@@ -12,29 +12,29 @@
#include "cmCTestBuildHandler.h"
+#include "cmAlgorithms.h"
#include "cmCTest.h"
-#include "cmake.h"
-#include "cmMakefile.h"
-#include "cmGlobalGenerator.h"
+#include "cmFileTimeComparison.h"
#include "cmGeneratedFileStream.h"
+#include "cmGlobalGenerator.h"
+#include "cmMakefile.h"
#include "cmXMLWriter.h"
-#include "cmFileTimeComparison.h"
-#include "cmAlgorithms.h"
+#include "cmake.h"
//#include <cmsys/RegularExpression.hxx>
-#include <cmsys/Process.h>
#include <cmsys/Directory.hxx>
#include <cmsys/FStream.hxx>
+#include <cmsys/Process.h>
// used for sleep
#ifdef _WIN32
#include "windows.h"
#endif
+#include <float.h>
+#include <math.h>
#include <stdlib.h>
#include <time.h>
-#include <math.h>
-#include <float.h>
static const char* cmCTestErrorMatches[] = {
diff --git a/Source/CTest/cmCTestCVS.cxx b/Source/CTest/cmCTestCVS.cxx
index 0fb3fec..58d8689 100644
--- a/Source/CTest/cmCTestCVS.cxx
+++ b/Source/CTest/cmCTestCVS.cxx
@@ -15,8 +15,8 @@
#include "cmSystemTools.h"
#include "cmXMLWriter.h"
-#include <cmsys/RegularExpression.hxx>
#include <cmsys/FStream.hxx>
+#include <cmsys/RegularExpression.hxx>
//----------------------------------------------------------------------------
cmCTestCVS::cmCTestCVS(cmCTest* ct, std::ostream& log): cmCTestVC(ct, log)
diff --git a/Source/CTest/cmCTestConfigureCommand.cxx b/Source/CTest/cmCTestConfigureCommand.cxx
index ba4dab2..8f15c6d 100644
--- a/Source/CTest/cmCTestConfigureCommand.cxx
+++ b/Source/CTest/cmCTestConfigureCommand.cxx
@@ -11,9 +11,9 @@
============================================================================*/
#include "cmCTestConfigureCommand.h"
-#include "cmGlobalGenerator.h"
#include "cmCTest.h"
#include "cmCTestGenericHandler.h"
+#include "cmGlobalGenerator.h"
cmCTestConfigureCommand::cmCTestConfigureCommand()
{
diff --git a/Source/CTest/cmCTestConfigureHandler.cxx b/Source/CTest/cmCTestConfigureHandler.cxx
index 2e8aeb9..e9f8f39 100644
--- a/Source/CTest/cmCTestConfigureHandler.cxx
+++ b/Source/CTest/cmCTestConfigureHandler.cxx
@@ -14,8 +14,8 @@
#include "cmCTest.h"
#include "cmGeneratedFileStream.h"
-#include "cmake.h"
#include "cmXMLWriter.h"
+#include "cmake.h"
#include <cmsys/Process.h>
diff --git a/Source/CTest/cmCTestCoverageHandler.cxx b/Source/CTest/cmCTestCoverageHandler.cxx
index b05496a..79eb346 100644
--- a/Source/CTest/cmCTestCoverageHandler.cxx
+++ b/Source/CTest/cmCTestCoverageHandler.cxx
@@ -11,28 +11,28 @@
============================================================================*/
#include "cmCTestCoverageHandler.h"
-#include "cmParsePHPCoverage.h"
+#include "cmCTest.h"
+#include "cmGeneratedFileStream.h"
+#include "cmMakefile.h"
+#include "cmParseBlanketJSCoverage.h"
+#include "cmParseCacheCoverage.h"
#include "cmParseCoberturaCoverage.h"
+#include "cmParseDelphiCoverage.h"
#include "cmParseGTMCoverage.h"
-#include "cmParseCacheCoverage.h"
#include "cmParseJacocoCoverage.h"
-#include "cmParseDelphiCoverage.h"
-#include "cmParseBlanketJSCoverage.h"
-#include "cmCTest.h"
-#include "cmake.h"
-#include "cmMakefile.h"
+#include "cmParsePHPCoverage.h"
#include "cmSystemTools.h"
-#include "cmGeneratedFileStream.h"
#include "cmXMLWriter.h"
+#include "cmake.h"
+#include <cmsys/FStream.hxx>
+#include <cmsys/Glob.hxx>
#include <cmsys/Process.h>
#include <cmsys/RegularExpression.hxx>
-#include <cmsys/Glob.hxx>
-#include <cmsys/FStream.hxx>
-#include <stdlib.h>
-#include <math.h>
#include <float.h>
+#include <math.h>
+#include <stdlib.h>
#define SAFEDIV(x,y) (((y)!=0)?((x)/(y)):(0))
diff --git a/Source/CTest/cmCTestCurl.cxx b/Source/CTest/cmCTestCurl.cxx
index fb6cc00..0367d7d 100644
--- a/Source/CTest/cmCTestCurl.cxx
+++ b/Source/CTest/cmCTestCurl.cxx
@@ -11,8 +11,8 @@
============================================================================*/
#include "cmCTestCurl.h"
-#include "cmSystemTools.h"
#include "cmCTest.h"
+#include "cmSystemTools.h"
cmCTestCurl::cmCTestCurl(cmCTest* ctest)
{
diff --git a/Source/CTest/cmCTestGIT.cxx b/Source/CTest/cmCTestGIT.cxx
index 1d6bdce..3ff12c1 100644
--- a/Source/CTest/cmCTestGIT.cxx
+++ b/Source/CTest/cmCTestGIT.cxx
@@ -11,17 +11,17 @@
============================================================================*/
#include "cmCTestGIT.h"
+#include "cmAlgorithms.h"
#include "cmCTest.h"
#include "cmSystemTools.h"
-#include "cmAlgorithms.h"
-#include <cmsys/RegularExpression.hxx>
-#include <cmsys/Process.h>
#include <cmsys/FStream.hxx>
+#include <cmsys/Process.h>
+#include <cmsys/RegularExpression.hxx>
#include <sys/types.h>
-#include <time.h>
#include <ctype.h>
+#include <time.h>
//----------------------------------------------------------------------------
static unsigned int cmCTestGITVersion(unsigned int epic, unsigned int major,
diff --git a/Source/CTest/cmCTestLaunch.cxx b/Source/CTest/cmCTestLaunch.cxx
index 749a5be..03b06f8 100644
--- a/Source/CTest/cmCTestLaunch.cxx
+++ b/Source/CTest/cmCTestLaunch.cxx
@@ -16,14 +16,14 @@
#include "cmXMLWriter.h"
#include "cmake.h"
+#include <cmsys/FStream.hxx>
#include <cmsys/MD5.h>
#include <cmsys/Process.h>
#include <cmsys/RegularExpression.hxx>
-#include <cmsys/FStream.hxx>
#ifdef _WIN32
-#include <io.h> // for _setmode
#include <fcntl.h> // for _O_BINARY
+#include <io.h> // for _setmode
#include <stdio.h> // for std{out,err} and fileno
#endif
diff --git a/Source/CTest/cmCTestMemCheckHandler.cxx b/Source/CTest/cmCTestMemCheckHandler.cxx
index 3d0f16a..9e3ba57 100644
--- a/Source/CTest/cmCTestMemCheckHandler.cxx
+++ b/Source/CTest/cmCTestMemCheckHandler.cxx
@@ -12,21 +12,21 @@
#include "cmCTestMemCheckHandler.h"
-#include "cmXMLParser.h"
#include "cmCTest.h"
-#include "cmake.h"
#include "cmGeneratedFileStream.h"
-#include <cmsys/Process.h>
-#include <cmsys/RegularExpression.hxx>
-#include <cmsys/Base64.h>
-#include <cmsys/Glob.hxx>
-#include <cmsys/FStream.hxx>
#include "cmMakefile.h"
+#include "cmXMLParser.h"
#include "cmXMLWriter.h"
+#include "cmake.h"
+#include <cmsys/Base64.h>
+#include <cmsys/FStream.hxx>
+#include <cmsys/Glob.hxx>
+#include <cmsys/Process.h>
+#include <cmsys/RegularExpression.hxx>
-#include <stdlib.h>
-#include <math.h>
#include <float.h>
+#include <math.h>
+#include <stdlib.h>
struct CatToErrorType
{
diff --git a/Source/CTest/cmCTestMemCheckHandler.h b/Source/CTest/cmCTestMemCheckHandler.h
index 01311b6..6232924 100644
--- a/Source/CTest/cmCTestMemCheckHandler.h
+++ b/Source/CTest/cmCTestMemCheckHandler.h
@@ -16,8 +16,8 @@
#include "cmCTestTestHandler.h"
#include "cmListFileCache.h"
-#include <vector>
#include <string>
+#include <vector>
class cmMakefile;
class cmXMLWriter;
diff --git a/Source/CTest/cmCTestMultiProcessHandler.cxx b/Source/CTest/cmCTestMultiProcessHandler.cxx
index df6aff1..1434518 100644
--- a/Source/CTest/cmCTestMultiProcessHandler.cxx
+++ b/Source/CTest/cmCTestMultiProcessHandler.cxx
@@ -11,18 +11,18 @@
============================================================================*/
#include "cmCTestMultiProcessHandler.h"
-#include "cmProcess.h"
-#include "cmStandardIncludes.h"
#include "cmCTest.h"
#include "cmCTestScriptHandler.h"
+#include "cmProcess.h"
+#include "cmStandardIncludes.h"
#include "cmSystemTools.h"
-#include <stdlib.h>
-#include <stack>
-#include <list>
-#include <float.h>
-#include <math.h>
#include <cmsys/FStream.hxx>
#include <cmsys/SystemInformation.hxx>
+#include <float.h>
+#include <list>
+#include <math.h>
+#include <stack>
+#include <stdlib.h>
class TestComparator
{
diff --git a/Source/CTest/cmCTestP4.cxx b/Source/CTest/cmCTestP4.cxx
index 5e0c54a..f7c960c 100644
--- a/Source/CTest/cmCTestP4.cxx
+++ b/Source/CTest/cmCTestP4.cxx
@@ -14,12 +14,12 @@
#include "cmCTest.h"
#include "cmSystemTools.h"
-#include <cmsys/RegularExpression.hxx>
#include <cmsys/Process.h>
+#include <cmsys/RegularExpression.hxx>
#include <sys/types.h>
-#include <time.h>
#include <ctype.h>
+#include <time.h>
//----------------------------------------------------------------------------
cmCTestP4::cmCTestP4(cmCTest* ct, std::ostream& log):
diff --git a/Source/CTest/cmCTestP4.h b/Source/CTest/cmCTestP4.h
index 6f907d1..d666bd8 100644
--- a/Source/CTest/cmCTestP4.h
+++ b/Source/CTest/cmCTestP4.h
@@ -14,8 +14,8 @@
#include "cmCTestGlobalVC.h"
-#include <vector>
#include <map>
+#include <vector>
/** \class cmCTestP4
* \brief Interaction with the Perforce command-line tool
diff --git a/Source/CTest/cmCTestRunTest.cxx b/Source/CTest/cmCTestRunTest.cxx
index 34ad2d0..5d159c1 100644
--- a/Source/CTest/cmCTestRunTest.cxx
+++ b/Source/CTest/cmCTestRunTest.cxx
@@ -12,8 +12,8 @@
#include "cmCTestRunTest.h"
-#include "cmCTestMemCheckHandler.h"
#include "cmCTest.h"
+#include "cmCTestMemCheckHandler.h"
#include "cmSystemTools.h"
#include "cm_curl.h"
diff --git a/Source/CTest/cmCTestScriptHandler.cxx b/Source/CTest/cmCTestScriptHandler.cxx
index ee15271..4485d34 100644
--- a/Source/CTest/cmCTestScriptHandler.cxx
+++ b/Source/CTest/cmCTestScriptHandler.cxx
@@ -13,25 +13,25 @@
#include "cmCTestScriptHandler.h"
#include "cmCTest.h"
-#include "cmake.h"
#include "cmFunctionBlocker.h"
-#include "cmMakefile.h"
-#include "cmGlobalGenerator.h"
#include "cmGeneratedFileStream.h"
+#include "cmGlobalGenerator.h"
+#include "cmMakefile.h"
+#include "cmake.h"
//#include <cmsys/RegularExpression.hxx>
-#include <cmsys/Process.h>
#include <cmsys/Directory.hxx>
+#include <cmsys/Process.h>
// used for sleep
#ifdef _WIN32
#include "windows.h"
#endif
+#include <float.h>
+#include <math.h>
#include <stdlib.h>
#include <time.h>
-#include <math.h>
-#include <float.h>
// needed for sleep
#if !defined(_WIN32)
diff --git a/Source/CTest/cmCTestStartCommand.cxx b/Source/CTest/cmCTestStartCommand.cxx
index 36576c5..4a38dc6 100644
--- a/Source/CTest/cmCTestStartCommand.cxx
+++ b/Source/CTest/cmCTestStartCommand.cxx
@@ -12,9 +12,9 @@
#include "cmCTestStartCommand.h"
#include "cmCTest.h"
-#include "cmGlobalGenerator.h"
#include "cmCTestVC.h"
#include "cmGeneratedFileStream.h"
+#include "cmGlobalGenerator.h"
cmCTestStartCommand::cmCTestStartCommand()
{
diff --git a/Source/CTest/cmCTestSubmitHandler.cxx b/Source/CTest/cmCTestSubmitHandler.cxx
index 3b682e3..6a65839 100644
--- a/Source/CTest/cmCTestSubmitHandler.cxx
+++ b/Source/CTest/cmCTestSubmitHandler.cxx
@@ -11,25 +11,25 @@
============================================================================*/
#include "cmCTestSubmitHandler.h"
+#include "cmCTest.h"
#include "cmCTestScriptHandler.h"
-#include "cmake.h"
+#include "cmGeneratedFileStream.h"
+#include "cmState.h"
#include "cmSystemTools.h"
#include "cmVersion.h"
-#include "cmGeneratedFileStream.h"
-#include "cmCTest.h"
#include "cmXMLParser.h"
-#include "cmState.h"
+#include "cmake.h"
-#include <cmsys/Process.h>
#include <cmsys/Base64.h>
+#include <cmsys/Process.h>
// For XML-RPC submission
#include "cm_xmlrpc.h"
#include <cm_jsoncpp_reader.h>
// For curl submission
-#include "cmCurl.h"
#include "cmCTestCurl.h"
+#include "cmCurl.h"
#include <sys/stat.h>
diff --git a/Source/CTest/cmCTestTestHandler.cxx b/Source/CTest/cmCTestTestHandler.cxx
index f91fa5f..d8229da 100644
--- a/Source/CTest/cmCTestTestHandler.cxx
+++ b/Source/CTest/cmCTestTestHandler.cxx
@@ -12,27 +12,27 @@
#include "cmCTestTestHandler.h"
-#include "cmCTestMultiProcessHandler.h"
-#include "cmCTestBatchTestHandler.h"
#include "cmCTest.h"
+#include "cmCTestBatchTestHandler.h"
+#include "cmCTestMultiProcessHandler.h"
#include "cmCTestRunTest.h"
-#include "cmake.h"
+#include "cmCommand.h"
#include "cmGeneratedFileStream.h"
-#include <cmsys/Process.h>
-#include <cmsys/RegularExpression.hxx>
-#include <cmsys/Base64.h>
-#include <cmsys/Directory.hxx>
-#include <cmsys/FStream.hxx>
-#include "cmMakefile.h"
#include "cmGlobalGenerator.h"
-#include "cmCommand.h"
+#include "cmMakefile.h"
#include "cmSystemTools.h"
#include "cmXMLWriter.h"
#include "cm_utf8.h"
+#include "cmake.h"
+#include <cmsys/Base64.h>
+#include <cmsys/Directory.hxx>
+#include <cmsys/FStream.hxx>
+#include <cmsys/Process.h>
+#include <cmsys/RegularExpression.hxx>
-#include <stdlib.h>
-#include <math.h>
#include <float.h>
+#include <math.h>
+#include <stdlib.h>
#include <set>
diff --git a/Source/CTest/cmCTestUpdateHandler.cxx b/Source/CTest/cmCTestUpdateHandler.cxx
index bf2f34a..b1b0a21 100644
--- a/Source/CTest/cmCTestUpdateHandler.cxx
+++ b/Source/CTest/cmCTestUpdateHandler.cxx
@@ -12,23 +12,23 @@
#include "cmCTestUpdateHandler.h"
+#include "cmCLocaleEnvironmentScope.h"
#include "cmCTest.h"
-#include "cmake.h"
-#include "cmMakefile.h"
+#include "cmGeneratedFileStream.h"
#include "cmGlobalGenerator.h"
+#include "cmMakefile.h"
#include "cmVersion.h"
-#include "cmGeneratedFileStream.h"
#include "cmXMLParser.h"
#include "cmXMLWriter.h"
-#include "cmCLocaleEnvironmentScope.h"
+#include "cmake.h"
-#include "cmCTestVC.h"
-#include "cmCTestCVS.h"
-#include "cmCTestSVN.h"
#include "cmCTestBZR.h"
+#include "cmCTestCVS.h"
#include "cmCTestGIT.h"
#include "cmCTestHG.h"
#include "cmCTestP4.h"
+#include "cmCTestSVN.h"
+#include "cmCTestVC.h"
#include <cmsys/auto_ptr.hxx>
@@ -40,9 +40,9 @@
#include "windows.h"
#endif
-#include <stdlib.h>
-#include <math.h>
#include <float.h>
+#include <math.h>
+#include <stdlib.h>
//----------------------------------------------------------------------
static const char* cmCTestUpdateHandlerUpdateStrings[] =
diff --git a/Source/CTest/cmParseBlanketJSCoverage.cxx b/Source/CTest/cmParseBlanketJSCoverage.cxx
index 26dd425..1f1db3e 100644
--- a/Source/CTest/cmParseBlanketJSCoverage.cxx
+++ b/Source/CTest/cmParseBlanketJSCoverage.cxx
@@ -11,12 +11,12 @@
============================================================================*/
#include "cmParseBlanketJSCoverage.h"
-#include <stdio.h>
-#include <stdlib.h>
#include "cmSystemTools.h"
#include <cmsys/Directory.hxx>
-#include <cmsys/Glob.hxx>
#include <cmsys/FStream.hxx>
+#include <cmsys/Glob.hxx>
+#include <stdio.h>
+#include <stdlib.h>
class cmParseBlanketJSCoverage::JSONParser
diff --git a/Source/CTest/cmParseCacheCoverage.cxx b/Source/CTest/cmParseCacheCoverage.cxx
index 38e0ac2..f838087 100644
--- a/Source/CTest/cmParseCacheCoverage.cxx
+++ b/Source/CTest/cmParseCacheCoverage.cxx
@@ -1,11 +1,11 @@
#include "cmParseCacheCoverage.h"
-#include <stdio.h>
-#include <stdlib.h>
#include "cmSystemTools.h"
#include <cmsys/Directory.hxx>
-#include <cmsys/Glob.hxx>
#include <cmsys/FStream.hxx>
+#include <cmsys/Glob.hxx>
+#include <stdio.h>
+#include <stdlib.h>
cmParseCacheCoverage::cmParseCacheCoverage(
diff --git a/Source/CTest/cmParseDelphiCoverage.cxx b/Source/CTest/cmParseDelphiCoverage.cxx
index ed52626..09c4f02 100644
--- a/Source/CTest/cmParseDelphiCoverage.cxx
+++ b/Source/CTest/cmParseDelphiCoverage.cxx
@@ -1,12 +1,12 @@
#include "cmParseDelphiCoverage.h"
-#include <stdio.h>
-#include <stdlib.h>
#include "cmSystemTools.h"
#include "cmXMLParser.h"
#include <cmsys/Directory.hxx>
-#include <cmsys/Glob.hxx>
#include <cmsys/FStream.hxx>
+#include <cmsys/Glob.hxx>
+#include <stdio.h>
+#include <stdlib.h>
class cmParseDelphiCoverage::HTMLParser
diff --git a/Source/CTest/cmParseGTMCoverage.cxx b/Source/CTest/cmParseGTMCoverage.cxx
index 5692246..ae7dedb 100644
--- a/Source/CTest/cmParseGTMCoverage.cxx
+++ b/Source/CTest/cmParseGTMCoverage.cxx
@@ -1,11 +1,11 @@
#include "cmParseGTMCoverage.h"
-#include <stdio.h>
-#include <stdlib.h>
#include "cmSystemTools.h"
#include <cmsys/Directory.hxx>
-#include <cmsys/Glob.hxx>
#include <cmsys/FStream.hxx>
+#include <cmsys/Glob.hxx>
+#include <stdio.h>
+#include <stdlib.h>
cmParseGTMCoverage::cmParseGTMCoverage(cmCTestCoverageHandlerContainer& cont,
diff --git a/Source/CTest/cmParseJacocoCoverage.cxx b/Source/CTest/cmParseJacocoCoverage.cxx
index f5386c9..d9c4ffb 100644
--- a/Source/CTest/cmParseJacocoCoverage.cxx
+++ b/Source/CTest/cmParseJacocoCoverage.cxx
@@ -1,12 +1,12 @@
#include "cmParseJacocoCoverage.h"
-#include <stdio.h>
-#include <stdlib.h>
#include "cmSystemTools.h"
#include "cmXMLParser.h"
#include <cmsys/Directory.hxx>
-#include <cmsys/Glob.hxx>
#include <cmsys/FStream.hxx>
+#include <cmsys/Glob.hxx>
+#include <stdio.h>
+#include <stdlib.h>
class cmParseJacocoCoverage::XMLParser: public cmXMLParser
diff --git a/Source/CTest/cmParseMumpsCoverage.cxx b/Source/CTest/cmParseMumpsCoverage.cxx
index 6567906..d0c7599 100644
--- a/Source/CTest/cmParseMumpsCoverage.cxx
+++ b/Source/CTest/cmParseMumpsCoverage.cxx
@@ -1,11 +1,11 @@
#include "cmParseGTMCoverage.h"
-#include <stdio.h>
-#include <stdlib.h>
#include "cmSystemTools.h"
#include <cmsys/Directory.hxx>
-#include <cmsys/Glob.hxx>
#include <cmsys/FStream.hxx>
+#include <cmsys/Glob.hxx>
+#include <stdio.h>
+#include <stdlib.h>
cmParseMumpsCoverage::cmParseMumpsCoverage(
diff --git a/Source/CursesDialog/ccmake.cxx b/Source/CursesDialog/ccmake.cxx
index 7bff0f0..b7c22b1 100644
--- a/Source/CursesDialog/ccmake.cxx
+++ b/Source/CursesDialog/ccmake.cxx
@@ -11,9 +11,9 @@
============================================================================*/
#include "cmCursesStandardIncludes.h"
+#include "../cmDocumentation.h"
#include "../cmSystemTools.h"
#include "../cmake.h"
-#include "../cmDocumentation.h"
#include <signal.h>
#include <sys/ioctl.h>
diff --git a/Source/CursesDialog/cmCursesCacheEntryComposite.cxx b/Source/CursesDialog/cmCursesCacheEntryComposite.cxx
index ace5c43..40c0eb6 100644
--- a/Source/CursesDialog/cmCursesCacheEntryComposite.cxx
+++ b/Source/CursesDialog/cmCursesCacheEntryComposite.cxx
@@ -11,16 +11,16 @@
============================================================================*/
#include "cmCursesCacheEntryComposite.h"
-#include "cmCursesOptionsWidget.h"
-#include "cmCursesStringWidget.h"
-#include "cmCursesLabelWidget.h"
-#include "cmCursesBoolWidget.h"
-#include "cmCursesPathWidget.h"
-#include "cmCursesFilePathWidget.h"
-#include "cmCursesDummyWidget.h"
+#include "../cmState.h"
#include "../cmSystemTools.h"
#include "../cmake.h"
-#include "../cmState.h"
+#include "cmCursesBoolWidget.h"
+#include "cmCursesDummyWidget.h"
+#include "cmCursesFilePathWidget.h"
+#include "cmCursesLabelWidget.h"
+#include "cmCursesOptionsWidget.h"
+#include "cmCursesPathWidget.h"
+#include "cmCursesStringWidget.h"
#include <assert.h>
diff --git a/Source/CursesDialog/cmCursesLongMessageForm.cxx b/Source/CursesDialog/cmCursesLongMessageForm.cxx
index cd8f3f1..776d828 100644
--- a/Source/CursesDialog/cmCursesLongMessageForm.cxx
+++ b/Source/CursesDialog/cmCursesLongMessageForm.cxx
@@ -12,8 +12,8 @@
#include "cmCursesLongMessageForm.h"
#include "../cmSystemTools.h"
-#include "../cmake.h"
#include "../cmVersion.h"
+#include "../cmake.h"
#include "cmCursesMainForm.h"
inline int ctrl(int z)
diff --git a/Source/CursesDialog/cmCursesMainForm.cxx b/Source/CursesDialog/cmCursesMainForm.cxx
index 8c2a8b4..2aafc8b 100644
--- a/Source/CursesDialog/cmCursesMainForm.cxx
+++ b/Source/CursesDialog/cmCursesMainForm.cxx
@@ -14,15 +14,15 @@
#include "../cmSystemTools.h"
#include "../cmVersion.h"
#include "../cmake.h"
-#include "cmCursesStringWidget.h"
-#include "cmCursesLabelWidget.h"
+#include "cmAlgorithms.h"
#include "cmCursesBoolWidget.h"
-#include "cmCursesPathWidget.h"
-#include "cmCursesFilePathWidget.h"
-#include "cmCursesDummyWidget.h"
#include "cmCursesCacheEntryComposite.h"
+#include "cmCursesDummyWidget.h"
+#include "cmCursesFilePathWidget.h"
+#include "cmCursesLabelWidget.h"
#include "cmCursesLongMessageForm.h"
-#include "cmAlgorithms.h"
+#include "cmCursesPathWidget.h"
+#include "cmCursesStringWidget.h"
#include "cmState.h"
diff --git a/Source/QtDialog/AddCacheEntry.cxx b/Source/QtDialog/AddCacheEntry.cxx
index b575f75..efb2b65 100644
--- a/Source/QtDialog/AddCacheEntry.cxx
+++ b/Source/QtDialog/AddCacheEntry.cxx
@@ -12,8 +12,8 @@
#include "AddCacheEntry.h"
-#include <QMetaProperty>
#include <QCompleter>
+#include <QMetaProperty>
static const int NumTypes = 4;
static const int DefaultTypeIndex = 0;
diff --git a/Source/QtDialog/AddCacheEntry.h b/Source/QtDialog/AddCacheEntry.h
index c327915..7c08af6 100644
--- a/Source/QtDialog/AddCacheEntry.h
+++ b/Source/QtDialog/AddCacheEntry.h
@@ -15,9 +15,9 @@
#include "QCMake.h"
-#include <QWidget>
#include <QCheckBox>
#include <QStringList>
+#include <QWidget>
#include "ui_AddCacheEntry.h"
diff --git a/Source/QtDialog/CMakeSetup.cxx b/Source/QtDialog/CMakeSetup.cxx
index 72adb8d..b44219f 100644
--- a/Source/QtDialog/CMakeSetup.cxx
+++ b/Source/QtDialog/CMakeSetup.cxx
@@ -11,19 +11,19 @@
============================================================================*/
#include "QCMake.h" // include to disable MS warnings
+#include "CMakeSetupDialog.h"
+#include "cmAlgorithms.h"
+#include "cmDocumentation.h"
+#include "cmVersion.h"
+#include "cmake.h"
#include <QApplication>
#include <QDir>
-#include <QTranslator>
#include <QLocale>
#include <QTextCodec>
-#include "CMakeSetupDialog.h"
-#include "cmDocumentation.h"
-#include "cmake.h"
-#include "cmVersion.h"
-#include "cmAlgorithms.h"
+#include <QTranslator>
#include <cmsys/CommandLineArguments.hxx>
-#include <cmsys/SystemTools.hxx>
#include <cmsys/Encoding.hxx>
+#include <cmsys/SystemTools.hxx>
//----------------------------------------------------------------------------
static const char * cmDocumentationName[][2] =
diff --git a/Source/QtDialog/CMakeSetupDialog.cxx b/Source/QtDialog/CMakeSetupDialog.cxx
index f25f402..945739d 100644
--- a/Source/QtDialog/CMakeSetupDialog.cxx
+++ b/Source/QtDialog/CMakeSetupDialog.cxx
@@ -12,28 +12,28 @@
#include "CMakeSetupDialog.h"
-#include <QFileDialog>
-#include <QProgressBar>
-#include <QMessageBox>
-#include <QStatusBar>
-#include <QToolButton>
-#include <QDialogButtonBox>
#include <QCloseEvent>
#include <QCoreApplication>
-#include <QSettings>
+#include <QDialogButtonBox>
+#include <QDragEnterEvent>
+#include <QFileDialog>
+#include <QInputDialog>
+#include <QKeySequence>
#include <QMenu>
#include <QMenuBar>
-#include <QDragEnterEvent>
+#include <QMessageBox>
#include <QMimeData>
-#include <QUrl>
+#include <QProgressBar>
+#include <QSettings>
#include <QShortcut>
-#include <QKeySequence>
-#include <QInputDialog>
+#include <QStatusBar>
+#include <QToolButton>
+#include <QUrl>
-#include "QCMake.h"
-#include "QCMakeCacheView.h"
#include "AddCacheEntry.h"
#include "FirstConfigure.h"
+#include "QCMake.h"
+#include "QCMakeCacheView.h"
#include "RegexExplorer.h"
#include "WarningMessagesDialog.h"
#include "cmSystemTools.h"
diff --git a/Source/QtDialog/CMakeSetupDialog.h b/Source/QtDialog/CMakeSetupDialog.h
index eaac61c..f9624d1 100644
--- a/Source/QtDialog/CMakeSetupDialog.h
+++ b/Source/QtDialog/CMakeSetupDialog.h
@@ -15,10 +15,10 @@
#include "QCMake.h"
+#include "ui_CMakeSetupDialog.h"
+#include <QEventLoop>
#include <QMainWindow>
#include <QThread>
-#include <QEventLoop>
-#include "ui_CMakeSetupDialog.h"
class QCMakeThread;
class CMakeCacheModel;
diff --git a/Source/QtDialog/FirstConfigure.cxx b/Source/QtDialog/FirstConfigure.cxx
index 64fe676..5c0af2b 100644
--- a/Source/QtDialog/FirstConfigure.cxx
+++ b/Source/QtDialog/FirstConfigure.cxx
@@ -3,9 +3,9 @@
#include "Compilers.h"
-#include <QSettings>
-#include <QRadioButton>
#include <QComboBox>
+#include <QRadioButton>
+#include <QSettings>
#include <QVBoxLayout>
diff --git a/Source/QtDialog/QCMake.cxx b/Source/QtDialog/QCMake.cxx
index dd7c138..28be341 100644
--- a/Source/QtDialog/QCMake.cxx
+++ b/Source/QtDialog/QCMake.cxx
@@ -12,12 +12,12 @@
#include "QCMake.h"
-#include <QDir>
#include <QCoreApplication>
+#include <QDir>
+#include "cmExternalMakefileProjectGenerator.h"
#include "cmState.h"
#include "cmSystemTools.h"
-#include "cmExternalMakefileProjectGenerator.h"
#ifdef Q_OS_WIN
#include "qt_windows.h" // For SetErrorMode
diff --git a/Source/QtDialog/QCMake.h b/Source/QtDialog/QCMake.h
index ca6f0f4..5cae06d 100644
--- a/Source/QtDialog/QCMake.h
+++ b/Source/QtDialog/QCMake.h
@@ -22,13 +22,13 @@
#include <vector>
+#include <QAtomicInt>
+#include <QList>
+#include <QMetaType>
#include <QObject>
#include <QString>
-#include <QVariant>
-#include <QList>
#include <QStringList>
-#include <QMetaType>
-#include <QAtomicInt>
+#include <QVariant>
/// struct to represent cmake properties in Qt
/// Value is of type String or Bool
diff --git a/Source/QtDialog/QCMakeCacheView.cxx b/Source/QtDialog/QCMakeCacheView.cxx
index bae6a30..f64a78a 100644
--- a/Source/QtDialog/QCMakeCacheView.cxx
+++ b/Source/QtDialog/QCMakeCacheView.cxx
@@ -12,14 +12,14 @@
#include "QCMakeCacheView.h"
+#include <QApplication>
+#include <QEvent>
#include <QHBoxLayout>
#include <QHeaderView>
-#include <QEvent>
-#include <QStyle>
#include <QKeyEvent>
-#include <QSortFilterProxyModel>
#include <QMetaProperty>
-#include <QApplication>
+#include <QSortFilterProxyModel>
+#include <QStyle>
#include "QCMakeWidgets.h"
diff --git a/Source/QtDialog/QCMakeCacheView.h b/Source/QtDialog/QCMakeCacheView.h
index 5ac0966..5631b86 100644
--- a/Source/QtDialog/QCMakeCacheView.h
+++ b/Source/QtDialog/QCMakeCacheView.h
@@ -15,10 +15,10 @@
#include "QCMake.h"
-#include <QTreeView>
+#include <QItemDelegate>
#include <QSet>
#include <QStandardItemModel>
-#include <QItemDelegate>
+#include <QTreeView>
class QSortFilterProxyModel;
class QCMakeCacheModel;
diff --git a/Source/QtDialog/QCMakeWidgets.cxx b/Source/QtDialog/QCMakeWidgets.cxx
index 41f98b5..7803ef3 100644
--- a/Source/QtDialog/QCMakeWidgets.cxx
+++ b/Source/QtDialog/QCMakeWidgets.cxx
@@ -13,10 +13,10 @@
#include "QCMakeWidgets.h"
#include <QDirModel>
-#include <QFileInfo>
#include <QFileDialog>
-#include <QToolButton>
+#include <QFileInfo>
#include <QResizeEvent>
+#include <QToolButton>
QCMakeFileEditor::QCMakeFileEditor(QWidget* p, const QString& var)
: QLineEdit(p), Variable(var)
diff --git a/Source/QtDialog/QCMakeWidgets.h b/Source/QtDialog/QCMakeWidgets.h
index 2207282..759b635 100644
--- a/Source/QtDialog/QCMakeWidgets.h
+++ b/Source/QtDialog/QCMakeWidgets.h
@@ -13,9 +13,9 @@
#ifndef QCMakeWidgets_h
#define QCMakeWidgets_h
-#include <QLineEdit>
#include <QComboBox>
#include <QCompleter>
+#include <QLineEdit>
class QToolButton;
diff --git a/Source/QtDialog/RegexExplorer.h b/Source/QtDialog/RegexExplorer.h
index 2ac9c3e..3ac8a24 100644
--- a/Source/QtDialog/RegexExplorer.h
+++ b/Source/QtDialog/RegexExplorer.h
@@ -13,9 +13,9 @@
#ifndef RegexExplorer_h
#define RegexExplorer_h
-#include <string>
-#include <cmsys/RegularExpression.hxx>
#include <QDialog>
+#include <cmsys/RegularExpression.hxx>
+#include <string>
#include "ui_RegexExplorer.h"
diff --git a/Source/QtDialog/WarningMessagesDialog.h b/Source/QtDialog/WarningMessagesDialog.h
index 6c274a7..4bb739c 100644
--- a/Source/QtDialog/WarningMessagesDialog.h
+++ b/Source/QtDialog/WarningMessagesDialog.h
@@ -16,8 +16,8 @@
#include <QDialog>
#include <QWidget>
-#include "ui_WarningMessagesDialog.h"
#include "QCMake.h"
+#include "ui_WarningMessagesDialog.h"
/**
* Dialog window for setting the warning message related options.
diff --git a/Source/bindexplib.cxx b/Source/bindexplib.cxx
index e7263ae..b179f83 100644
--- a/Source/bindexplib.cxx
+++ b/Source/bindexplib.cxx
@@ -72,11 +72,11 @@
*/
#include "bindexplib.h"
#include <cmsys/Encoding.hxx>
-#include <windows.h>
-#include <stdio.h>
-#include <string>
#include <fstream>
#include <iostream>
+#include <stdio.h>
+#include <string>
+#include <windows.h>
typedef struct cmANON_OBJECT_HEADER_BIGOBJ {
/* same as ANON_OBJECT_HEADER_V2 */
diff --git a/Source/cmAddLibraryCommand.cxx b/Source/cmAddLibraryCommand.cxx
index 5296cbb..e40ecf4 100644
--- a/Source/cmAddLibraryCommand.cxx
+++ b/Source/cmAddLibraryCommand.cxx
@@ -11,8 +11,8 @@
============================================================================*/
#include "cmAddLibraryCommand.h"
-#include "cmake.h"
#include "cmState.h"
+#include "cmake.h"
// cmLibraryCommand
bool cmAddLibraryCommand
diff --git a/Source/cmArchiveWrite.cxx b/Source/cmArchiveWrite.cxx
index e62a2ed..b06b2f5 100644
--- a/Source/cmArchiveWrite.cxx
+++ b/Source/cmArchiveWrite.cxx
@@ -11,12 +11,12 @@
============================================================================*/
#include "cmArchiveWrite.h"
-#include "cmSystemTools.h"
#include "cmLocale.h"
+#include "cmSystemTools.h"
+#include "cm_get_date.h"
+#include <cm_libarchive.h>
#include <cmsys/Directory.hxx>
#include <cmsys/FStream.hxx>
-#include <cm_libarchive.h>
-#include "cm_get_date.h"
#ifndef __LA_SSIZE_T
# define __LA_SSIZE_T la_ssize_t
diff --git a/Source/cmBootstrapCommands1.cxx b/Source/cmBootstrapCommands1.cxx
index 0782b3b..2de8770 100644
--- a/Source/cmBootstrapCommands1.cxx
+++ b/Source/cmBootstrapCommands1.cxx
@@ -13,7 +13,6 @@
// that CMake knows about at compile time.
// This is sort of a boot strapping approach since you would
// like to have CMake to build CMake.
-#include "cmCommands.h"
#include "cmAddCustomCommandCommand.cxx"
#include "cmAddCustomTargetCommand.cxx"
#include "cmAddDefinitionsCommand.cxx"
@@ -27,6 +26,7 @@
#include "cmCMakeMinimumRequired.cxx"
#include "cmCMakePolicyCommand.cxx"
#include "cmCommandArgumentsHelper.cxx"
+#include "cmCommands.h"
#include "cmConfigureFileCommand.cxx"
#include "cmContinueCommand.cxx"
#include "cmCoreTryCompile.cxx"
@@ -42,9 +42,9 @@
#include "cmEndWhileCommand.cxx"
#include "cmExecProgramCommand.cxx"
#include "cmExecuteProcessCommand.cxx"
+#include "cmFileCommand.cxx"
#include "cmFindBase.cxx"
#include "cmFindCommon.cxx"
-#include "cmFileCommand.cxx"
#include "cmFindFileCommand.cxx"
#include "cmFindLibraryCommand.cxx"
#include "cmFindPackageCommand.cxx"
@@ -52,9 +52,9 @@
#include "cmFindProgramCommand.cxx"
#include "cmForEachCommand.cxx"
#include "cmFunctionCommand.cxx"
+#include "cmParseArgumentsCommand.cxx"
#include "cmPathLabel.cxx"
#include "cmSearchPath.cxx"
-#include "cmParseArgumentsCommand.cxx"
void GetBootstrapCommands1(std::vector<cmCommand*>& commands)
{
diff --git a/Source/cmBootstrapCommands2.cxx b/Source/cmBootstrapCommands2.cxx
index e522d8c..38d008d 100644
--- a/Source/cmBootstrapCommands2.cxx
+++ b/Source/cmBootstrapCommands2.cxx
@@ -22,14 +22,15 @@
#include "cmGetPropertyCommand.cxx"
#include "cmGetSourceFilePropertyCommand.cxx"
#include "cmGetTargetPropertyCommand.cxx"
+#include "cmGetTestPropertyCommand.cxx"
#include "cmHexFileConverter.cxx"
#include "cmIfCommand.cxx"
#include "cmIncludeCommand.cxx"
#include "cmIncludeDirectoryCommand.cxx"
#include "cmIncludeRegularExpressionCommand.cxx"
-#include "cmInstallFilesCommand.cxx"
-#include "cmInstallCommandArguments.cxx"
#include "cmInstallCommand.cxx"
+#include "cmInstallCommandArguments.cxx"
+#include "cmInstallFilesCommand.cxx"
#include "cmInstallTargetsCommand.cxx"
#include "cmLinkDirectoriesCommand.cxx"
#include "cmListCommand.cxx"
@@ -48,7 +49,6 @@
#include "cmSetSourceFilesPropertiesCommand.cxx"
#include "cmSetTargetPropertiesCommand.cxx"
#include "cmSetTestsPropertiesCommand.cxx"
-#include "cmGetTestPropertyCommand.cxx"
#include "cmSiteNameCommand.cxx"
#include "cmStringCommand.cxx"
#include "cmSubdirCommand.cxx"
diff --git a/Source/cmCPackPropertiesGenerator.cxx b/Source/cmCPackPropertiesGenerator.cxx
index 35b3d59..3eef55a 100644
--- a/Source/cmCPackPropertiesGenerator.cxx
+++ b/Source/cmCPackPropertiesGenerator.cxx
@@ -1,7 +1,7 @@
#include "cmCPackPropertiesGenerator.h"
-#include "cmOutputConverter.h"
#include "cmLocalGenerator.h"
+#include "cmOutputConverter.h"
cmCPackPropertiesGenerator::cmCPackPropertiesGenerator(
cmLocalGenerator* lg,
diff --git a/Source/cmCPackPropertiesGenerator.h b/Source/cmCPackPropertiesGenerator.h
index eec3df0..e54bcab 100644
--- a/Source/cmCPackPropertiesGenerator.h
+++ b/Source/cmCPackPropertiesGenerator.h
@@ -12,8 +12,8 @@
#ifndef cmCPackPropertiesGenerator_h
#define cmCPackPropertiesGenerator_h
-#include "cmScriptGenerator.h"
#include "cmInstalledFile.h"
+#include "cmScriptGenerator.h"
class cmLocalGenerator;
diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx
index 4ba15ac..1f07a07 100644
--- a/Source/cmCTest.cxx
+++ b/Source/cmCTest.cxx
@@ -13,24 +13,24 @@
#include "cmCTest.h"
-#include "cmake.h"
-#include "cmMakefile.h"
-#include "cmGlobalGenerator.h"
-#include <cmsys/Base64.h>
-#include <cmsys/Directory.hxx>
-#include <cmsys/SystemInformation.hxx>
-#include <cmsys/FStream.hxx>
-#include "cmDynamicLoader.h"
-#include "cmGeneratedFileStream.h"
-#include "cmVersionMacros.h"
+#include "cmAlgorithms.h"
#include "cmCTestCommand.h"
#include "cmCTestStartCommand.h"
-#include "cmAlgorithms.h"
+#include "cmDynamicLoader.h"
+#include "cmGeneratedFileStream.h"
+#include "cmGlobalGenerator.h"
+#include "cmMakefile.h"
#include "cmState.h"
+#include "cmVersionMacros.h"
#include "cmXMLWriter.h"
+#include "cmake.h"
+#include <cmsys/Base64.h>
+#include <cmsys/Directory.hxx>
+#include <cmsys/FStream.hxx>
+#include <cmsys/SystemInformation.hxx>
-#include "cmCTestBuildHandler.h"
#include "cmCTestBuildAndTestHandler.h"
+#include "cmCTestBuildHandler.h"
#include "cmCTestConfigureHandler.h"
#include "cmCTestCoverageHandler.h"
#include "cmCTestMemCheckHandler.h"
@@ -42,14 +42,14 @@
#include "cmVersion.h"
-#include <cmsys/RegularExpression.hxx>
-#include <cmsys/Process.h>
#include <cmsys/Glob.hxx>
+#include <cmsys/Process.h>
+#include <cmsys/RegularExpression.hxx>
-#include <stdlib.h>
-#include <math.h>
-#include <float.h>
#include <ctype.h>
+#include <float.h>
+#include <math.h>
+#include <stdlib.h>
#include <cmsys/auto_ptr.hxx>
diff --git a/Source/cmCacheManager.cxx b/Source/cmCacheManager.cxx
index 2cda018..afa2ba7 100644
--- a/Source/cmCacheManager.cxx
+++ b/Source/cmCacheManager.cxx
@@ -11,14 +11,14 @@
============================================================================*/
#include "cmCacheManager.h"
-#include "cmSystemTools.h"
#include "cmGeneratedFileStream.h"
-#include "cmake.h"
+#include "cmSystemTools.h"
#include "cmVersion.h"
+#include "cmake.h"
#include <cmsys/Directory.hxx>
-#include <cmsys/Glob.hxx>
#include <cmsys/FStream.hxx>
+#include <cmsys/Glob.hxx>
#include <cmsys/RegularExpression.hxx>
cmCacheManager::cmCacheManager()
diff --git a/Source/cmCommand.h b/Source/cmCommand.h
index d7f5c99..d5e394d 100644
--- a/Source/cmCommand.h
+++ b/Source/cmCommand.h
@@ -14,9 +14,9 @@
#include "cmObject.h"
+#include "cmCommandArgumentsHelper.h"
#include "cmListFileCache.h"
#include "cmMakefile.h"
-#include "cmCommandArgumentsHelper.h"
/** \class cmCommand
* \brief Superclass for all commands in CMake.
diff --git a/Source/cmComputeLinkDepends.cxx b/Source/cmComputeLinkDepends.cxx
index 2796fdf..f546fc8 100644
--- a/Source/cmComputeLinkDepends.cxx
+++ b/Source/cmComputeLinkDepends.cxx
@@ -11,13 +11,13 @@
============================================================================*/
#include "cmComputeLinkDepends.h"
+#include "cmAlgorithms.h"
#include "cmComputeComponentGraph.h"
-#include "cmLocalGenerator.h"
#include "cmGlobalGenerator.h"
+#include "cmLocalGenerator.h"
#include "cmMakefile.h"
#include "cmTarget.h"
#include "cmake.h"
-#include "cmAlgorithms.h"
#include <assert.h>
diff --git a/Source/cmComputeLinkDepends.h b/Source/cmComputeLinkDepends.h
index 9b0bfaa..ea23308 100644
--- a/Source/cmComputeLinkDepends.h
+++ b/Source/cmComputeLinkDepends.h
@@ -14,8 +14,8 @@
#include "cmStandardIncludes.h"
-#include "cmLinkItem.h"
#include "cmGraphAdjacencyList.h"
+#include "cmLinkItem.h"
#include <queue>
diff --git a/Source/cmComputeLinkInformation.cxx b/Source/cmComputeLinkInformation.cxx
index 50d8324..f88d58c 100644
--- a/Source/cmComputeLinkInformation.cxx
+++ b/Source/cmComputeLinkInformation.cxx
@@ -14,14 +14,14 @@
#include "cmComputeLinkDepends.h"
#include "cmOrderDirectories.h"
-#include "cmLocalGenerator.h"
+#include "cmAlgorithms.h"
+#include "cmGeneratorTarget.h"
#include "cmGlobalGenerator.h"
-#include "cmState.h"
-#include "cmOutputConverter.h"
+#include "cmLocalGenerator.h"
#include "cmMakefile.h"
-#include "cmGeneratorTarget.h"
+#include "cmOutputConverter.h"
+#include "cmState.h"
#include "cmake.h"
-#include "cmAlgorithms.h"
#include <ctype.h>
diff --git a/Source/cmComputeTargetDepends.cxx b/Source/cmComputeTargetDepends.cxx
index 586b5bf..7f12006 100644
--- a/Source/cmComputeTargetDepends.cxx
+++ b/Source/cmComputeTargetDepends.cxx
@@ -15,9 +15,9 @@
#include "cmGlobalGenerator.h"
#include "cmLocalGenerator.h"
#include "cmMakefile.h"
+#include "cmSourceFile.h"
#include "cmState.h"
#include "cmSystemTools.h"
-#include "cmSourceFile.h"
#include "cmTarget.h"
#include "cmake.h"
diff --git a/Source/cmConditionEvaluator.cxx b/Source/cmConditionEvaluator.cxx
index c43ec47..3711b9b 100644
--- a/Source/cmConditionEvaluator.cxx
+++ b/Source/cmConditionEvaluator.cxx
@@ -12,8 +12,8 @@
#include "cmConditionEvaluator.h"
-#include "cmOutputConverter.h"
#include "cmAlgorithms.h"
+#include "cmOutputConverter.h"
static std::string const keyAND = "AND";
static std::string const keyCOMMAND = "COMMAND";
diff --git a/Source/cmCoreTryCompile.cxx b/Source/cmCoreTryCompile.cxx
index c38429f..231c260 100644
--- a/Source/cmCoreTryCompile.cxx
+++ b/Source/cmCoreTryCompile.cxx
@@ -11,11 +11,11 @@
============================================================================*/
#include "cmCoreTryCompile.h"
-#include "cmake.h"
-#include "cmOutputConverter.h"
-#include "cmGlobalGenerator.h"
#include "cmAlgorithms.h"
#include "cmExportTryCompileFileGenerator.h"
+#include "cmGlobalGenerator.h"
+#include "cmOutputConverter.h"
+#include "cmake.h"
#include <cmsys/Directory.hxx>
#include <assert.h>
diff --git a/Source/cmCryptoHash.cxx b/Source/cmCryptoHash.cxx
index 6616218..d1112f2 100644
--- a/Source/cmCryptoHash.cxx
+++ b/Source/cmCryptoHash.cxx
@@ -11,9 +11,9 @@
============================================================================*/
#include "cmCryptoHash.h"
-#include <cmsys/MD5.h>
-#include <cmsys/FStream.hxx>
#include "cm_sha2.h"
+#include <cmsys/FStream.hxx>
+#include <cmsys/MD5.h>
//----------------------------------------------------------------------------
cmsys::auto_ptr<cmCryptoHash> cmCryptoHash::New(const char* algo)
diff --git a/Source/cmCustomCommandGenerator.cxx b/Source/cmCustomCommandGenerator.cxx
index dc06678..5d3a1ce 100644
--- a/Source/cmCustomCommandGenerator.cxx
+++ b/Source/cmCustomCommandGenerator.cxx
@@ -11,11 +11,11 @@
============================================================================*/
#include "cmCustomCommandGenerator.h"
-#include "cmMakefile.h"
-#include "cmLocalGenerator.h"
#include "cmCustomCommand.h"
-#include "cmOutputConverter.h"
#include "cmGeneratorExpression.h"
+#include "cmLocalGenerator.h"
+#include "cmMakefile.h"
+#include "cmOutputConverter.h"
//----------------------------------------------------------------------------
cmCustomCommandGenerator::cmCustomCommandGenerator(
diff --git a/Source/cmDefinePropertyCommand.cxx b/Source/cmDefinePropertyCommand.cxx
index 0334948..47fc22e 100644
--- a/Source/cmDefinePropertyCommand.cxx
+++ b/Source/cmDefinePropertyCommand.cxx
@@ -11,8 +11,8 @@
============================================================================*/
#include "cmDefinePropertyCommand.h"
-#include "cmake.h"
#include "cmState.h"
+#include "cmake.h"
bool cmDefinePropertyCommand
::InitialPass(std::vector<std::string> const& args, cmExecutionStatus &)
diff --git a/Source/cmDepends.cxx b/Source/cmDepends.cxx
index d419011..40b552b 100644
--- a/Source/cmDepends.cxx
+++ b/Source/cmDepends.cxx
@@ -11,13 +11,13 @@
============================================================================*/
#include "cmDepends.h"
+#include "cmFileTimeComparison.h"
+#include "cmGeneratedFileStream.h"
#include "cmLocalGenerator.h"
#include "cmMakefile.h"
-#include "cmGeneratedFileStream.h"
#include "cmSystemTools.h"
-#include "cmFileTimeComparison.h"
-#include <string.h>
#include <cmsys/FStream.hxx>
+#include <string.h>
//----------------------------------------------------------------------------
cmDepends::cmDepends(cmLocalGenerator* lg, const char* targetDir):
diff --git a/Source/cmDependsC.cxx b/Source/cmDependsC.cxx
index 6cdd4c1..6bf815e 100644
--- a/Source/cmDependsC.cxx
+++ b/Source/cmDependsC.cxx
@@ -11,11 +11,11 @@
============================================================================*/
#include "cmDependsC.h"
+#include "cmAlgorithms.h"
#include "cmFileTimeComparison.h"
#include "cmLocalGenerator.h"
#include "cmMakefile.h"
#include "cmSystemTools.h"
-#include "cmAlgorithms.h"
#include <cmsys/FStream.hxx>
#include <ctype.h> // isspace
diff --git a/Source/cmDependsFortran.cxx b/Source/cmDependsFortran.cxx
index 80f560f..a7909b2 100644
--- a/Source/cmDependsFortran.cxx
+++ b/Source/cmDependsFortran.cxx
@@ -11,14 +11,14 @@
============================================================================*/
#include "cmDependsFortran.h"
-#include "cmSystemTools.h"
+#include "cmGeneratedFileStream.h"
#include "cmLocalGenerator.h"
#include "cmMakefile.h"
-#include "cmGeneratedFileStream.h"
+#include "cmSystemTools.h"
#include "cmFortranParser.h" /* Interface to parser object. */
-#include <cmsys/FStream.hxx>
#include <assert.h>
+#include <cmsys/FStream.hxx>
// TODO: Test compiler for the case of the mod file. Some always
// use lower case and some always use upper case. I do not know if any
diff --git a/Source/cmDocumentation.cxx b/Source/cmDocumentation.cxx
index 4f34755..81e6796 100644
--- a/Source/cmDocumentation.cxx
+++ b/Source/cmDocumentation.cxx
@@ -11,14 +11,14 @@
============================================================================*/
#include "cmDocumentation.h"
+#include "cmAlgorithms.h"
+#include "cmRST.h"
#include "cmSystemTools.h"
#include "cmVersion.h"
-#include "cmRST.h"
-#include "cmAlgorithms.h"
#include <cmsys/Directory.hxx>
-#include <cmsys/Glob.hxx>
#include <cmsys/FStream.hxx>
+#include <cmsys/Glob.hxx>
#include <ctype.h>
diff --git a/Source/cmELF.cxx b/Source/cmELF.cxx
index 8d8e396..0e6f577 100644
--- a/Source/cmELF.cxx
+++ b/Source/cmELF.cxx
@@ -13,13 +13,13 @@
#include "cmELF.h"
-#include <cmsys/auto_ptr.hxx>
#include <cmsys/FStream.hxx>
+#include <cmsys/auto_ptr.hxx>
// Include the ELF format information system header.
#if defined(__OpenBSD__)
-# include <stdint.h>
# include <elf_abi.h>
+# include <stdint.h>
#elif defined(__HAIKU__)
# include <elf32.h>
# include <elf64.h>
diff --git a/Source/cmExportBuildFileGenerator.cxx b/Source/cmExportBuildFileGenerator.cxx
index dcb2187..87ea2c2 100644
--- a/Source/cmExportBuildFileGenerator.cxx
+++ b/Source/cmExportBuildFileGenerator.cxx
@@ -11,9 +11,9 @@
============================================================================*/
#include "cmExportBuildFileGenerator.h"
-#include "cmLocalGenerator.h"
-#include "cmGlobalGenerator.h"
#include "cmExportSet.h"
+#include "cmGlobalGenerator.h"
+#include "cmLocalGenerator.h"
#include "cmTargetExport.h"
//----------------------------------------------------------------------------
diff --git a/Source/cmExportCommand.cxx b/Source/cmExportCommand.cxx
index 94e1d92..bbd07db 100644
--- a/Source/cmExportCommand.cxx
+++ b/Source/cmExportCommand.cxx
@@ -11,12 +11,12 @@
============================================================================*/
#include "cmExportCommand.h"
-#include "cmGlobalGenerator.h"
#include "cmGeneratedFileStream.h"
+#include "cmGlobalGenerator.h"
#include "cmake.h"
-#include <cmsys/RegularExpression.hxx>
#include <cmsys/Encoding.hxx>
+#include <cmsys/RegularExpression.hxx>
#include "cmExportBuildFileGenerator.h"
diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx
index c005995..2b3ce14 100644
--- a/Source/cmExportFileGenerator.cxx
+++ b/Source/cmExportFileGenerator.cxx
@@ -11,22 +11,22 @@
============================================================================*/
#include "cmExportFileGenerator.h"
+#include "cmAlgorithms.h"
+#include "cmComputeLinkInformation.h"
#include "cmExportSet.h"
#include "cmGeneratedFileStream.h"
#include "cmGlobalGenerator.h"
#include "cmInstallExportGenerator.h"
#include "cmLocalGenerator.h"
#include "cmMakefile.h"
+#include "cmOutputConverter.h"
#include "cmSystemTools.h"
#include "cmTargetExport.h"
#include "cmVersion.h"
-#include "cmComputeLinkInformation.h"
-#include "cmAlgorithms.h"
-#include "cmOutputConverter.h"
-#include <cmsys/auto_ptr.hxx>
-#include <cmsys/FStream.hxx>
#include <assert.h>
+#include <cmsys/FStream.hxx>
+#include <cmsys/auto_ptr.hxx>
//----------------------------------------------------------------------------
static std::string cmExportFileGeneratorEscape(std::string const& str)
diff --git a/Source/cmExportFileGenerator.h b/Source/cmExportFileGenerator.h
index 18f0b00..9fc02a4 100644
--- a/Source/cmExportFileGenerator.h
+++ b/Source/cmExportFileGenerator.h
@@ -15,8 +15,8 @@
#include "cmCommand.h"
#include "cmGeneratorExpression.h"
-#include "cmVersionMacros.h"
#include "cmVersion.h"
+#include "cmVersionMacros.h"
#define STRINGIFY_HELPER(X) #X
#define STRINGIFY(X) STRINGIFY_HELPER(X)
diff --git a/Source/cmExportInstallFileGenerator.cxx b/Source/cmExportInstallFileGenerator.cxx
index 71418e8..0ea24c1 100644
--- a/Source/cmExportInstallFileGenerator.cxx
+++ b/Source/cmExportInstallFileGenerator.cxx
@@ -11,15 +11,15 @@
============================================================================*/
#include "cmExportInstallFileGenerator.h"
+#include "cmAlgorithms.h"
#include "cmExportSet.h"
#include "cmExportSetMap.h"
#include "cmGeneratedFileStream.h"
#include "cmGlobalGenerator.h"
-#include "cmLocalGenerator.h"
#include "cmInstallExportGenerator.h"
#include "cmInstallTargetGenerator.h"
+#include "cmLocalGenerator.h"
#include "cmTargetExport.h"
-#include "cmAlgorithms.h"
//----------------------------------------------------------------------------
cmExportInstallFileGenerator
diff --git a/Source/cmExportLibraryDependenciesCommand.cxx b/Source/cmExportLibraryDependenciesCommand.cxx
index 132df74..a715070 100644
--- a/Source/cmExportLibraryDependenciesCommand.cxx
+++ b/Source/cmExportLibraryDependenciesCommand.cxx
@@ -11,10 +11,10 @@
============================================================================*/
#include "cmExportLibraryDependenciesCommand.h"
-#include "cmGlobalGenerator.h"
#include "cmGeneratedFileStream.h"
-#include "cmake.h"
+#include "cmGlobalGenerator.h"
#include "cmVersion.h"
+#include "cmake.h"
#include <cmsys/auto_ptr.hxx>
diff --git a/Source/cmExportSet.cxx b/Source/cmExportSet.cxx
index e7739fb..83c4fdc 100644
--- a/Source/cmExportSet.cxx
+++ b/Source/cmExportSet.cxx
@@ -12,9 +12,9 @@
#include "cmExportSet.h"
-#include "cmTargetExport.h"
#include "cmAlgorithms.h"
#include "cmLocalGenerator.h"
+#include "cmTargetExport.h"
cmExportSet::~cmExportSet()
{
diff --git a/Source/cmExportSetMap.cxx b/Source/cmExportSetMap.cxx
index b0021e7..d267cd3 100644
--- a/Source/cmExportSetMap.cxx
+++ b/Source/cmExportSetMap.cxx
@@ -12,8 +12,8 @@
#include "cmExportSetMap.h"
-#include "cmExportSet.h"
#include "cmAlgorithms.h"
+#include "cmExportSet.h"
cmExportSet* cmExportSetMap::operator[](const std::string &name)
{
diff --git a/Source/cmExportTryCompileFileGenerator.cxx b/Source/cmExportTryCompileFileGenerator.cxx
index 83127e7..5bafa1c 100644
--- a/Source/cmExportTryCompileFileGenerator.cxx
+++ b/Source/cmExportTryCompileFileGenerator.cxx
@@ -13,9 +13,9 @@
#include "cmExportTryCompileFileGenerator.h"
#include "cmGeneratedFileStream.h"
+#include "cmGeneratorExpressionDAGChecker.h"
#include "cmGlobalGenerator.h"
#include "cmLocalGenerator.h"
-#include "cmGeneratorExpressionDAGChecker.h"
//----------------------------------------------------------------------------
cmExportTryCompileFileGenerator::cmExportTryCompileFileGenerator(
diff --git a/Source/cmExtraCodeBlocksGenerator.cxx b/Source/cmExtraCodeBlocksGenerator.cxx
index 2d26cc3..f6be583 100644
--- a/Source/cmExtraCodeBlocksGenerator.cxx
+++ b/Source/cmExtraCodeBlocksGenerator.cxx
@@ -12,14 +12,14 @@
============================================================================*/
#include "cmExtraCodeBlocksGenerator.h"
+#include "cmGeneratedFileStream.h"
#include "cmGlobalUnixMakefileGenerator3.h"
#include "cmLocalUnixMakefileGenerator3.h"
#include "cmMakefile.h"
-#include "cmake.h"
#include "cmSourceFile.h"
-#include "cmGeneratedFileStream.h"
#include "cmSystemTools.h"
#include "cmXMLWriter.h"
+#include "cmake.h"
#include <cmsys/SystemTools.hxx>
diff --git a/Source/cmExtraCodeLiteGenerator.cxx b/Source/cmExtraCodeLiteGenerator.cxx
index e2b84c6..6c7d5f6 100644
--- a/Source/cmExtraCodeLiteGenerator.cxx
+++ b/Source/cmExtraCodeLiteGenerator.cxx
@@ -13,19 +13,19 @@
============================================================================*/
#include "cmExtraCodeLiteGenerator.h"
+#include "cmGeneratedFileStream.h"
#include "cmGlobalUnixMakefileGenerator3.h"
#include "cmLocalUnixMakefileGenerator3.h"
#include "cmMakefile.h"
-#include "cmake.h"
#include "cmSourceFile.h"
-#include "cmGeneratedFileStream.h"
#include "cmSystemTools.h"
+#include "cmake.h"
-#include <cmsys/SystemTools.hxx>
-#include <cmsys/SystemInformation.hxx>
-#include <cmsys/Directory.hxx>
#include "cmStandardIncludes.h"
#include "cmXMLWriter.h"
+#include <cmsys/Directory.hxx>
+#include <cmsys/SystemInformation.hxx>
+#include <cmsys/SystemTools.hxx>
//----------------------------------------------------------------------------
void cmExtraCodeLiteGenerator::GetDocumentation(cmDocumentationEntry& entry,
diff --git a/Source/cmExtraEclipseCDT4Generator.cxx b/Source/cmExtraEclipseCDT4Generator.cxx
index 22b2f91..40cc904 100644
--- a/Source/cmExtraEclipseCDT4Generator.cxx
+++ b/Source/cmExtraEclipseCDT4Generator.cxx
@@ -13,18 +13,18 @@
============================================================================*/
#include "cmExtraEclipseCDT4Generator.h"
+#include "cmGeneratedFileStream.h"
#include "cmGlobalUnixMakefileGenerator3.h"
#include "cmLocalUnixMakefileGenerator3.h"
#include "cmMakefile.h"
-#include "cmGeneratedFileStream.h"
+#include "cmSourceFile.h"
#include "cmState.h"
#include "cmTarget.h"
-#include "cmSourceFile.h"
#include "cmXMLWriter.h"
#include "cmSystemTools.h"
-#include <stdlib.h>
#include <assert.h>
+#include <stdlib.h>
static void AppendAttribute(cmXMLWriter& xml, const char* keyval)
{
diff --git a/Source/cmExtraKateGenerator.cxx b/Source/cmExtraKateGenerator.cxx
index 8e60d50..4b779d8 100644
--- a/Source/cmExtraKateGenerator.cxx
+++ b/Source/cmExtraKateGenerator.cxx
@@ -12,13 +12,13 @@
============================================================================*/
#include "cmExtraKateGenerator.h"
+#include "cmGeneratedFileStream.h"
#include "cmGlobalUnixMakefileGenerator3.h"
#include "cmLocalUnixMakefileGenerator3.h"
#include "cmMakefile.h"
-#include "cmake.h"
#include "cmSourceFile.h"
-#include "cmGeneratedFileStream.h"
#include "cmSystemTools.h"
+#include "cmake.h"
#include <cmsys/SystemTools.hxx>
diff --git a/Source/cmExtraSublimeTextGenerator.cxx b/Source/cmExtraSublimeTextGenerator.cxx
index f84eeb0..a8367c4 100644
--- a/Source/cmExtraSublimeTextGenerator.cxx
+++ b/Source/cmExtraSublimeTextGenerator.cxx
@@ -12,7 +12,6 @@
============================================================================*/
#include "cmExtraSublimeTextGenerator.h"
-#include "cmake.h"
#include "cmGeneratedFileStream.h"
#include "cmGeneratorTarget.h"
#include "cmGlobalUnixMakefileGenerator3.h"
@@ -21,6 +20,7 @@
#include "cmMakefile.h"
#include "cmSourceFile.h"
#include "cmSystemTools.h"
+#include "cmake.h"
#include <cmsys/SystemTools.hxx>
diff --git a/Source/cmFileCommand.cxx b/Source/cmFileCommand.cxx
index 42922e1..035b97f 100644
--- a/Source/cmFileCommand.cxx
+++ b/Source/cmFileCommand.cxx
@@ -11,14 +11,14 @@
============================================================================*/
#include "cmFileCommand.h"
+#include "cmAlgorithms.h"
+#include "cmCryptoHash.h"
#include "cmCryptoHash.h"
-#include "cmake.h"
-#include "cmHexFileConverter.h"
-#include "cmInstallType.h"
#include "cmFileTimeComparison.h"
#include "cmGlobalGenerator.h"
-#include "cmCryptoHash.h"
-#include "cmAlgorithms.h"
+#include "cmHexFileConverter.h"
+#include "cmInstallType.h"
+#include "cmake.h"
#include "cmTimestamp.h"
@@ -28,16 +28,16 @@
#endif
#undef GetCurrentDirectory
-#include <assert.h>
#include <sys/types.h>
+#include <assert.h>
#include <sys/stat.h>
-#include <cmsys/auto_ptr.hxx>
#include <cmsys/Directory.hxx>
+#include <cmsys/Encoding.hxx>
+#include <cmsys/FStream.hxx>
#include <cmsys/Glob.hxx>
#include <cmsys/RegularExpression.hxx>
-#include <cmsys/FStream.hxx>
-#include <cmsys/Encoding.hxx>
+#include <cmsys/auto_ptr.hxx>
// Table of permissions flags.
#if defined(_WIN32) && !defined(__CYGWIN__)
diff --git a/Source/cmFileLock.cxx b/Source/cmFileLock.cxx
index e6aa5f4..0d41c53 100644
--- a/Source/cmFileLock.cxx
+++ b/Source/cmFileLock.cxx
@@ -12,8 +12,8 @@
#include "cmFileLock.h"
-#include <assert.h>
#include "cmFileLockResult.h"
+#include <assert.h>
// Common implementation
diff --git a/Source/cmFileLockPool.cxx b/Source/cmFileLockPool.cxx
index 3710eb0..939a8f5 100644
--- a/Source/cmFileLockPool.cxx
+++ b/Source/cmFileLockPool.cxx
@@ -14,9 +14,9 @@
#include <assert.h>
+#include "cmAlgorithms.h"
#include "cmFileLock.h"
#include "cmFileLockResult.h"
-#include "cmAlgorithms.h"
cmFileLockPool::cmFileLockPool()
{
diff --git a/Source/cmFileLockUnix.cxx b/Source/cmFileLockUnix.cxx
index 36a2d72..f5e77be 100644
--- a/Source/cmFileLockUnix.cxx
+++ b/Source/cmFileLockUnix.cxx
@@ -12,11 +12,11 @@
#include "cmFileLock.h"
+#include "cmSystemTools.h"
#include <errno.h> // errno
-#include <stdio.h> // SEEK_SET
#include <fcntl.h>
+#include <stdio.h> // SEEK_SET
#include <unistd.h>
-#include "cmSystemTools.h"
cmFileLock::cmFileLock(): File(-1)
{
diff --git a/Source/cmFileLockWin32.cxx b/Source/cmFileLockWin32.cxx
index dc65948..e40ae2c 100644
--- a/Source/cmFileLockWin32.cxx
+++ b/Source/cmFileLockWin32.cxx
@@ -12,8 +12,8 @@
#include "cmFileLock.h"
-#include <windows.h> // CreateFileW
#include "cmSystemTools.h"
+#include <windows.h> // CreateFileW
cmFileLock::cmFileLock(): File(INVALID_HANDLE_VALUE)
{
diff --git a/Source/cmFindCommon.cxx b/Source/cmFindCommon.cxx
index 1286a00..d70fa89 100644
--- a/Source/cmFindCommon.cxx
+++ b/Source/cmFindCommon.cxx
@@ -11,8 +11,8 @@
============================================================================*/
#include "cmFindCommon.h"
-#include <functional>
#include <algorithm>
+#include <functional>
//----------------------------------------------------------------------------
cmFindCommon::PathGroup cmFindCommon::PathGroup::All("ALL");
diff --git a/Source/cmFindCommon.h b/Source/cmFindCommon.h
index 3fefc8d..2b87427 100644
--- a/Source/cmFindCommon.h
+++ b/Source/cmFindCommon.h
@@ -13,8 +13,8 @@
#define cmFindCommon_h
#include "cmCommand.h"
-#include "cmSearchPath.h"
#include "cmPathLabel.h"
+#include "cmSearchPath.h"
/** \class cmFindCommon
* \brief Base class for FIND_XXX implementations.
diff --git a/Source/cmFindPackageCommand.cxx b/Source/cmFindPackageCommand.cxx
index 64176e7..97f1563 100644
--- a/Source/cmFindPackageCommand.cxx
+++ b/Source/cmFindPackageCommand.cxx
@@ -11,19 +11,19 @@
============================================================================*/
#include "cmFindPackageCommand.h"
+#include "cmAlgorithms.h"
#include <cmsys/Directory.hxx>
-#include <cmsys/RegularExpression.hxx>
#include <cmsys/Encoding.hxx>
-#include "cmAlgorithms.h"
+#include <cmsys/RegularExpression.hxx>
#ifdef CMAKE_BUILD_WITH_CMAKE
#include "cmVariableWatch.h"
#endif
#if defined(__HAIKU__)
-#include <string.h>
#include <FindDirectory.h>
#include <StorageDefs.h>
+#include <string.h>
#endif
//----------------------------------------------------------------------------
diff --git a/Source/cmGeneratorExpression.cxx b/Source/cmGeneratorExpression.cxx
index 6796a01..d0ed28d 100644
--- a/Source/cmGeneratorExpression.cxx
+++ b/Source/cmGeneratorExpression.cxx
@@ -15,10 +15,10 @@
#include "cmAlgorithms.h"
#include "cmSystemTools.h"
+#include "cmGeneratorExpressionDAGChecker.h"
#include "cmGeneratorExpressionEvaluator.h"
#include "cmGeneratorExpressionLexer.h"
#include "cmGeneratorExpressionParser.h"
-#include "cmGeneratorExpressionDAGChecker.h"
//----------------------------------------------------------------------------
cmGeneratorExpression::cmGeneratorExpression(
diff --git a/Source/cmGeneratorExpressionContext.h b/Source/cmGeneratorExpressionContext.h
index e802138..68cdf49 100644
--- a/Source/cmGeneratorExpressionContext.h
+++ b/Source/cmGeneratorExpressionContext.h
@@ -14,8 +14,8 @@
#include "cmListFileCache.h"
-#include <set>
#include <map>
+#include <set>
#include <string>
class cmGeneratorTarget;
diff --git a/Source/cmGeneratorExpressionDAGChecker.cxx b/Source/cmGeneratorExpressionDAGChecker.cxx
index c3b0272..00a497c 100644
--- a/Source/cmGeneratorExpressionDAGChecker.cxx
+++ b/Source/cmGeneratorExpressionDAGChecker.cxx
@@ -12,8 +12,8 @@
#include "cmGeneratorExpressionDAGChecker.h"
-#include "cmLocalGenerator.h"
#include "cmAlgorithms.h"
+#include "cmLocalGenerator.h"
//----------------------------------------------------------------------------
cmGeneratorExpressionDAGChecker::cmGeneratorExpressionDAGChecker(
diff --git a/Source/cmGeneratorExpressionEvaluationFile.cxx b/Source/cmGeneratorExpressionEvaluationFile.cxx
index 4ac2a0d..5d8050b 100644
--- a/Source/cmGeneratorExpressionEvaluationFile.cxx
+++ b/Source/cmGeneratorExpressionEvaluationFile.cxx
@@ -12,11 +12,11 @@
#include "cmGeneratorExpressionEvaluationFile.h"
-#include "cmMakefile.h"
-#include "cmLocalGenerator.h"
+#include "cmGeneratedFileStream.h"
#include "cmGlobalGenerator.h"
+#include "cmLocalGenerator.h"
+#include "cmMakefile.h"
#include "cmSourceFile.h"
-#include "cmGeneratedFileStream.h"
#include <cmsys/FStream.hxx>
#include <assert.h>
diff --git a/Source/cmGeneratorExpressionEvaluator.cxx b/Source/cmGeneratorExpressionEvaluator.cxx
index 0fe864c..d9dd3b1 100644
--- a/Source/cmGeneratorExpressionEvaluator.cxx
+++ b/Source/cmGeneratorExpressionEvaluator.cxx
@@ -11,14 +11,14 @@
============================================================================*/
#include "cmGeneratorExpressionEvaluator.h"
-#include "cmMakefile.h"
-#include "cmGeneratorExpressionParser.h"
-#include "cmGeneratorExpressionDAGChecker.h"
+#include "cmAlgorithms.h"
#include "cmGeneratorExpression.h"
-#include "cmLocalGenerator.h"
+#include "cmGeneratorExpressionDAGChecker.h"
+#include "cmGeneratorExpressionParser.h"
#include "cmGlobalGenerator.h"
+#include "cmLocalGenerator.h"
+#include "cmMakefile.h"
#include "cmSourceFile.h"
-#include "cmAlgorithms.h"
#include <cmsys/String.h>
diff --git a/Source/cmGeneratorExpressionEvaluator.h b/Source/cmGeneratorExpressionEvaluator.h
index ba27e5a..b60bb5d 100644
--- a/Source/cmGeneratorExpressionEvaluator.h
+++ b/Source/cmGeneratorExpressionEvaluator.h
@@ -16,8 +16,8 @@
#include "cmListFileCache.h"
-#include <vector>
#include <string>
+#include <vector>
struct cmGeneratorExpressionDAGChecker;
struct cmGeneratorExpressionNode;
diff --git a/Source/cmGeneratorExpressionNode.cxx b/Source/cmGeneratorExpressionNode.cxx
index 7f3d7d6..a9227b0 100644
--- a/Source/cmGeneratorExpressionNode.cxx
+++ b/Source/cmGeneratorExpressionNode.cxx
@@ -12,10 +12,10 @@
#include "cmGeneratorExpressionNode.h"
-#include "cmGlobalGenerator.h"
#include "cmAlgorithms.h"
-#include "cmOutputConverter.h"
+#include "cmGlobalGenerator.h"
#include "cmMakefile.h"
+#include "cmOutputConverter.h"
//----------------------------------------------------------------------------
std::string cmGeneratorExpressionNode::EvaluateDependentExpression(
diff --git a/Source/cmGeneratorExpressionNode.h b/Source/cmGeneratorExpressionNode.h
index b803d12..2d66727 100644
--- a/Source/cmGeneratorExpressionNode.h
+++ b/Source/cmGeneratorExpressionNode.h
@@ -14,9 +14,9 @@
#include "cmGeneratorExpression.h"
+#include "cmGeneratorExpressionDAGChecker.h"
#include "cmGeneratorExpressionEvaluator.h"
#include "cmGeneratorExpressionParser.h"
-#include "cmGeneratorExpressionDAGChecker.h"
#include "cmLocalGenerator.h"
#include "cmSourceFile.h"
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index d7c2782..f115d83 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -11,21 +11,21 @@
============================================================================*/
#include "cmGeneratorTarget.h"
-#include "cmTarget.h"
-#include "cmMakefile.h"
-#include "cmLocalGenerator.h"
-#include "cmGlobalGenerator.h"
-#include "cmSourceFile.h"
-#include "cmGeneratorExpression.h"
-#include "cmGeneratorExpressionDAGChecker.h"
+#include "cmAlgorithms.h"
#include "cmComputeLinkInformation.h"
#include "cmCustomCommandGenerator.h"
-#include "cmAlgorithms.h"
+#include "cmGeneratorExpression.h"
+#include "cmGeneratorExpressionDAGChecker.h"
+#include "cmGlobalGenerator.h"
+#include "cmLocalGenerator.h"
+#include "cmMakefile.h"
+#include "cmSourceFile.h"
+#include "cmTarget.h"
#include <queue>
-#include <errno.h>
#include "assert.h"
+#include <errno.h>
#if defined(CMAKE_BUILD_WITH_CMAKE)
#include <cmsys/hash_set.hxx>
diff --git a/Source/cmGetCMakePropertyCommand.cxx b/Source/cmGetCMakePropertyCommand.cxx
index 1a91183..2be4dec 100644
--- a/Source/cmGetCMakePropertyCommand.cxx
+++ b/Source/cmGetCMakePropertyCommand.cxx
@@ -11,10 +11,10 @@
============================================================================*/
#include "cmGetCMakePropertyCommand.h"
+#include "cmAlgorithms.h"
#include "cmGlobalGenerator.h"
-#include "cmake.h"
#include "cmState.h"
-#include "cmAlgorithms.h"
+#include "cmake.h"
// cmGetCMakePropertyCommand
bool cmGetCMakePropertyCommand
diff --git a/Source/cmGetPropertyCommand.cxx b/Source/cmGetPropertyCommand.cxx
index 617a811..bbeae4b 100644
--- a/Source/cmGetPropertyCommand.cxx
+++ b/Source/cmGetPropertyCommand.cxx
@@ -11,12 +11,12 @@
============================================================================*/
#include "cmGetPropertyCommand.h"
-#include "cmake.h"
-#include "cmState.h"
-#include "cmTest.h"
#include "cmGlobalGenerator.h"
-#include "cmSourceFile.h"
#include "cmPropertyDefinition.h"
+#include "cmSourceFile.h"
+#include "cmState.h"
+#include "cmTest.h"
+#include "cmake.h"
//----------------------------------------------------------------------------
cmGetPropertyCommand::cmGetPropertyCommand()
diff --git a/Source/cmGetTestPropertyCommand.cxx b/Source/cmGetTestPropertyCommand.cxx
index bf34589..3d7a013 100644
--- a/Source/cmGetTestPropertyCommand.cxx
+++ b/Source/cmGetTestPropertyCommand.cxx
@@ -11,8 +11,8 @@
============================================================================*/
#include "cmGetTestPropertyCommand.h"
-#include "cmake.h"
#include "cmTest.h"
+#include "cmake.h"
// cmGetTestPropertyCommand
bool cmGetTestPropertyCommand
diff --git a/Source/cmGhsMultiTargetGenerator.cxx b/Source/cmGhsMultiTargetGenerator.cxx
index b7b122c..f845c59 100644
--- a/Source/cmGhsMultiTargetGenerator.cxx
+++ b/Source/cmGhsMultiTargetGenerator.cxx
@@ -11,12 +11,12 @@
============================================================================*/
#include "cmGhsMultiTargetGenerator.h"
+#include "cmGeneratedFileStream.h"
#include "cmGlobalGhsMultiGenerator.h"
#include "cmLocalGhsMultiGenerator.h"
#include "cmMakefile.h"
-#include "cmTarget.h"
-#include "cmGeneratedFileStream.h"
#include "cmSourceFile.h"
+#include "cmTarget.h"
#include <assert.h>
#include <cmAlgorithms.h>
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 5040cfd..84ade25 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -18,31 +18,31 @@
#include "cmGlobalGenerator.h"
-#include "cmLocalGenerator.h"
+#include "cmAlgorithms.h"
+#include "cmCPackPropertiesGenerator.h"
+#include "cmComputeTargetDepends.h"
+#include "cmExportBuildFileGenerator.h"
#include "cmExternalMakefileProjectGenerator.h"
-#include "cmake.h"
-#include "cmState.h"
+#include "cmGeneratedFileStream.h"
+#include "cmGeneratorExpression.h"
+#include "cmGeneratorTarget.h"
+#include "cmInstallGenerator.h"
+#include "cmLocalGenerator.h"
#include "cmMakefile.h"
#include "cmQtAutoGeneratorInitializer.h"
#include "cmSourceFile.h"
-#include "cmVersion.h"
+#include "cmState.h"
#include "cmTargetExport.h"
-#include "cmComputeTargetDepends.h"
-#include "cmGeneratedFileStream.h"
-#include "cmGeneratorTarget.h"
-#include "cmGeneratorExpression.h"
-#include "cmExportBuildFileGenerator.h"
-#include "cmCPackPropertiesGenerator.h"
-#include "cmAlgorithms.h"
-#include "cmInstallGenerator.h"
+#include "cmVersion.h"
+#include "cmake.h"
#include <cmsys/Directory.hxx>
#include <cmsys/FStream.hxx>
#if defined(CMAKE_BUILD_WITH_CMAKE)
-# include <cmsys/MD5.h>
# include "cm_jsoncpp_value.h"
# include "cm_jsoncpp_writer.h"
+# include <cmsys/MD5.h>
#endif
#include <stdlib.h> // required for atof
diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h
index 14c7d67..1576f09 100644
--- a/Source/cmGlobalGenerator.h
+++ b/Source/cmGlobalGenerator.h
@@ -15,13 +15,13 @@
#include "cmStandardIncludes.h"
-#include "cmTarget.h" // For cmTargets
-#include "cmTargetDepend.h" // For cmTargetDependSet
-#include "cmSystemTools.h" // for cmSystemTools::OutputOption
#include "cmExportSetMap.h" // For cmExportSetMap
-#include "cmGeneratorTarget.h"
#include "cmGeneratorExpression.h"
+#include "cmGeneratorTarget.h"
#include "cmState.h"
+#include "cmSystemTools.h" // for cmSystemTools::OutputOption
+#include "cmTarget.h" // For cmTargets
+#include "cmTargetDepend.h" // For cmTargetDependSet
#if defined(CMAKE_BUILD_WITH_CMAKE)
# include "cmFileLockPool.h"
diff --git a/Source/cmGlobalGhsMultiGenerator.cxx b/Source/cmGlobalGhsMultiGenerator.cxx
index e9a48c8..df7011c 100644
--- a/Source/cmGlobalGhsMultiGenerator.cxx
+++ b/Source/cmGlobalGhsMultiGenerator.cxx
@@ -11,13 +11,13 @@
============================================================================*/
#include "cmGlobalGhsMultiGenerator.h"
+#include "cmGeneratedFileStream.h"
+#include "cmGhsMultiTargetGenerator.h"
#include "cmLocalGhsMultiGenerator.h"
#include "cmMakefile.h"
#include "cmVersion.h"
-#include "cmGeneratedFileStream.h"
-#include "cmGhsMultiTargetGenerator.h"
-#include <cmsys/SystemTools.hxx>
#include <cmAlgorithms.h>
+#include <cmsys/SystemTools.hxx>
const char *cmGlobalGhsMultiGenerator::FILE_EXTENSION = ".gpj";
const char *cmGlobalGhsMultiGenerator::DEFAULT_MAKE_PROGRAM = "gbuild";
diff --git a/Source/cmGlobalGhsMultiGenerator.h b/Source/cmGlobalGhsMultiGenerator.h
index b8d6ade..5de9d2b 100644
--- a/Source/cmGlobalGhsMultiGenerator.h
+++ b/Source/cmGlobalGhsMultiGenerator.h
@@ -14,8 +14,8 @@
#include "cmGlobalGenerator.h"
-#include "cmGlobalGeneratorFactory.h"
#include "cmGhsMultiGpj.h"
+#include "cmGlobalGeneratorFactory.h"
class cmGeneratedFileStream;
diff --git a/Source/cmGlobalKdevelopGenerator.cxx b/Source/cmGlobalKdevelopGenerator.cxx
index 758caae..e2f1fc5 100644
--- a/Source/cmGlobalKdevelopGenerator.cxx
+++ b/Source/cmGlobalKdevelopGenerator.cxx
@@ -12,18 +12,18 @@
============================================================================*/
#include "cmGlobalKdevelopGenerator.h"
+#include "cmGeneratedFileStream.h"
#include "cmGlobalUnixMakefileGenerator3.h"
#include "cmLocalUnixMakefileGenerator3.h"
#include "cmMakefile.h"
-#include "cmake.h"
#include "cmSourceFile.h"
-#include "cmGeneratedFileStream.h"
#include "cmSystemTools.h"
#include "cmXMLWriter.h"
+#include "cmake.h"
-#include <cmsys/SystemTools.hxx>
#include <cmsys/Directory.hxx>
#include <cmsys/FStream.hxx>
+#include <cmsys/SystemTools.hxx>
//----------------------------------------------------------------------------
void cmGlobalKdevelopGenerator
diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx
index 88766fe..a8a7262 100644
--- a/Source/cmGlobalNinjaGenerator.cxx
+++ b/Source/cmGlobalNinjaGenerator.cxx
@@ -12,13 +12,13 @@
============================================================================*/
#include "cmGlobalNinjaGenerator.h"
+#include "cmAlgorithms.h"
#include "cmGeneratedFileStream.h"
#include "cmGeneratorExpressionEvaluationFile.h"
#include "cmGeneratorTarget.h"
#include "cmLocalNinjaGenerator.h"
#include "cmMakefile.h"
#include "cmVersion.h"
-#include "cmAlgorithms.h"
#include <algorithm>
#include <assert.h>
diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx
index e35aa2e..0098f1e 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.cxx
+++ b/Source/cmGlobalUnixMakefileGenerator3.cxx
@@ -11,13 +11,13 @@
============================================================================*/
#include "cmGlobalUnixMakefileGenerator3.h"
+#include "cmAlgorithms.h"
+#include "cmGeneratedFileStream.h"
+#include "cmGeneratorTarget.h"
#include "cmLocalUnixMakefileGenerator3.h"
-#include "cmMakefileTargetGenerator.h"
#include "cmMakefile.h"
+#include "cmMakefileTargetGenerator.h"
#include "cmake.h"
-#include "cmGeneratedFileStream.h"
-#include "cmGeneratorTarget.h"
-#include "cmAlgorithms.h"
cmGlobalUnixMakefileGenerator3::cmGlobalUnixMakefileGenerator3(cmake* cm)
: cmGlobalCommonGenerator(cm)
diff --git a/Source/cmGlobalVisualStudio10Generator.cxx b/Source/cmGlobalVisualStudio10Generator.cxx
index ee5e605..22ffbcc 100644
--- a/Source/cmGlobalVisualStudio10Generator.cxx
+++ b/Source/cmGlobalVisualStudio10Generator.cxx
@@ -13,13 +13,13 @@
#include "cmGlobalVisualStudio10Generator.h"
+#include "cmAlgorithms.h"
#include "cmLocalVisualStudio10Generator.h"
#include "cmMakefile.h"
#include "cmSourceFile.h"
#include "cmVisualStudioSlnData.h"
#include "cmVisualStudioSlnParser.h"
#include "cmake.h"
-#include "cmAlgorithms.h"
static const char vs10generatorName[] = "Visual Studio 10 2010";
diff --git a/Source/cmGlobalVisualStudio11Generator.cxx b/Source/cmGlobalVisualStudio11Generator.cxx
index 5eafe8a..de6fc43 100644
--- a/Source/cmGlobalVisualStudio11Generator.cxx
+++ b/Source/cmGlobalVisualStudio11Generator.cxx
@@ -11,9 +11,9 @@
============================================================================*/
#include "cmGlobalVisualStudio11Generator.h"
+#include "cmAlgorithms.h"
#include "cmLocalVisualStudio10Generator.h"
#include "cmMakefile.h"
-#include "cmAlgorithms.h"
static const char vs11generatorName[] = "Visual Studio 11 2012";
diff --git a/Source/cmGlobalVisualStudio12Generator.cxx b/Source/cmGlobalVisualStudio12Generator.cxx
index e92ab5b..bfd908f 100644
--- a/Source/cmGlobalVisualStudio12Generator.cxx
+++ b/Source/cmGlobalVisualStudio12Generator.cxx
@@ -11,9 +11,9 @@
============================================================================*/
#include "cmGlobalVisualStudio12Generator.h"
+#include "cmAlgorithms.h"
#include "cmLocalVisualStudio10Generator.h"
#include "cmMakefile.h"
-#include "cmAlgorithms.h"
static const char vs12generatorName[] = "Visual Studio 12 2013";
diff --git a/Source/cmGlobalVisualStudio14Generator.cxx b/Source/cmGlobalVisualStudio14Generator.cxx
index df61503..893cc7b 100644
--- a/Source/cmGlobalVisualStudio14Generator.cxx
+++ b/Source/cmGlobalVisualStudio14Generator.cxx
@@ -11,9 +11,9 @@
============================================================================*/
#include "cmGlobalVisualStudio14Generator.h"
+#include "cmAlgorithms.h"
#include "cmLocalVisualStudio10Generator.h"
#include "cmMakefile.h"
-#include "cmAlgorithms.h"
static const char vs14generatorName[] = "Visual Studio 14 2015";
diff --git a/Source/cmGlobalVisualStudio8Generator.cxx b/Source/cmGlobalVisualStudio8Generator.cxx
index 506d1a9..47ac66d 100644
--- a/Source/cmGlobalVisualStudio8Generator.cxx
+++ b/Source/cmGlobalVisualStudio8Generator.cxx
@@ -13,12 +13,12 @@
#include "cmGlobalVisualStudio8Generator.h"
+#include "cmGeneratedFileStream.h"
#include "cmLocalVisualStudio7Generator.h"
#include "cmMakefile.h"
+#include "cmSourceFile.h"
#include "cmVisualStudioWCEPlatformParser.h"
#include "cmake.h"
-#include "cmGeneratedFileStream.h"
-#include "cmSourceFile.h"
static const char vs8generatorName[] = "Visual Studio 8 2005";
diff --git a/Source/cmGlobalVisualStudioGenerator.cxx b/Source/cmGlobalVisualStudioGenerator.cxx
index 9817b09..479b53c 100644
--- a/Source/cmGlobalVisualStudioGenerator.cxx
+++ b/Source/cmGlobalVisualStudioGenerator.cxx
@@ -12,6 +12,7 @@
============================================================================*/
#include "cmGlobalVisualStudioGenerator.h"
+#include "cmAlgorithms.h"
#include "cmCallVisualStudioMacro.h"
#include "cmGeneratedFileStream.h"
#include "cmGeneratorTarget.h"
@@ -20,7 +21,6 @@
#include "cmSourceFile.h"
#include "cmTarget.h"
#include <cmsys/Encoding.hxx>
-#include "cmAlgorithms.h"
//----------------------------------------------------------------------------
cmGlobalVisualStudioGenerator::cmGlobalVisualStudioGenerator(cmake* cm)
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 6258341..19f7a74 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -11,18 +11,18 @@
============================================================================*/
#include "cmGlobalXCodeGenerator.h"
-#include "cmLocalXCodeGenerator.h"
-#include "cmMakefile.h"
-#include "cmXCodeObject.h"
-#include "cmXCode21Object.h"
-#include "cmake.h"
-#include "cmGeneratedFileStream.h"
+#include "cmAlgorithms.h"
#include "cmComputeLinkInformation.h"
-#include "cmSourceFile.h"
#include "cmCustomCommandGenerator.h"
+#include "cmGeneratedFileStream.h"
#include "cmGeneratorTarget.h"
#include "cmGlobalGeneratorFactory.h"
-#include "cmAlgorithms.h"
+#include "cmLocalXCodeGenerator.h"
+#include "cmMakefile.h"
+#include "cmSourceFile.h"
+#include "cmXCode21Object.h"
+#include "cmXCodeObject.h"
+#include "cmake.h"
#include <cmsys/auto_ptr.hxx>
diff --git a/Source/cmGlobalXCodeGenerator.h b/Source/cmGlobalXCodeGenerator.h
index 2a48ac8..c3b3613 100644
--- a/Source/cmGlobalXCodeGenerator.h
+++ b/Source/cmGlobalXCodeGenerator.h
@@ -14,8 +14,8 @@
#include "cmGlobalGenerator.h"
-#include "cmXCodeObject.h"
#include "cmCustomCommand.h"
+#include "cmXCodeObject.h"
class cmGlobalGeneratorFactory;
class cmSourceFile;
class cmSourceGroup;
diff --git a/Source/cmGraphVizWriter.cxx b/Source/cmGraphVizWriter.cxx
index 5b7d229..76b6430 100644
--- a/Source/cmGraphVizWriter.cxx
+++ b/Source/cmGraphVizWriter.cxx
@@ -11,10 +11,10 @@
============================================================================*/
#include "cmGraphVizWriter.h"
-#include "cmMakefile.h"
-#include "cmLocalGenerator.h"
-#include "cmGlobalGenerator.h"
#include "cmGeneratedFileStream.h"
+#include "cmGlobalGenerator.h"
+#include "cmLocalGenerator.h"
+#include "cmMakefile.h"
diff --git a/Source/cmGraphVizWriter.h b/Source/cmGraphVizWriter.h
index 8b1438e..7914ca3 100644
--- a/Source/cmGraphVizWriter.h
+++ b/Source/cmGraphVizWriter.h
@@ -14,8 +14,8 @@
#include "cmStandardIncludes.h"
-#include "cmLocalGenerator.h"
#include "cmGeneratedFileStream.h"
+#include "cmLocalGenerator.h"
#include <cmsys/RegularExpression.hxx>
class cmGeneratorTarget;
diff --git a/Source/cmIfCommand.cxx b/Source/cmIfCommand.cxx
index 1b8ba0b..37f03c5 100644
--- a/Source/cmIfCommand.cxx
+++ b/Source/cmIfCommand.cxx
@@ -11,14 +11,14 @@
============================================================================*/
#include "cmIfCommand.h"
-#include "cmStringCommand.h"
#include "cmOutputConverter.h"
+#include "cmStringCommand.h"
#include "cmConditionEvaluator.h"
-#include <stdlib.h> // required for atof
-#include <list>
#include <cmsys/RegularExpression.hxx>
+#include <list>
+#include <stdlib.h> // required for atof
static std::string cmIfCommandError(
diff --git a/Source/cmInstallCommand.cxx b/Source/cmInstallCommand.cxx
index f70f252..d287568 100644
--- a/Source/cmInstallCommand.cxx
+++ b/Source/cmInstallCommand.cxx
@@ -11,14 +11,14 @@
============================================================================*/
#include "cmInstallCommand.h"
+#include "cmExportSet.h"
+#include "cmInstallCommandArguments.h"
#include "cmInstallDirectoryGenerator.h"
+#include "cmInstallExportGenerator.h"
#include "cmInstallFilesGenerator.h"
#include "cmInstallScriptGenerator.h"
#include "cmInstallTargetGenerator.h"
-#include "cmInstallExportGenerator.h"
-#include "cmInstallCommandArguments.h"
#include "cmTargetExport.h"
-#include "cmExportSet.h"
#include <cmsys/Glob.hxx>
diff --git a/Source/cmInstallExportGenerator.cxx b/Source/cmInstallExportGenerator.cxx
index 80fc054..a31c0c9 100644
--- a/Source/cmInstallExportGenerator.cxx
+++ b/Source/cmInstallExportGenerator.cxx
@@ -13,12 +13,12 @@
#include <stdio.h>
-#include "cmake.h"
-#include "cmInstallTargetGenerator.h"
#include "cmGeneratedFileStream.h"
-#include "cmMakefile.h"
-#include "cmLocalGenerator.h"
#include "cmGlobalGenerator.h"
+#include "cmInstallTargetGenerator.h"
+#include "cmLocalGenerator.h"
+#include "cmMakefile.h"
+#include "cmake.h"
#include "cmInstallFilesGenerator.h"
diff --git a/Source/cmInstallFilesGenerator.cxx b/Source/cmInstallFilesGenerator.cxx
index 3dd5528..9703562 100644
--- a/Source/cmInstallFilesGenerator.cxx
+++ b/Source/cmInstallFilesGenerator.cxx
@@ -12,9 +12,9 @@
#include "cmInstallFilesGenerator.h"
#include "cmGeneratorExpression.h"
+#include "cmLocalGenerator.h"
#include "cmMakefile.h"
#include "cmSystemTools.h"
-#include "cmLocalGenerator.h"
//----------------------------------------------------------------------------
cmInstallFilesGenerator
diff --git a/Source/cmInstallTargetGenerator.cxx b/Source/cmInstallTargetGenerator.cxx
index 6a944bf..0010333 100644
--- a/Source/cmInstallTargetGenerator.cxx
+++ b/Source/cmInstallTargetGenerator.cxx
@@ -13,12 +13,12 @@
#include "cmComputeLinkInformation.h"
#include "cmGeneratorExpression.h"
+#include "cmGeneratorTarget.h"
+#include "cmGeneratorTarget.h"
#include "cmGlobalGenerator.h"
#include "cmLocalGenerator.h"
#include "cmMakefile.h"
-#include "cmGeneratorTarget.h"
#include "cmake.h"
-#include "cmGeneratorTarget.h"
#include <assert.h>
diff --git a/Source/cmInstalledFile.cxx b/Source/cmInstalledFile.cxx
index 7025d0f..c5ac9eb 100644
--- a/Source/cmInstalledFile.cxx
+++ b/Source/cmInstalledFile.cxx
@@ -11,9 +11,9 @@
============================================================================*/
#include "cmInstalledFile.h"
-#include "cmSystemTools.h"
-#include "cmMakefile.h"
#include "cmAlgorithms.h"
+#include "cmMakefile.h"
+#include "cmSystemTools.h"
//----------------------------------------------------------------------------
cmInstalledFile::cmInstalledFile():
diff --git a/Source/cmListCommand.cxx b/Source/cmListCommand.cxx
index 514bc05..05be9e5 100644
--- a/Source/cmListCommand.cxx
+++ b/Source/cmListCommand.cxx
@@ -11,14 +11,14 @@
============================================================================*/
#include "cmListCommand.h"
+#include "cmAlgorithms.h"
#include <cmsys/RegularExpression.hxx>
#include <cmsys/SystemTools.hxx>
-#include "cmAlgorithms.h"
#include <algorithm>
-#include <stdlib.h> // required for atoi
-#include <ctype.h>
#include <assert.h>
+#include <ctype.h>
+#include <stdlib.h> // required for atoi
//----------------------------------------------------------------------------
bool cmListCommand
::InitialPass(std::vector<std::string> const& args, cmExecutionStatus &)
diff --git a/Source/cmListFileCache.cxx b/Source/cmListFileCache.cxx
index 1cc66f4..5a16104 100644
--- a/Source/cmListFileCache.cxx
+++ b/Source/cmListFileCache.cxx
@@ -12,9 +12,9 @@
#include "cmListFileCache.h"
#include "cmListFileLexer.h"
+#include "cmMakefile.h"
#include "cmOutputConverter.h"
#include "cmSystemTools.h"
-#include "cmMakefile.h"
#include "cmVersion.h"
#include <cmsys/RegularExpression.hxx>
diff --git a/Source/cmLoadCacheCommand.cxx b/Source/cmLoadCacheCommand.cxx
index 6ade535..63fc00c 100644
--- a/Source/cmLoadCacheCommand.cxx
+++ b/Source/cmLoadCacheCommand.cxx
@@ -11,8 +11,8 @@
============================================================================*/
#include "cmLoadCacheCommand.h"
-#include <cmsys/RegularExpression.hxx>
#include <cmsys/FStream.hxx>
+#include <cmsys/RegularExpression.hxx>
// cmLoadCacheCommand
bool cmLoadCacheCommand
diff --git a/Source/cmLoadCommandCommand.cxx b/Source/cmLoadCommandCommand.cxx
index ed1adc0..14b70e4 100644
--- a/Source/cmLoadCommandCommand.cxx
+++ b/Source/cmLoadCommandCommand.cxx
@@ -11,8 +11,8 @@
============================================================================*/
#include "cmLoadCommandCommand.h"
-#include "cmCPluginAPI.h"
#include "cmCPluginAPI.cxx"
+#include "cmCPluginAPI.h"
#include "cmDynamicLoader.h"
#include <cmsys/DynamicLoader.hxx>
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index b93fc21..6c2ba05 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -11,22 +11,22 @@
============================================================================*/
#include "cmLocalGenerator.h"
+#include "cmAlgorithms.h"
#include "cmComputeLinkInformation.h"
+#include "cmCustomCommandGenerator.h"
#include "cmGeneratedFileStream.h"
+#include "cmGeneratorExpressionEvaluationFile.h"
#include "cmGlobalGenerator.h"
-#include "cmInstallGenerator.h"
#include "cmInstallFilesGenerator.h"
-#include "cmGeneratorExpressionEvaluationFile.h"
+#include "cmInstallGenerator.h"
#include "cmInstallScriptGenerator.h"
#include "cmInstallTargetGenerator.h"
#include "cmMakefile.h"
#include "cmSourceFile.h"
#include "cmTest.h"
#include "cmTestGenerator.h"
-#include "cmCustomCommandGenerator.h"
#include "cmVersion.h"
#include "cmake.h"
-#include "cmAlgorithms.h"
#if defined(CMAKE_BUILD_WITH_CMAKE)
# define CM_LG_ENCODE_OBJECT_NAMES
diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h
index d9c68f9..0bad0d6 100644
--- a/Source/cmLocalGenerator.h
+++ b/Source/cmLocalGenerator.h
@@ -14,9 +14,9 @@
#include "cmStandardIncludes.h"
+#include "cmOutputConverter.h"
#include "cmState.h"
#include "cmake.h"
-#include "cmOutputConverter.h"
class cmMakefile;
class cmGlobalGenerator;
diff --git a/Source/cmLocalGhsMultiGenerator.cxx b/Source/cmLocalGhsMultiGenerator.cxx
index 91e75d3..f23f27d 100644
--- a/Source/cmLocalGhsMultiGenerator.cxx
+++ b/Source/cmLocalGhsMultiGenerator.cxx
@@ -11,11 +11,11 @@
============================================================================*/
#include "cmLocalGhsMultiGenerator.h"
-#include "cmGlobalGhsMultiGenerator.h"
+#include "cmGeneratedFileStream.h"
#include "cmGeneratorTarget.h"
-#include "cmMakefile.h"
#include "cmGhsMultiTargetGenerator.h"
-#include "cmGeneratedFileStream.h"
+#include "cmGlobalGhsMultiGenerator.h"
+#include "cmMakefile.h"
cmLocalGhsMultiGenerator::cmLocalGhsMultiGenerator(cmGlobalGenerator* gg,
cmMakefile* mf)
diff --git a/Source/cmLocalNinjaGenerator.cxx b/Source/cmLocalNinjaGenerator.cxx
index 143c14e..c26065c 100644
--- a/Source/cmLocalNinjaGenerator.cxx
+++ b/Source/cmLocalNinjaGenerator.cxx
@@ -13,13 +13,13 @@
#include "cmLocalNinjaGenerator.h"
#include "cmCustomCommandGenerator.h"
-#include "cmMakefile.h"
+#include "cmGeneratedFileStream.h"
#include "cmGlobalNinjaGenerator.h"
+#include "cmMakefile.h"
#include "cmNinjaTargetGenerator.h"
-#include "cmGeneratedFileStream.h"
#include "cmSourceFile.h"
-#include "cmake.h"
#include "cmState.h"
+#include "cmake.h"
#include <assert.h>
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx
index afdff33..2a0e07d 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -11,16 +11,16 @@
============================================================================*/
#include "cmLocalUnixMakefileGenerator3.h"
+#include "cmAlgorithms.h"
+#include "cmCustomCommandGenerator.h"
+#include "cmFileTimeComparison.h"
#include "cmGeneratedFileStream.h"
#include "cmGlobalUnixMakefileGenerator3.h"
#include "cmMakefile.h"
#include "cmMakefileTargetGenerator.h"
#include "cmSourceFile.h"
-#include "cmake.h"
#include "cmVersion.h"
-#include "cmFileTimeComparison.h"
-#include "cmCustomCommandGenerator.h"
-#include "cmAlgorithms.h"
+#include "cmake.h"
// Include dependency scanners for supported languages. Only the
// C/C++ scanner is needed for bootstrapping CMake.
@@ -30,11 +30,11 @@
# include "cmDependsJava.h"
#endif
-#include <cmsys/auto_ptr.hxx>
#include <cmsys/Terminal.h>
+#include <cmsys/auto_ptr.hxx>
-#include <queue>
#include <algorithm>
+#include <queue>
//----------------------------------------------------------------------------
// Escape special characters in Makefile dependency lines
diff --git a/Source/cmLocalVisualStudio10Generator.cxx b/Source/cmLocalVisualStudio10Generator.cxx
index ce20c97..314fa0f 100644
--- a/Source/cmLocalVisualStudio10Generator.cxx
+++ b/Source/cmLocalVisualStudio10Generator.cxx
@@ -11,11 +11,11 @@
============================================================================*/
#include "cmLocalVisualStudio10Generator.h"
+#include "cmGlobalVisualStudio10Generator.h"
#include "cmMakefile.h"
#include "cmVisualStudio10TargetGenerator.h"
-#include "cmGlobalVisualStudio10Generator.h"
-#include <cm_expat.h>
#include "cmXMLParser.h"
+#include <cm_expat.h>
class cmVS10XMLParser : public cmXMLParser
{
diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx
index de974c2..38b7ac3 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -11,15 +11,15 @@
============================================================================*/
#include "cmLocalVisualStudio7Generator.h"
+#include "cmCustomCommandGenerator.h"
+#include "cmGeneratorTarget.h"
#include "cmGlobalVisualStudio7Generator.h"
-#include "cmXMLParser.h"
-#include <cm_expat.h>
#include "cmMakefile.h"
-#include "cmSystemTools.h"
#include "cmSourceFile.h"
-#include "cmGeneratorTarget.h"
-#include "cmCustomCommandGenerator.h"
+#include "cmSystemTools.h"
+#include "cmXMLParser.h"
#include "cmake.h"
+#include <cm_expat.h>
#include "cmComputeLinkInformation.h"
#include "cmGeneratedFileStream.h"
diff --git a/Source/cmLocalVisualStudioGenerator.cxx b/Source/cmLocalVisualStudioGenerator.cxx
index a5b8f99..23e2bfd 100644
--- a/Source/cmLocalVisualStudioGenerator.cxx
+++ b/Source/cmLocalVisualStudioGenerator.cxx
@@ -11,11 +11,11 @@
============================================================================*/
#include "cmLocalVisualStudioGenerator.h"
+#include "cmCustomCommandGenerator.h"
#include "cmGlobalGenerator.h"
#include "cmMakefile.h"
#include "cmSourceFile.h"
#include "cmSystemTools.h"
-#include "cmCustomCommandGenerator.h"
#include "windows.h"
//----------------------------------------------------------------------------
diff --git a/Source/cmLocalXCodeGenerator.cxx b/Source/cmLocalXCodeGenerator.cxx
index c837445..d563fe7 100644
--- a/Source/cmLocalXCodeGenerator.cxx
+++ b/Source/cmLocalXCodeGenerator.cxx
@@ -12,8 +12,8 @@
#include "cmLocalXCodeGenerator.h"
#include "cmGlobalXCodeGenerator.h"
-#include "cmSourceFile.h"
#include "cmMakefile.h"
+#include "cmSourceFile.h"
//----------------------------------------------------------------------------
cmLocalXCodeGenerator::cmLocalXCodeGenerator(cmGlobalGenerator* gg,
diff --git a/Source/cmMachO.cxx b/Source/cmMachO.cxx
index 6210da3..bb4d4a1 100644
--- a/Source/cmMachO.cxx
+++ b/Source/cmMachO.cxx
@@ -16,8 +16,8 @@
#include <cmsys/FStream.hxx>
// Include the Mach-O format information system header.
-#include <mach-o/loader.h>
#include <mach-o/fat.h>
+#include <mach-o/loader.h>
/**
diff --git a/Source/cmMacroCommand.cxx b/Source/cmMacroCommand.cxx
index 71de7a7..36831fe 100644
--- a/Source/cmMacroCommand.cxx
+++ b/Source/cmMacroCommand.cxx
@@ -11,8 +11,8 @@
============================================================================*/
#include "cmMacroCommand.h"
-#include "cmake.h"
#include "cmAlgorithms.h"
+#include "cmake.h"
// define the class for macro commands
class cmMacroHelperCommand : public cmCommand
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 29b947c..3bc1181 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -11,37 +11,37 @@
============================================================================*/
#include "cmMakefile.h"
-#include "cmVersion.h"
#include "cmCommand.h"
-#include "cmSourceFile.h"
-#include "cmSourceFileLocation.h"
-#include "cmSystemTools.h"
-#include "cmGlobalGenerator.h"
+#include "cmCommandArgumentParserHelper.h"
#include "cmCommands.h"
-#include "cmState.h"
-#include "cmOutputConverter.h"
#include "cmFunctionBlocker.h"
+#include "cmGeneratorExpression.h"
#include "cmGeneratorExpressionEvaluationFile.h"
+#include "cmGlobalGenerator.h"
#include "cmListFileCache.h"
-#include "cmCommandArgumentParserHelper.h"
-#include "cmGeneratorExpression.h"
+#include "cmOutputConverter.h"
+#include "cmSourceFile.h"
+#include "cmSourceFileLocation.h"
+#include "cmState.h"
+#include "cmSystemTools.h"
#include "cmTest.h"
+#include "cmVersion.h"
#ifdef CMAKE_BUILD_WITH_CMAKE
# include "cmVariableWatch.h"
#endif
+#include "cmAlgorithms.h"
#include "cmInstallGenerator.h"
#include "cmTestGenerator.h"
-#include "cmAlgorithms.h"
#include "cmake.h"
#include <stdlib.h> // required for atoi
-#include <cmsys/RegularExpression.hxx>
#include <cmsys/FStream.hxx>
+#include <cmsys/RegularExpression.hxx>
#include <cmsys/auto_ptr.hxx>
-#include <list>
-#include <ctype.h> // for isspace
#include <assert.h>
+#include <ctype.h> // for isspace
+#include <list>
// default is not to be building executables
cmMakefile::cmMakefile(cmGlobalGenerator* globalGenerator,
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index 0300d3f..fa5e9b4 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -14,22 +14,22 @@
#include "cmStandardIncludes.h"
+#include "cmAlgorithms.h"
#include "cmExecutionStatus.h"
+#include "cmExpandedCommandArgument.h"
#include "cmListFileCache.h"
+#include "cmNewLineStyle.h"
+#include "cmState.h"
#include "cmSystemTools.h"
#include "cmTarget.h"
-#include "cmNewLineStyle.h"
-#include "cmExpandedCommandArgument.h"
#include "cmake.h"
-#include "cmState.h"
-#include "cmAlgorithms.h"
#if defined(CMAKE_BUILD_WITH_CMAKE)
#include "cmSourceGroup.h"
#endif
-#include <cmsys/auto_ptr.hxx>
#include <cmsys/RegularExpression.hxx>
+#include <cmsys/auto_ptr.hxx>
#if defined(CMAKE_BUILD_WITH_CMAKE)
# ifdef CMake_HAVE_CXX11_UNORDERED_MAP
# include <unordered_map>
diff --git a/Source/cmMakefileLibraryTargetGenerator.cxx b/Source/cmMakefileLibraryTargetGenerator.cxx
index 435844e..9ded69f 100644
--- a/Source/cmMakefileLibraryTargetGenerator.cxx
+++ b/Source/cmMakefileLibraryTargetGenerator.cxx
@@ -11,13 +11,13 @@
============================================================================*/
#include "cmMakefileLibraryTargetGenerator.h"
+#include "cmAlgorithms.h"
#include "cmGeneratedFileStream.h"
#include "cmGlobalUnixMakefileGenerator3.h"
#include "cmLocalUnixMakefileGenerator3.h"
#include "cmMakefile.h"
#include "cmSourceFile.h"
#include "cmake.h"
-#include "cmAlgorithms.h"
//----------------------------------------------------------------------------
cmMakefileLibraryTargetGenerator
diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx
index 29708d9..e14f828 100644
--- a/Source/cmMakefileTargetGenerator.cxx
+++ b/Source/cmMakefileTargetGenerator.cxx
@@ -11,19 +11,19 @@
============================================================================*/
#include "cmMakefileTargetGenerator.h"
-#include "cmGeneratorTarget.h"
+#include "cmAlgorithms.h"
+#include "cmComputeLinkInformation.h"
+#include "cmCustomCommandGenerator.h"
#include "cmGeneratedFileStream.h"
+#include "cmGeneratorExpression.h"
+#include "cmGeneratorTarget.h"
#include "cmGlobalGenerator.h"
#include "cmGlobalUnixMakefileGenerator3.h"
#include "cmLocalUnixMakefileGenerator3.h"
#include "cmMakefile.h"
#include "cmSourceFile.h"
-#include "cmake.h"
#include "cmState.h"
-#include "cmComputeLinkInformation.h"
-#include "cmCustomCommandGenerator.h"
-#include "cmGeneratorExpression.h"
-#include "cmAlgorithms.h"
+#include "cmake.h"
#include "cmMakefileExecutableTargetGenerator.h"
#include "cmMakefileLibraryTargetGenerator.h"
diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
index 3519400..0429421 100644
--- a/Source/cmNinjaNormalTargetGenerator.cxx
+++ b/Source/cmNinjaNormalTargetGenerator.cxx
@@ -12,18 +12,18 @@
============================================================================*/
#include "cmNinjaNormalTargetGenerator.h"
-#include "cmLocalNinjaGenerator.h"
-#include "cmGlobalNinjaGenerator.h"
-#include "cmSourceFile.h"
+#include "cmAlgorithms.h"
+#include "cmCustomCommandGenerator.h"
#include "cmGeneratedFileStream.h"
+#include "cmGeneratorTarget.h"
+#include "cmGlobalNinjaGenerator.h"
+#include "cmLocalNinjaGenerator.h"
#include "cmMakefile.h"
#include "cmOSXBundleGenerator.h"
-#include "cmGeneratorTarget.h"
-#include "cmCustomCommandGenerator.h"
-#include "cmAlgorithms.h"
+#include "cmSourceFile.h"
-#include <assert.h>
#include <algorithm>
+#include <assert.h>
#include <limits>
#ifndef _WIN32
diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx
index 97ef00d..8830b8f 100644
--- a/Source/cmNinjaTargetGenerator.cxx
+++ b/Source/cmNinjaTargetGenerator.cxx
@@ -12,18 +12,18 @@
============================================================================*/
#include "cmNinjaTargetGenerator.h"
-#include "cmGlobalNinjaGenerator.h"
-#include "cmLocalNinjaGenerator.h"
+#include "cmAlgorithms.h"
+#include "cmComputeLinkInformation.h"
+#include "cmCustomCommandGenerator.h"
#include "cmGeneratedFileStream.h"
#include "cmGeneratorTarget.h"
+#include "cmGlobalNinjaGenerator.h"
+#include "cmLocalNinjaGenerator.h"
+#include "cmMakefile.h"
#include "cmNinjaNormalTargetGenerator.h"
#include "cmNinjaUtilityTargetGenerator.h"
-#include "cmSystemTools.h"
-#include "cmMakefile.h"
-#include "cmComputeLinkInformation.h"
#include "cmSourceFile.h"
-#include "cmCustomCommandGenerator.h"
-#include "cmAlgorithms.h"
+#include "cmSystemTools.h"
#include <algorithm>
diff --git a/Source/cmNinjaTargetGenerator.h b/Source/cmNinjaTargetGenerator.h
index 40f96b4..8225a60 100644
--- a/Source/cmNinjaTargetGenerator.h
+++ b/Source/cmNinjaTargetGenerator.h
@@ -15,9 +15,9 @@
#include "cmCommonTargetGenerator.h"
-#include "cmNinjaTypes.h"
#include "cmGlobalNinjaGenerator.h"
#include "cmLocalNinjaGenerator.h"
+#include "cmNinjaTypes.h"
#include "cmOSXBundleGenerator.h"
class cmTarget;
diff --git a/Source/cmNinjaUtilityTargetGenerator.cxx b/Source/cmNinjaUtilityTargetGenerator.cxx
index c2162ce..735730e 100644
--- a/Source/cmNinjaUtilityTargetGenerator.cxx
+++ b/Source/cmNinjaUtilityTargetGenerator.cxx
@@ -13,11 +13,11 @@
#include "cmNinjaUtilityTargetGenerator.h"
#include "cmCustomCommand.h"
+#include "cmCustomCommandGenerator.h"
#include "cmGeneratedFileStream.h"
#include "cmGlobalNinjaGenerator.h"
#include "cmMakefile.h"
#include "cmSourceFile.h"
-#include "cmCustomCommandGenerator.h"
cmNinjaUtilityTargetGenerator::cmNinjaUtilityTargetGenerator(
cmGeneratorTarget *target)
diff --git a/Source/cmOSXBundleGenerator.cxx b/Source/cmOSXBundleGenerator.cxx
index 6991d7b..9850728 100644
--- a/Source/cmOSXBundleGenerator.cxx
+++ b/Source/cmOSXBundleGenerator.cxx
@@ -11,9 +11,9 @@
============================================================================*/
#include "cmOSXBundleGenerator.h"
+#include "cmLocalGenerator.h"
#include "cmMakefile.h"
#include "cmTarget.h"
-#include "cmLocalGenerator.h"
#include <cassert>
diff --git a/Source/cmOSXBundleGenerator.h b/Source/cmOSXBundleGenerator.h
index 2400262..3952e95 100644
--- a/Source/cmOSXBundleGenerator.h
+++ b/Source/cmOSXBundleGenerator.h
@@ -16,8 +16,8 @@
#include "cmSourceFile.h"
-#include <string>
#include <set>
+#include <string>
class cmTarget;
class cmMakefile;
diff --git a/Source/cmOrderDirectories.cxx b/Source/cmOrderDirectories.cxx
index 61efd01..2e884e4 100644
--- a/Source/cmOrderDirectories.cxx
+++ b/Source/cmOrderDirectories.cxx
@@ -11,10 +11,10 @@
============================================================================*/
#include "cmOrderDirectories.h"
+#include "cmAlgorithms.h"
#include "cmGlobalGenerator.h"
#include "cmSystemTools.h"
#include "cmake.h"
-#include "cmAlgorithms.h"
#include <assert.h>
diff --git a/Source/cmOutputConverter.cxx b/Source/cmOutputConverter.cxx
index 59fb2e9..3c5d2f4 100644
--- a/Source/cmOutputConverter.cxx
+++ b/Source/cmOutputConverter.cxx
@@ -16,8 +16,8 @@
#include <assert.h>
-#include <string.h> /* strlen */
#include <ctype.h> /* isalpha */
+#include <string.h> /* strlen */
cmOutputConverter::cmOutputConverter(cmState::Snapshot snapshot)
: StateSnapshot(snapshot), LinkScriptShell(false)
diff --git a/Source/cmPolicies.cxx b/Source/cmPolicies.cxx
index 68a9085..0432da5 100644
--- a/Source/cmPolicies.cxx
+++ b/Source/cmPolicies.cxx
@@ -1,15 +1,15 @@
#include "cmPolicies.h"
-#include "cmake.h"
+#include "cmAlgorithms.h"
#include "cmMakefile.h"
#include "cmVersion.h"
#include "cmVersionMacros.h"
-#include "cmAlgorithms.h"
+#include "cmake.h"
+#include <assert.h>
#include <ctype.h>
#include <map>
-#include <set>
#include <queue>
-#include <assert.h>
+#include <set>
static bool stringToId(const char* input, cmPolicies::PolicyID& pid)
{
diff --git a/Source/cmPropertyDefinitionMap.cxx b/Source/cmPropertyDefinitionMap.cxx
index cfc4bc3..cba2b5a 100644
--- a/Source/cmPropertyDefinitionMap.cxx
+++ b/Source/cmPropertyDefinitionMap.cxx
@@ -11,8 +11,8 @@
============================================================================*/
#include "cmPropertyDefinitionMap.h"
-#include "cmSystemTools.h"
#include "cmDocumentationSection.h"
+#include "cmSystemTools.h"
void cmPropertyDefinitionMap
::DefineProperty(const std::string& name, cmProperty::ScopeType scope,
diff --git a/Source/cmPropertyMap.cxx b/Source/cmPropertyMap.cxx
index e6b1529..2b25023 100644
--- a/Source/cmPropertyMap.cxx
+++ b/Source/cmPropertyMap.cxx
@@ -11,9 +11,9 @@
============================================================================*/
#include "cmPropertyMap.h"
+#include "cmState.h"
#include "cmSystemTools.h"
#include "cmake.h"
-#include "cmState.h"
#include <assert.h>
diff --git a/Source/cmQtAutoGeneratorInitializer.h b/Source/cmQtAutoGeneratorInitializer.h
index eaf140d..b411597 100644
--- a/Source/cmQtAutoGeneratorInitializer.h
+++ b/Source/cmQtAutoGeneratorInitializer.h
@@ -16,9 +16,9 @@
#include "cmStandardIncludes.h"
+#include <map>
#include <string>
#include <vector>
-#include <map>
class cmSourceFile;
class cmGeneratorTarget;
diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx
index f376caa..a55a3f3 100644
--- a/Source/cmQtAutoGenerators.cxx
+++ b/Source/cmQtAutoGenerators.cxx
@@ -13,18 +13,18 @@
#include "cmQtAutoGenerators.h"
+#include "cmAlgorithms.h"
#include "cmGlobalGenerator.h"
-#include "cmOutputConverter.h"
#include "cmMakefile.h"
-#include "cmSystemTools.h"
+#include "cmOutputConverter.h"
#include "cmState.h"
-#include "cmAlgorithms.h"
+#include "cmSystemTools.h"
#include <sys/stat.h>
-#include <cmsys/Terminal.h>
-#include <cmsys/FStream.hxx>
#include <assert.h>
+#include <cmsys/FStream.hxx>
+#include <cmsys/Terminal.h>
#include <string.h>
#if defined(__APPLE__)
diff --git a/Source/cmQtAutoGenerators.h b/Source/cmQtAutoGenerators.h
index 04d2860..315e915 100644
--- a/Source/cmQtAutoGenerators.h
+++ b/Source/cmQtAutoGenerators.h
@@ -17,9 +17,9 @@
#include "cmStandardIncludes.h"
#include <list>
-#include <vector>
-#include <string>
#include <map>
+#include <string>
+#include <vector>
class cmMakefile;
diff --git a/Source/cmRST.cxx b/Source/cmRST.cxx
index cb61ed9..67667ea 100644
--- a/Source/cmRST.cxx
+++ b/Source/cmRST.cxx
@@ -11,8 +11,8 @@
============================================================================*/
#include "cmRST.h"
-#include "cmSystemTools.h"
#include "cmAlgorithms.h"
+#include "cmSystemTools.h"
#include "cmVersion.h"
#include <cmsys/FStream.hxx>
#include <ctype.h>
diff --git a/Source/cmSearchPath.cxx b/Source/cmSearchPath.cxx
index 01781b2..70855b3 100644
--- a/Source/cmSearchPath.cxx
+++ b/Source/cmSearchPath.cxx
@@ -11,8 +11,8 @@
============================================================================*/
#include "cmSearchPath.h"
-#include "cmFindCommon.h"
#include "cmAlgorithms.h"
+#include "cmFindCommon.h"
//----------------------------------------------------------------------------
cmSearchPath::cmSearchPath(cmFindCommon* findCmd)
diff --git a/Source/cmSetPropertyCommand.cxx b/Source/cmSetPropertyCommand.cxx
index fc5c95a..fb13a19 100644
--- a/Source/cmSetPropertyCommand.cxx
+++ b/Source/cmSetPropertyCommand.cxx
@@ -11,9 +11,9 @@
============================================================================*/
#include "cmSetPropertyCommand.h"
+#include "cmSetSourceFilesPropertiesCommand.h"
#include "cmSetTargetPropertiesCommand.h"
#include "cmSetTestsPropertiesCommand.h"
-#include "cmSetSourceFilesPropertiesCommand.h"
//----------------------------------------------------------------------------
diff --git a/Source/cmSetTestsPropertiesCommand.cxx b/Source/cmSetTestsPropertiesCommand.cxx
index 53dc5a8..70c34c4 100644
--- a/Source/cmSetTestsPropertiesCommand.cxx
+++ b/Source/cmSetTestsPropertiesCommand.cxx
@@ -11,8 +11,8 @@
============================================================================*/
#include "cmSetTestsPropertiesCommand.h"
-#include "cmake.h"
#include "cmTest.h"
+#include "cmake.h"
// cmSetTestsPropertiesCommand
bool cmSetTestsPropertiesCommand
diff --git a/Source/cmSourceFileLocation.cxx b/Source/cmSourceFileLocation.cxx
index 00d5d6a..988ddeb 100644
--- a/Source/cmSourceFileLocation.cxx
+++ b/Source/cmSourceFileLocation.cxx
@@ -11,10 +11,10 @@
============================================================================*/
#include "cmSourceFileLocation.h"
-#include "cmMakefile.h"
+#include "cmAlgorithms.h"
#include "cmGlobalGenerator.h"
+#include "cmMakefile.h"
#include "cmSystemTools.h"
-#include "cmAlgorithms.h"
#include "assert.h"
diff --git a/Source/cmStandardIncludes.h b/Source/cmStandardIncludes.h
index 83cbf67..f80586e 100644
--- a/Source/cmStandardIncludes.h
+++ b/Source/cmStandardIncludes.h
@@ -35,23 +35,23 @@
#include <cm_kwiml.h>
#include <fstream>
-#include <iostream>
#include <iomanip>
+#include <iostream>
#include <sstream>
// we must have stl with the standard include style
-#include <vector>
-#include <string>
-#include <iterator>
#include <algorithm>
#include <functional>
+#include <iterator>
#include <map>
#include <set>
+#include <string>
+#include <vector>
// include the "c" string header
-#include <string.h>
#include <stdio.h>
#include <stdlib.h>
+#include <string.h>
#if defined( _MSC_VER )
typedef unsigned short mode_t;
diff --git a/Source/cmState.cxx b/Source/cmState.cxx
index f5d6378..a400def 100644
--- a/Source/cmState.cxx
+++ b/Source/cmState.cxx
@@ -11,12 +11,12 @@
============================================================================*/
#include "cmState.h"
-#include "cmake.h"
-#include "cmVersion.h"
+#include "cmAlgorithms.h"
#include "cmCacheManager.h"
#include "cmCommand.h"
-#include "cmAlgorithms.h"
#include "cmDefinitions.h"
+#include "cmVersion.h"
+#include "cmake.h"
#include <assert.h>
diff --git a/Source/cmState.h b/Source/cmState.h
index 7b11034..705c1a8 100644
--- a/Source/cmState.h
+++ b/Source/cmState.h
@@ -14,11 +14,11 @@
#include "cmStandardIncludes.h"
-#include "cmPropertyDefinitionMap.h"
-#include "cmPropertyMap.h"
-#include "cmLinkedTree.h"
#include "cmAlgorithms.h"
+#include "cmLinkedTree.h"
#include "cmPolicies.h"
+#include "cmPropertyDefinitionMap.h"
+#include "cmPropertyMap.h"
class cmake;
class cmCommand;
diff --git a/Source/cmStringCommand.cxx b/Source/cmStringCommand.cxx
index 82c530c..e10e1ae 100644
--- a/Source/cmStringCommand.cxx
+++ b/Source/cmStringCommand.cxx
@@ -16,8 +16,8 @@
#include <cmsys/RegularExpression.hxx>
#include <cmsys/SystemTools.hxx>
-#include <stdlib.h> // required for atoi
#include <ctype.h>
+#include <stdlib.h> // required for atoi
#include <time.h>
#include <cmTimestamp.h>
diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx
index c36a339..f90eaf5 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"
@@ -38,14 +38,14 @@
#include <cmsys/Terminal.h>
#if defined(_WIN32)
-# include <windows.h>
# include <wincrypt.h>
+# include <windows.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__)
diff --git a/Source/cmSystemTools.h b/Source/cmSystemTools.h
index d444675..d311750 100644
--- a/Source/cmSystemTools.h
+++ b/Source/cmSystemTools.h
@@ -14,8 +14,8 @@
#include "cmStandardIncludes.h"
-#include <cmsys/SystemTools.hxx>
#include <cmsys/Process.h>
+#include <cmsys/SystemTools.hxx>
class cmSystemToolsFileTime;
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 275dd6f..fe14af6 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -11,22 +11,22 @@
============================================================================*/
#include "cmTarget.h"
-#include "cmake.h"
-#include "cmMakefile.h"
-#include "cmSourceFile.h"
-#include "cmOutputConverter.h"
-#include "cmGlobalGenerator.h"
+#include "cmAlgorithms.h"
#include "cmComputeLinkInformation.h"
-#include "cmListFileCache.h"
#include "cmGeneratorExpression.h"
#include "cmGeneratorExpressionDAGChecker.h"
-#include "cmAlgorithms.h"
+#include "cmGlobalGenerator.h"
+#include "cmListFileCache.h"
+#include "cmMakefile.h"
+#include "cmOutputConverter.h"
+#include "cmSourceFile.h"
+#include "cmake.h"
+#include <assert.h>
#include <cmsys/RegularExpression.hxx>
+#include <errno.h>
#include <map>
#include <set>
#include <stdlib.h> // required for atof
-#include <assert.h>
-#include <errno.h>
#if defined(CMAKE_BUILD_WITH_CMAKE)
#include <cmsys/hash_set.hxx>
#define UNORDERED_SET cmsys::hash_set
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index b398043..262cc9b 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -15,9 +15,9 @@
#include "cmStandardIncludes.h"
#include "cmCustomCommand.h"
-#include "cmPropertyMap.h"
-#include "cmPolicies.h"
#include "cmListFileCache.h"
+#include "cmPolicies.h"
+#include "cmPropertyMap.h"
#include <cmsys/auto_ptr.hxx>
#if defined(CMAKE_BUILD_WITH_CMAKE)
diff --git a/Source/cmTest.cxx b/Source/cmTest.cxx
index 812e4d3..7182122 100644
--- a/Source/cmTest.cxx
+++ b/Source/cmTest.cxx
@@ -13,8 +13,8 @@
#include "cmSystemTools.h"
-#include "cmake.h"
#include "cmMakefile.h"
+#include "cmake.h"
//----------------------------------------------------------------------------
cmTest::cmTest(cmMakefile* mf)
diff --git a/Source/cmTest.h b/Source/cmTest.h
index 44a2d00..46013af 100644
--- a/Source/cmTest.h
+++ b/Source/cmTest.h
@@ -15,8 +15,8 @@
#include "cmStandardIncludes.h"
#include "cmCustomCommand.h"
-#include "cmPropertyMap.h"
#include "cmListFileCache.h"
+#include "cmPropertyMap.h"
class cmMakefile;
/** \class cmTest
diff --git a/Source/cmTestGenerator.cxx b/Source/cmTestGenerator.cxx
index b411f15..5790fa6 100644
--- a/Source/cmTestGenerator.cxx
+++ b/Source/cmTestGenerator.cxx
@@ -12,8 +12,8 @@
#include "cmTestGenerator.h"
#include "cmGeneratorExpression.h"
-#include "cmOutputConverter.h"
#include "cmLocalGenerator.h"
+#include "cmOutputConverter.h"
#include "cmSystemTools.h"
#include "cmTest.h"
diff --git a/Source/cmTimestamp.cxx b/Source/cmTimestamp.cxx
index 1c795c4..7d1ba32 100644
--- a/Source/cmTimestamp.cxx
+++ b/Source/cmTimestamp.cxx
@@ -11,12 +11,12 @@
============================================================================*/
#include "cmTimestamp.h"
-#include <cstring>
#include <cstdlib>
+#include <cstring>
#include <sys/types.h>
-#include <sys/stat.h>
#include <sstream>
+#include <sys/stat.h>
//----------------------------------------------------------------------------
std::string cmTimestamp::CurrentTime(
diff --git a/Source/cmUseMangledMesaCommand.cxx b/Source/cmUseMangledMesaCommand.cxx
index 057b67e..f30071e 100644
--- a/Source/cmUseMangledMesaCommand.cxx
+++ b/Source/cmUseMangledMesaCommand.cxx
@@ -13,8 +13,8 @@
#include "cmSystemTools.h"
-#include <cmsys/RegularExpression.hxx>
#include <cmsys/FStream.hxx>
+#include <cmsys/RegularExpression.hxx>
bool cmUseMangledMesaCommand
::InitialPass(std::vector<std::string> const& args, cmExecutionStatus &)
diff --git a/Source/cmUuid.cxx b/Source/cmUuid.cxx
index e2d0049..5f8935f 100644
--- a/Source/cmUuid.cxx
+++ b/Source/cmUuid.cxx
@@ -13,8 +13,8 @@
#include <string.h>
-#include <cmsys/MD5.h>
#include "cm_sha2.h"
+#include <cmsys/MD5.h>
cmUuid::cmUuid()
{
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index 7ff9f04..b4bdb2a 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -11,36 +11,36 @@
============================================================================*/
#include "cmVisualStudio10TargetGenerator.h"
-#include "windows.h"
-#include "cmGlobalVisualStudio10Generator.h"
-#include "cmGeneratorTarget.h"
#include "cmComputeLinkInformation.h"
+#include "cmCustomCommandGenerator.h"
#include "cmGeneratedFileStream.h"
+#include "cmGeneratorTarget.h"
+#include "cmGlobalVisualStudio10Generator.h"
+#include "cmLocalVisualStudio7Generator.h"
#include "cmMakefile.h"
#include "cmSourceFile.h"
-#include "cmVisualStudioGeneratorOptions.h"
-#include "cmLocalVisualStudio7Generator.h"
-#include "cmCustomCommandGenerator.h"
#include "cmVS10CLFlagTable.h"
-#include "cmVS10RCFlagTable.h"
-#include "cmVS10LinkFlagTable.h"
#include "cmVS10LibFlagTable.h"
+#include "cmVS10LinkFlagTable.h"
#include "cmVS10MASMFlagTable.h"
+#include "cmVS10RCFlagTable.h"
#include "cmVS11CLFlagTable.h"
-#include "cmVS11RCFlagTable.h"
-#include "cmVS11LinkFlagTable.h"
#include "cmVS11LibFlagTable.h"
+#include "cmVS11LinkFlagTable.h"
#include "cmVS11MASMFlagTable.h"
+#include "cmVS11RCFlagTable.h"
#include "cmVS12CLFlagTable.h"
-#include "cmVS12RCFlagTable.h"
-#include "cmVS12LinkFlagTable.h"
#include "cmVS12LibFlagTable.h"
+#include "cmVS12LinkFlagTable.h"
#include "cmVS12MASMFlagTable.h"
+#include "cmVS12RCFlagTable.h"
#include "cmVS14CLFlagTable.h"
-#include "cmVS14RCFlagTable.h"
-#include "cmVS14LinkFlagTable.h"
#include "cmVS14LibFlagTable.h"
+#include "cmVS14LinkFlagTable.h"
#include "cmVS14MASMFlagTable.h"
+#include "cmVS14RCFlagTable.h"
+#include "cmVisualStudioGeneratorOptions.h"
+#include "windows.h"
#include <cmsys/auto_ptr.hxx>
diff --git a/Source/cmXMLSafe.cxx b/Source/cmXMLSafe.cxx
index 4ad05ca..e76ee52 100644
--- a/Source/cmXMLSafe.cxx
+++ b/Source/cmXMLSafe.cxx
@@ -16,8 +16,8 @@
#include <iostream>
#include <sstream>
-#include <string.h>
#include <stdio.h>
+#include <string.h>
//----------------------------------------------------------------------------
cmXMLSafe::cmXMLSafe(const char* s):
diff --git a/Source/cmXMLSafe.h b/Source/cmXMLSafe.h
index 981359a..7cf34ba 100644
--- a/Source/cmXMLSafe.h
+++ b/Source/cmXMLSafe.h
@@ -14,8 +14,8 @@
#include <cmsys/Configure.hxx>
-#include <string>
#include <iosfwd>
+#include <string>
/** \class cmXMLSafe
* \brief Write strings to XML with proper escapes
diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index f336384..da6e59e 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -11,17 +11,17 @@
============================================================================*/
#include "cmake.h"
-#include "cmMakefile.h"
-#include "cmLocalGenerator.h"
-#include "cmExternalMakefileProjectGenerator.h"
-#include "cmCommands.h"
+#include "cmAlgorithms.h"
#include "cmCommand.h"
+#include "cmCommands.h"
+#include "cmDocumentationFormatter.h"
+#include "cmExternalMakefileProjectGenerator.h"
#include "cmFileTimeComparison.h"
+#include "cmLocalGenerator.h"
+#include "cmMakefile.h"
#include "cmSourceFile.h"
-#include "cmTest.h"
-#include "cmDocumentationFormatter.h"
-#include "cmAlgorithms.h"
#include "cmState.h"
+#include "cmTest.h"
#if defined(CMAKE_BUILD_WITH_CMAKE)
# include "cmGraphVizWriter.h"
@@ -29,9 +29,9 @@
# include <cmsys/SystemInformation.hxx>
#endif
+#include <cmsys/FStream.hxx>
#include <cmsys/Glob.hxx>
#include <cmsys/RegularExpression.hxx>
-#include <cmsys/FStream.hxx>
// only build kdevelop generator on non-windows platforms
// when not bootstrapping cmake
@@ -52,17 +52,17 @@
// include the generator
#if defined(_WIN32) && !defined(__CYGWIN__)
# if !defined(CMAKE_BOOT_MINGW)
-# include "cmGlobalVisualStudio71Generator.h"
-# include "cmGlobalVisualStudio8Generator.h"
-# include "cmGlobalVisualStudio9Generator.h"
+# include "cmGlobalBorlandMakefileGenerator.h"
+# include "cmGlobalGhsMultiGenerator.h"
+# include "cmGlobalJOMMakefileGenerator.h"
+# include "cmGlobalNMakeMakefileGenerator.h"
# include "cmGlobalVisualStudio10Generator.h"
# include "cmGlobalVisualStudio11Generator.h"
# include "cmGlobalVisualStudio12Generator.h"
# include "cmGlobalVisualStudio14Generator.h"
-# include "cmGlobalBorlandMakefileGenerator.h"
-# include "cmGlobalNMakeMakefileGenerator.h"
-# include "cmGlobalJOMMakefileGenerator.h"
-# include "cmGlobalGhsMultiGenerator.h"
+# include "cmGlobalVisualStudio71Generator.h"
+# include "cmGlobalVisualStudio8Generator.h"
+# include "cmGlobalVisualStudio9Generator.h"
# define CMAKE_HAVE_VS_GENERATORS
# endif
# include "cmGlobalMSYSMakefileGenerator.h"
@@ -81,8 +81,8 @@
#if !defined(CMAKE_BOOT_MINGW)
# include "cmExtraCodeBlocksGenerator.h"
#endif
-#include "cmExtraSublimeTextGenerator.h"
#include "cmExtraKateGenerator.h"
+#include "cmExtraSublimeTextGenerator.h"
#ifdef CMAKE_USE_KDEVELOP
# include "cmGlobalKdevelopGenerator.h"
@@ -100,8 +100,8 @@
# define CMAKE_USE_XCODE 1
# endif
# include <sys/types.h>
-# include <sys/time.h>
# include <sys/resource.h>
+# include <sys/time.h>
#endif
#include <sys/stat.h> // struct stat
diff --git a/Source/cmake.h b/Source/cmake.h
index 8fb4195..e41ba56 100644
--- a/Source/cmake.h
+++ b/Source/cmake.h
@@ -15,11 +15,11 @@
#include "cmStandardIncludes.h"
-#include "cmListFileCache.h"
-#include "cmSystemTools.h"
-#include "cmInstalledFile.h"
#include "cmCacheManager.h"
+#include "cmInstalledFile.h"
+#include "cmListFileCache.h"
#include "cmState.h"
+#include "cmSystemTools.h"
class cmGlobalGeneratorFactory;
class cmGlobalGenerator;
diff --git a/Source/cmakemain.cxx b/Source/cmakemain.cxx
index 600cc1a..785fd90 100644
--- a/Source/cmakemain.cxx
+++ b/Source/cmakemain.cxx
@@ -12,19 +12,19 @@
// include these first, otherwise there will be problems on Windows
// with GetCurrentDirectory() being redefined
#ifdef CMAKE_BUILD_WITH_CMAKE
-#include "cmDynamicLoader.h"
#include "cmDocumentation.h"
+#include "cmDynamicLoader.h"
#endif
-#include "cmake.h"
-#include "cmcmd.h"
-#include "cmState.h"
-#include "cmListFileCache.h"
-#include "cmSourceFile.h"
+#include "cmAlgorithms.h"
#include "cmGlobalGenerator.h"
+#include "cmListFileCache.h"
#include "cmLocalGenerator.h"
#include "cmMakefile.h"
-#include "cmAlgorithms.h"
+#include "cmSourceFile.h"
+#include "cmState.h"
+#include "cmake.h"
+#include "cmcmd.h"
#include <cmsys/Encoding.hxx>
#ifdef CMAKE_BUILD_WITH_CMAKE
diff --git a/Source/cmakexbuild.cxx b/Source/cmakexbuild.cxx
index 03059f5..1385ff7 100644
--- a/Source/cmakexbuild.cxx
+++ b/Source/cmakexbuild.cxx
@@ -11,8 +11,8 @@
============================================================================*/
#include "cmStandardIncludes.h"
-#include <cmsys/Process.h>
#include "cmSystemTools.h"
+#include <cmsys/Process.h>
// This is a wrapper program for xcodebuild
// it calls xcodebuild, and does two things
diff --git a/Source/cmcldeps.cxx b/Source/cmcldeps.cxx
index 3f3ec4d..644da1d 100644
--- a/Source/cmcldeps.cxx
+++ b/Source/cmcldeps.cxx
@@ -22,8 +22,8 @@
#include <cmSystemTools.h>
#include <cmsys/Encoding.hxx>
-#include <windows.h>
#include <sstream>
+#include <windows.h>
// We don't want any wildcard expansion.
// See http://msdn.microsoft.com/en-us/library/zay8tzh6(v=vs.85).aspx
diff --git a/Source/cmcmd.cxx b/Source/cmcmd.cxx
index 2b153bd..1f92b67 100644
--- a/Source/cmcmd.cxx
+++ b/Source/cmcmd.cxx
@@ -11,20 +11,20 @@
============================================================================*/
#include "cmcmd.h"
-#include "cmMakefile.h"
-#include "cmLocalGenerator.h"
+#include "cmAlgorithms.h"
#include "cmGlobalGenerator.h"
+#include "cmLocalGenerator.h"
+#include "cmMakefile.h"
#include "cmQtAutoGenerators.h"
#include "cmVersion.h"
-#include "cmAlgorithms.h"
#if defined(CMAKE_BUILD_WITH_CMAKE)
# include "cmDependsFortran.h" // For -E cmake_copy_f90_mod callback.
#endif
#include <cmsys/Directory.hxx>
-#include <cmsys/Process.h>
#include <cmsys/FStream.hxx>
+#include <cmsys/Process.h>
#include <cmsys/Terminal.h>
#if defined(CMAKE_HAVE_VS_GENERATORS)
diff --git a/Source/ctest.cxx b/Source/ctest.cxx
index 7fa6aed..5c80487 100644
--- a/Source/ctest.cxx
+++ b/Source/ctest.cxx
@@ -13,11 +13,11 @@
#include "cmSystemTools.h"
// Need these for documentation support.
-#include "cmake.h"
#include "cmDocumentation.h"
+#include "cmake.h"
-#include "CTest/cmCTestScriptHandler.h"
#include "CTest/cmCTestLaunch.h"
+#include "CTest/cmCTestScriptHandler.h"
#include "cmsys/Encoding.hxx"
//----------------------------------------------------------------------------
diff --git a/Tests/BuildDepends/Project/bar.cxx b/Tests/BuildDepends/Project/bar.cxx
index dadf93d..c4adbf8 100644
--- a/Tests/BuildDepends/Project/bar.cxx
+++ b/Tests/BuildDepends/Project/bar.cxx
@@ -1,7 +1,7 @@
+#include <noregen.h>
+#include <regen.h>
#include <stdio.h>
#include <string.h>
-#include <regen.h>
-#include <noregen.h>
int main(int argc, char** argv)
{
diff --git a/Tests/BuildDepends/Project/ninjadep.cpp b/Tests/BuildDepends/Project/ninjadep.cpp
index 8d61336..5498b17 100644
--- a/Tests/BuildDepends/Project/ninjadep.cpp
+++ b/Tests/BuildDepends/Project/ninjadep.cpp
@@ -1,5 +1,5 @@
-#include <stdio.h>
#include "dir/header.h"
+#include <stdio.h>
int main() {
printf("HEADER_STRING: %s\n", HEADER_STRING);
diff --git a/Tests/BuildDepends/Project/zot.cxx b/Tests/BuildDepends/Project/zot.cxx
index 775fd3b..186554b 100644
--- a/Tests/BuildDepends/Project/zot.cxx
+++ b/Tests/BuildDepends/Project/zot.cxx
@@ -1,6 +1,6 @@
+#include <stdio.h>
#include <zot.hxx>
#include <zot_custom.hxx>
-#include <stdio.h>
const char* zot_macro_dir_f();
const char* zot_macro_tgt_f();
diff --git a/Tests/BundleTest/BundleLib.cxx b/Tests/BundleTest/BundleLib.cxx
index 37bc178..54f9534 100644
--- a/Tests/BundleTest/BundleLib.cxx
+++ b/Tests/BundleTest/BundleLib.cxx
@@ -1,6 +1,6 @@
#include <stdio.h>
-#include <string.h>
#include <stdlib.h>
+#include <string.h>
#include <unistd.h>
#include <CoreFoundation/CoreFoundation.h>
diff --git a/Tests/BundleUtilities/module.cpp b/Tests/BundleUtilities/module.cpp
index ee1b542..51730d9 100644
--- a/Tests/BundleUtilities/module.cpp
+++ b/Tests/BundleUtilities/module.cpp
@@ -1,7 +1,7 @@
#include "module.h"
-#include "stdio.h"
#include "shared2.h"
+#include "stdio.h"
void module()
{
diff --git a/Tests/CMakeCommands/target_include_directories/consumer.cpp b/Tests/CMakeCommands/target_include_directories/consumer.cpp
index 649510c..9e1656a 100644
--- a/Tests/CMakeCommands/target_include_directories/consumer.cpp
+++ b/Tests/CMakeCommands/target_include_directories/consumer.cpp
@@ -1,9 +1,9 @@
+#include "consumer.h"
#include "common.h"
-#include "publicinclude.h"
#include "interfaceinclude.h"
+#include "publicinclude.h"
#include "relative_dir.h"
-#include "consumer.h"
#ifdef TEST_LANG_DEFINES
#include "cxx_only.h"
#endif
diff --git a/Tests/CMakeCommands/target_link_libraries/targetC.cpp b/Tests/CMakeCommands/target_link_libraries/targetC.cpp
index a4ef636..3542660 100644
--- a/Tests/CMakeCommands/target_link_libraries/targetC.cpp
+++ b/Tests/CMakeCommands/target_link_libraries/targetC.cpp
@@ -1,8 +1,8 @@
#include "depG.h"
-#include "foo.h"
#include "bar.h"
+#include "foo.h"
#ifndef TEST_DEF
#error Expected TEST_DEF definition
diff --git a/Tests/CMakeLib/testUTF8.cxx b/Tests/CMakeLib/testUTF8.cxx
index 4ab96cf..204a717 100644
--- a/Tests/CMakeLib/testUTF8.cxx
+++ b/Tests/CMakeLib/testUTF8.cxx
@@ -11,8 +11,8 @@
============================================================================*/
#include <cm_utf8.h>
-#include <string.h>
#include <stdio.h>
+#include <string.h>
typedef char test_utf8_char[5];
diff --git a/Tests/CompileDefinitions/runtest.c b/Tests/CompileDefinitions/runtest.c
index 02d2cad..c2d51aa 100644
--- a/Tests/CompileDefinitions/runtest.c
+++ b/Tests/CompileDefinitions/runtest.c
@@ -1,6 +1,6 @@
-#include <string.h>
-#include <stdio.h>
#include <ctype.h>
+#include <stdio.h>
+#include <string.h>
#ifndef BUILD_CONFIG_NAME
# error "BUILD_CONFIG_NAME not defined!"
diff --git a/Tests/Complex/Executable/complex.cxx b/Tests/Complex/Executable/complex.cxx
index ec222a5..8d538db 100644
--- a/Tests/Complex/Executable/complex.cxx
+++ b/Tests/Complex/Executable/complex.cxx
@@ -1,18 +1,18 @@
+#include "Aout.h"
+#include "ExtraSources/file1.h"
#include "cmTestConfigure.h"
#include "cmTestConfigureEscape.h"
#include "cmTestGeneratedHeader.h"
#include "cmVersion.h"
-#include "ExtraSources/file1.h"
-#include "Aout.h"
#include "file2.h"
#include "sharedFile.h"
extern "C" {
#include "testConly.h"
}
-#include <vector>
-#include <string>
#include <iostream>
#include <string.h>
+#include <string>
+#include <vector>
#include <stdio.h>
#include <sys/stat.h>
diff --git a/Tests/ComplexOneConfig/Executable/complex.cxx b/Tests/ComplexOneConfig/Executable/complex.cxx
index ec222a5..8d538db 100644
--- a/Tests/ComplexOneConfig/Executable/complex.cxx
+++ b/Tests/ComplexOneConfig/Executable/complex.cxx
@@ -1,18 +1,18 @@
+#include "Aout.h"
+#include "ExtraSources/file1.h"
#include "cmTestConfigure.h"
#include "cmTestConfigureEscape.h"
#include "cmTestGeneratedHeader.h"
#include "cmVersion.h"
-#include "ExtraSources/file1.h"
-#include "Aout.h"
#include "file2.h"
#include "sharedFile.h"
extern "C" {
#include "testConly.h"
}
-#include <vector>
-#include <string>
#include <iostream>
#include <string.h>
+#include <string>
+#include <vector>
#include <stdio.h>
#include <sys/stat.h>
diff --git a/Tests/ExportImport/Export/testSharedLibDepends.h b/Tests/ExportImport/Export/testSharedLibDepends.h
index 8b2f84e..e84fb54 100644
--- a/Tests/ExportImport/Export/testSharedLibDepends.h
+++ b/Tests/ExportImport/Export/testSharedLibDepends.h
@@ -4,8 +4,8 @@
#include "testsharedlibdepends_export.h"
-#include "testSharedLibRequired.h"
#include "renamed.h"
+#include "testSharedLibRequired.h"
struct TESTSHAREDLIBDEPENDS_EXPORT TestSharedLibDepends
{
diff --git a/Tests/ExportImport/Import/A/deps_shared_iface.cpp b/Tests/ExportImport/Import/A/deps_shared_iface.cpp
index d5e4de3..0c5cb7f 100644
--- a/Tests/ExportImport/Import/A/deps_shared_iface.cpp
+++ b/Tests/ExportImport/Import/A/deps_shared_iface.cpp
@@ -21,8 +21,8 @@
#endif
#ifdef TEST_SUBDIR_LIB
-#include "subdir.h"
#include "renamed.h"
+#include "subdir.h"
#endif
#ifdef DO_GNU_TESTS
diff --git a/Tests/FindGSL/rng/main.cc b/Tests/FindGSL/rng/main.cc
index 72543be..e1e0a47 100644
--- a/Tests/FindGSL/rng/main.cc
+++ b/Tests/FindGSL/rng/main.cc
@@ -1,5 +1,5 @@
-#include <math.h>
#include "gsl/gsl_rng.h"
+#include <math.h>
int main()
{
diff --git a/Tests/FindGTK2/cairomm/main.cpp b/Tests/FindGTK2/cairomm/main.cpp
index ea8f106..0db3a04 100644
--- a/Tests/FindGTK2/cairomm/main.cpp
+++ b/Tests/FindGTK2/cairomm/main.cpp
@@ -8,11 +8,11 @@
#define _USE_MATH_DEFINES
#endif
-#include <string>
-#include <iostream>
-#include <cairommconfig.h>
#include <cairomm/context.h>
#include <cairomm/surface.h>
+#include <cairommconfig.h>
+#include <iostream>
+#include <string>
#include <cmath>
diff --git a/Tests/FindGTK2/gtkmm/main.cpp b/Tests/FindGTK2/gtkmm/main.cpp
index 5ff64d1..566a4bd 100644
--- a/Tests/FindGTK2/gtkmm/main.cpp
+++ b/Tests/FindGTK2/gtkmm/main.cpp
@@ -1,5 +1,5 @@
-#include <gtkmm.h>
#include "helloworld.h"
+#include <gtkmm.h>
int main(int argc, char *argv[])
{
diff --git a/Tests/FindGTK2/sigc++/main.cpp b/Tests/FindGTK2/sigc++/main.cpp
index 78428e7..ccf415e 100644
--- a/Tests/FindGTK2/sigc++/main.cpp
+++ b/Tests/FindGTK2/sigc++/main.cpp
@@ -1,8 +1,7 @@
// Taken from https://developer.gnome.org/libsigc++-tutorial/stable/ch02.html
-
-#include <sigc++/sigc++.h>
#include <iostream>
+#include <sigc++/sigc++.h>
class AlienDetector
{
diff --git a/Tests/FindLTTngUST/Test/main.c b/Tests/FindLTTngUST/Test/main.c
index ac775a0..1f313c1 100644
--- a/Tests/FindLTTngUST/Test/main.c
+++ b/Tests/FindLTTngUST/Test/main.c
@@ -1,7 +1,7 @@
#include <assert.h>
-#include <string.h>
-#include <stdio.h>
#include <lttng/ust-version.h>
+#include <stdio.h>
+#include <string.h>
#ifdef CMAKE_LTTNGUST_HAS_TRACEF
#include <lttng/tracef.h>
diff --git a/Tests/FindPNG/Test/main.c b/Tests/FindPNG/Test/main.c
index 27e1478..06d943d 100644
--- a/Tests/FindPNG/Test/main.c
+++ b/Tests/FindPNG/Test/main.c
@@ -1,6 +1,6 @@
#include <assert.h>
-#include <string.h>
#include <png.h>
+#include <string.h>
int main()
{
diff --git a/Tests/FindPackageModeMakefileTest/main.cpp b/Tests/FindPackageModeMakefileTest/main.cpp
index e5f9134..db1ffb1 100644
--- a/Tests/FindPackageModeMakefileTest/main.cpp
+++ b/Tests/FindPackageModeMakefileTest/main.cpp
@@ -1,5 +1,5 @@
-#include <stdio.h>
#include <foo.h>
+#include <stdio.h>
int main()
{
diff --git a/Tests/FindXalanC/Test/main.cxx b/Tests/FindXalanC/Test/main.cxx
index 3b4a2df..7d0f42c 100644
--- a/Tests/FindXalanC/Test/main.cxx
+++ b/Tests/FindXalanC/Test/main.cxx
@@ -1,5 +1,5 @@
-#include <xercesc/util/PlatformUtils.hpp>
#include <xalanc/XalanTransformer/XalanTransformer.hpp>
+#include <xercesc/util/PlatformUtils.hpp>
int main()
{
diff --git a/Tests/IncludeDirectories/TargetIncludeDirectories/main.cpp b/Tests/IncludeDirectories/TargetIncludeDirectories/main.cpp
index aed0bde..2ee05e2 100644
--- a/Tests/IncludeDirectories/TargetIncludeDirectories/main.cpp
+++ b/Tests/IncludeDirectories/TargetIncludeDirectories/main.cpp
@@ -1,17 +1,17 @@
+#include "arguments.h"
+#include "bang.h"
#include "bar.h"
#include "bat.h"
-#include "foo.h"
#include "baz.h"
-#include "bang.h"
#include "bing.h"
#include "bung.h"
-#include "ting.h"
-#include "arguments.h"
+#include "common.h"
+#include "foo.h"
#include "list.h"
-#include "target.h"
#include "prefix_foo_bar_bat.h"
-#include "common.h"
+#include "target.h"
+#include "ting.h"
int main(int, char**)
{
diff --git a/Tests/LoadCommand/CMakeCommands/cmTestCommand.c b/Tests/LoadCommand/CMakeCommands/cmTestCommand.c
index fc04934..eac121d 100644
--- a/Tests/LoadCommand/CMakeCommands/cmTestCommand.c
+++ b/Tests/LoadCommand/CMakeCommands/cmTestCommand.c
@@ -1,7 +1,7 @@
#include "cmCPluginAPI.h"
-#include <string.h>
-#include <stdlib.h>
#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
typedef struct
{
diff --git a/Tests/LoadCommandOneConfig/CMakeCommands/cmTestCommand.c b/Tests/LoadCommandOneConfig/CMakeCommands/cmTestCommand.c
index fc04934..eac121d 100644
--- a/Tests/LoadCommandOneConfig/CMakeCommands/cmTestCommand.c
+++ b/Tests/LoadCommandOneConfig/CMakeCommands/cmTestCommand.c
@@ -1,7 +1,7 @@
#include "cmCPluginAPI.h"
-#include <string.h>
-#include <stdlib.h>
#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
typedef struct
{
diff --git a/Tests/MFC/mfc1/mfc1.cpp b/Tests/MFC/mfc1/mfc1.cpp
index 057e1d5..1777d7f 100644
--- a/Tests/MFC/mfc1/mfc1.cpp
+++ b/Tests/MFC/mfc1/mfc1.cpp
@@ -3,8 +3,8 @@
#include "stdafx.h"
-#include "mfc1.h"
#include "MainFrm.h"
+#include "mfc1.h"
#include "ChildFrm.h"
#include "mfc1Doc.h"
diff --git a/Tests/MFC/mfc1/stdafx.h b/Tests/MFC/mfc1/stdafx.h
index 35a678d..654a23f 100644
--- a/Tests/MFC/mfc1/stdafx.h
+++ b/Tests/MFC/mfc1/stdafx.h
@@ -46,9 +46,9 @@
// turns off MFC's hiding of some common and often safely ignored warning messages
#define _AFX_ALL_WARNINGS
-#include <afxwin.h> // MFC core and standard components
-#include <afxext.h> // MFC extensions
-#include <afxdisp.h> // MFC Automation classes
+#include <afxdisp.h> // MFC Automation classes
+#include <afxext.h> // MFC extensions
+#include <afxwin.h> // MFC core and standard components
#include <afxdtctl.h> // MFC support for Internet Explorer 4 Common Controls
#ifndef _AFX_NO_AFXCMN_SUPPORT
diff --git a/Tests/OutOfSource/OutOfSourceSubdir/simple.cxx b/Tests/OutOfSource/OutOfSourceSubdir/simple.cxx
index d88c311..69d7c82 100644
--- a/Tests/OutOfSource/OutOfSourceSubdir/simple.cxx
+++ b/Tests/OutOfSource/OutOfSourceSubdir/simple.cxx
@@ -1,8 +1,8 @@
#include <stdio.h>
#include <string.h>
-#include "testlib.h"
#include "testdp.h"
+#include "testlib.h"
extern int simple();
#ifndef NO_DEEPSRC
diff --git a/Tests/Plugin/src/example_exe.cxx b/Tests/Plugin/src/example_exe.cxx
index 12d9204..393bb68 100644
--- a/Tests/Plugin/src/example_exe.cxx
+++ b/Tests/Plugin/src/example_exe.cxx
@@ -2,8 +2,8 @@
#include <example_exe.h>
-#include <kwsys/DynamicLoader.hxx>
#include <iostream>
+#include <kwsys/DynamicLoader.hxx>
#include <string>
#include <stdio.h>
diff --git a/Tests/Preprocess/preprocess.c b/Tests/Preprocess/preprocess.c
index 16209ac..af5eae6 100644
--- a/Tests/Preprocess/preprocess.c
+++ b/Tests/Preprocess/preprocess.c
@@ -3,8 +3,8 @@
#include FILE_PATH
#include TARGET_PATH
-#include <string.h>
#include <stdio.h>
+#include <string.h>
int check_defines_C(void)
{
diff --git a/Tests/Preprocess/preprocess.cxx b/Tests/Preprocess/preprocess.cxx
index 27b6ac8..d168103 100644
--- a/Tests/Preprocess/preprocess.cxx
+++ b/Tests/Preprocess/preprocess.cxx
@@ -3,8 +3,8 @@
#include FILE_PATH
#include TARGET_PATH
-#include <string.h>
#include <stdio.h>
+#include <string.h>
extern "C" int check_defines_C(void);
diff --git a/Tests/Qt4Deploy/testdeploy.cpp b/Tests/Qt4Deploy/testdeploy.cpp
index 8b9c8d6..255453a 100644
--- a/Tests/Qt4Deploy/testdeploy.cpp
+++ b/Tests/Qt4Deploy/testdeploy.cpp
@@ -1,7 +1,7 @@
#include <QCoreApplication>
-#include <QSqlDatabase>
-#include <QLibraryInfo>
#include <QDebug>
+#include <QLibraryInfo>
+#include <QSqlDatabase>
#include <QStringList>
int main(int argc, char** argv)
diff --git a/Tests/QtAutogen/Bdir/libB.h b/Tests/QtAutogen/Bdir/libB.h
index 510c17f..746b67a 100644
--- a/Tests/QtAutogen/Bdir/libB.h
+++ b/Tests/QtAutogen/Bdir/libB.h
@@ -4,8 +4,8 @@
#include "libb_export.h"
-#include <QObject>
#include "libA.h"
+#include <QObject>
class LIBB_EXPORT LibB : public QObject
{
diff --git a/Tests/QtAutogen/calwidget.cpp b/Tests/QtAutogen/calwidget.cpp
index 5f59994..0e314cd 100644
--- a/Tests/QtAutogen/calwidget.cpp
+++ b/Tests/QtAutogen/calwidget.cpp
@@ -38,13 +38,13 @@
**
****************************************************************************/
+ #include <QCalendarWidget>
+ #include <QCheckBox>
#include <QComboBox>
+ #include <QDateEdit>
#include <QGridLayout>
- #include <QLabel>
#include <QGroupBox>
- #include <QCheckBox>
- #include <QDateEdit>
- #include <QCalendarWidget>
+ #include <QLabel>
#include <QTextCharFormat>
#include "calwidget.h"
diff --git a/Tests/QtAutogen/codeeditor.h b/Tests/QtAutogen/codeeditor.h
index 56e9e79..fd79a2a 100644
--- a/Tests/QtAutogen/codeeditor.h
+++ b/Tests/QtAutogen/codeeditor.h
@@ -41,8 +41,8 @@
#ifndef CODEEDITOR_H
#define CODEEDITOR_H
- #include <QPlainTextEdit>
#include <QObject>
+ #include <QPlainTextEdit>
class QPaintEvent;
class QResizeEvent;
diff --git a/Tests/QtAutogen/libC.h b/Tests/QtAutogen/libC.h
index 4fb4a2c..6682576 100644
--- a/Tests/QtAutogen/libC.h
+++ b/Tests/QtAutogen/libC.h
@@ -4,8 +4,8 @@
#include "libc_export.h"
-#include <QObject>
#include "libB.h"
+#include <QObject>
class LIBC_EXPORT LibC : public QObject
{
diff --git a/Tests/QtAutogen/main.cpp b/Tests/QtAutogen/main.cpp
index eb59665..1636cd4 100644
--- a/Tests/QtAutogen/main.cpp
+++ b/Tests/QtAutogen/main.cpp
@@ -41,16 +41,16 @@
#include <QCoreApplication>
#include <QTimer>
-#include "codeeditor.h"
+#include "abc.h"
+#include "blub.h"
#include "calwidget.h"
+#include "codeeditor.h"
#include "foo.h"
-#include "blub.h"
+#include "libC.h"
+#include "resourcetester.h"
#include "sub/bar.h"
-#include "abc.h"
#include "xyz.h"
#include "yaf.h"
-#include "libC.h"
-#include "resourcetester.h"
#ifdef TEST_DEBUG_CLASS
#include "debug_class.h"
#include <iostream>
diff --git a/Tests/QtAutogen/resourcetester.cpp b/Tests/QtAutogen/resourcetester.cpp
index 043ec75..75ae28f 100644
--- a/Tests/QtAutogen/resourcetester.cpp
+++ b/Tests/QtAutogen/resourcetester.cpp
@@ -1,8 +1,8 @@
#include "resourcetester.h"
-#include <QDebug>
#include <QApplication>
+#include <QDebug>
#include <QFile>
#include <QTimer>
diff --git a/Tests/QtAutogen/same_name/ccc/item.cpp b/Tests/QtAutogen/same_name/ccc/item.cpp
index 2584881..12c71d0 100644
--- a/Tests/QtAutogen/same_name/ccc/item.cpp
+++ b/Tests/QtAutogen/same_name/ccc/item.cpp
@@ -22,5 +22,5 @@ MocTest::go()
}
// Include own moc files
-#include "moc_item.cpp"
#include "item.moc"
+#include "moc_item.cpp"
diff --git a/Tests/QtAutogen/same_name/main.cpp b/Tests/QtAutogen/same_name/main.cpp
index 166466e..fc77a99 100644
--- a/Tests/QtAutogen/same_name/main.cpp
+++ b/Tests/QtAutogen/same_name/main.cpp
@@ -1,7 +1,7 @@
-#include "aaa/item.hpp"
#include "aaa/bbb/item.hpp"
-#include "bbb/item.hpp"
+#include "aaa/item.hpp"
#include "bbb/aaa/item.hpp"
+#include "bbb/item.hpp"
#include "ccc/item.hpp"
int main(int argv, char **args)
diff --git a/Tests/RunCMake/AutoExportDll/hello.cxx b/Tests/RunCMake/AutoExportDll/hello.cxx
index 3933fc1..4196948 100644
--- a/Tests/RunCMake/AutoExportDll/hello.cxx
+++ b/Tests/RunCMake/AutoExportDll/hello.cxx
@@ -1,5 +1,5 @@
-#include <stdio.h>
#include "hello.h"
+#include <stdio.h>
int Hello::Data = 0;
void Hello::real()
{
diff --git a/Tests/RunCMake/AutoExportDll/say.cxx b/Tests/RunCMake/AutoExportDll/say.cxx
index 655b3c2..0d78d4b 100644
--- a/Tests/RunCMake/AutoExportDll/say.cxx
+++ b/Tests/RunCMake/AutoExportDll/say.cxx
@@ -1,5 +1,5 @@
-#include <stdio.h>
#include "hello.h"
+#include <stdio.h>
#ifdef _MSC_VER
#include "windows.h"
#else
diff --git a/Tests/StagingPrefix/Consumer/main.cpp b/Tests/StagingPrefix/Consumer/main.cpp
index 612ee05..5c0202d 100644
--- a/Tests/StagingPrefix/Consumer/main.cpp
+++ b/Tests/StagingPrefix/Consumer/main.cpp
@@ -1,6 +1,6 @@
-#include "foo.h"
#include "bar.h"
+#include "foo.h"
int main(int, char **)
{
diff --git a/Tests/TestsWorkingDirectory/main.c b/Tests/TestsWorkingDirectory/main.c
index 19f2f14..3616f8e 100644
--- a/Tests/TestsWorkingDirectory/main.c
+++ b/Tests/TestsWorkingDirectory/main.c
@@ -5,8 +5,8 @@
#if defined(_WIN32) && (defined(_MSC_VER) || defined(__WATCOMC__) || defined(__BORLANDC__) || defined(__MINGW32__))
-#include <io.h>
#include <direct.h>
+#include <io.h>
#if defined(__WATCOMC__)
#include <direct.h>
diff --git a/Tests/Tutorial/Step1/tutorial.cxx b/Tests/Tutorial/Step1/tutorial.cxx
index 8ab6dc3..a3584c4 100644
--- a/Tests/Tutorial/Step1/tutorial.cxx
+++ b/Tests/Tutorial/Step1/tutorial.cxx
@@ -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[])
{
diff --git a/Tests/Tutorial/Step2/MathFunctions/mysqrt.cxx b/Tests/Tutorial/Step2/MathFunctions/mysqrt.cxx
index 62523f6..0f7c106 100644
--- a/Tests/Tutorial/Step2/MathFunctions/mysqrt.cxx
+++ b/Tests/Tutorial/Step2/MathFunctions/mysqrt.cxx
@@ -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)
diff --git a/Tests/Tutorial/Step2/tutorial.cxx b/Tests/Tutorial/Step2/tutorial.cxx
index c27da0b..af88dad 100644
--- a/Tests/Tutorial/Step2/tutorial.cxx
+++ b/Tests/Tutorial/Step2/tutorial.cxx
@@ -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"
diff --git a/Tests/Tutorial/Step3/MathFunctions/mysqrt.cxx b/Tests/Tutorial/Step3/MathFunctions/mysqrt.cxx
index 62523f6..0f7c106 100644
--- a/Tests/Tutorial/Step3/MathFunctions/mysqrt.cxx
+++ b/Tests/Tutorial/Step3/MathFunctions/mysqrt.cxx
@@ -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)
diff --git a/Tests/Tutorial/Step3/tutorial.cxx b/Tests/Tutorial/Step3/tutorial.cxx
index c27da0b..af88dad 100644
--- a/Tests/Tutorial/Step3/tutorial.cxx
+++ b/Tests/Tutorial/Step3/tutorial.cxx
@@ -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"
diff --git a/Tests/Tutorial/Step4/MathFunctions/mysqrt.cxx b/Tests/Tutorial/Step4/MathFunctions/mysqrt.cxx
index d081d11..bbd08fa 100644
--- a/Tests/Tutorial/Step4/MathFunctions/mysqrt.cxx
+++ b/Tests/Tutorial/Step4/MathFunctions/mysqrt.cxx
@@ -1,6 +1,6 @@
-#include <stdio.h>
#include "MathFunctions.h"
#include "TutorialConfig.h"
+#include <stdio.h>
#include <math.h>
diff --git a/Tests/Tutorial/Step4/tutorial.cxx b/Tests/Tutorial/Step4/tutorial.cxx
index c27da0b..af88dad 100644
--- a/Tests/Tutorial/Step4/tutorial.cxx
+++ b/Tests/Tutorial/Step4/tutorial.cxx
@@ -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"
diff --git a/Tests/Tutorial/Step5/MathFunctions/MakeTable.cxx b/Tests/Tutorial/Step5/MathFunctions/MakeTable.cxx
index ef98d5f..a23feeb 100644
--- a/Tests/Tutorial/Step5/MathFunctions/MakeTable.cxx
+++ b/Tests/Tutorial/Step5/MathFunctions/MakeTable.cxx
@@ -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[])
{
diff --git a/Tests/Tutorial/Step5/MathFunctions/mysqrt.cxx b/Tests/Tutorial/Step5/MathFunctions/mysqrt.cxx
index 1f9b887..a488af6 100644
--- a/Tests/Tutorial/Step5/MathFunctions/mysqrt.cxx
+++ b/Tests/Tutorial/Step5/MathFunctions/mysqrt.cxx
@@ -1,6 +1,6 @@
-#include <stdio.h>
#include "MathFunctions.h"
#include "TutorialConfig.h"
+#include <stdio.h>
// include the generated table
#include "Table.h"
diff --git a/Tests/Tutorial/Step5/tutorial.cxx b/Tests/Tutorial/Step5/tutorial.cxx
index c27da0b..af88dad 100644
--- a/Tests/Tutorial/Step5/tutorial.cxx
+++ b/Tests/Tutorial/Step5/tutorial.cxx
@@ -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"
diff --git a/Tests/Tutorial/Step6/MathFunctions/MakeTable.cxx b/Tests/Tutorial/Step6/MathFunctions/MakeTable.cxx
index ef98d5f..a23feeb 100644
--- a/Tests/Tutorial/Step6/MathFunctions/MakeTable.cxx
+++ b/Tests/Tutorial/Step6/MathFunctions/MakeTable.cxx
@@ -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[])
{
diff --git a/Tests/Tutorial/Step6/MathFunctions/mysqrt.cxx b/Tests/Tutorial/Step6/MathFunctions/mysqrt.cxx
index 1f9b887..a488af6 100644
--- a/Tests/Tutorial/Step6/MathFunctions/mysqrt.cxx
+++ b/Tests/Tutorial/Step6/MathFunctions/mysqrt.cxx
@@ -1,6 +1,6 @@
-#include <stdio.h>
#include "MathFunctions.h"
#include "TutorialConfig.h"
+#include <stdio.h>
// include the generated table
#include "Table.h"
diff --git a/Tests/Tutorial/Step6/tutorial.cxx b/Tests/Tutorial/Step6/tutorial.cxx
index c27da0b..af88dad 100644
--- a/Tests/Tutorial/Step6/tutorial.cxx
+++ b/Tests/Tutorial/Step6/tutorial.cxx
@@ -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"
diff --git a/Tests/Tutorial/Step7/MathFunctions/MakeTable.cxx b/Tests/Tutorial/Step7/MathFunctions/MakeTable.cxx
index ef98d5f..a23feeb 100644
--- a/Tests/Tutorial/Step7/MathFunctions/MakeTable.cxx
+++ b/Tests/Tutorial/Step7/MathFunctions/MakeTable.cxx
@@ -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[])
{
diff --git a/Tests/Tutorial/Step7/MathFunctions/mysqrt.cxx b/Tests/Tutorial/Step7/MathFunctions/mysqrt.cxx
index 1f9b887..a488af6 100644
--- a/Tests/Tutorial/Step7/MathFunctions/mysqrt.cxx
+++ b/Tests/Tutorial/Step7/MathFunctions/mysqrt.cxx
@@ -1,6 +1,6 @@
-#include <stdio.h>
#include "MathFunctions.h"
#include "TutorialConfig.h"
+#include <stdio.h>
// include the generated table
#include "Table.h"
diff --git a/Tests/Tutorial/Step7/tutorial.cxx b/Tests/Tutorial/Step7/tutorial.cxx
index c27da0b..af88dad 100644
--- a/Tests/Tutorial/Step7/tutorial.cxx
+++ b/Tests/Tutorial/Step7/tutorial.cxx
@@ -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"
diff --git a/Tests/VSResource/main.cpp b/Tests/VSResource/main.cpp
index ccf700c..f8372b7 100644
--- a/Tests/VSResource/main.cpp
+++ b/Tests/VSResource/main.cpp
@@ -1,5 +1,5 @@
-#include <windows.h>
#include <stdio.h>
+#include <windows.h>
extern int lib();
diff --git a/Tests/VSWinStorePhone/Direct3DApp1/Direct3DApp1.cpp b/Tests/VSWinStorePhone/Direct3DApp1/Direct3DApp1.cpp
index 3cfc589..41ca124 100644
--- a/Tests/VSWinStorePhone/Direct3DApp1/Direct3DApp1.cpp
+++ b/Tests/VSWinStorePhone/Direct3DApp1/Direct3DApp1.cpp
@@ -1,7 +1,7 @@
#include "pch.h"
-#include "Direct3DApp1.h"
#include "BasicTimer.h"
+#include "Direct3DApp1.h"
using namespace Windows::ApplicationModel;
using namespace Windows::ApplicationModel::Core;
diff --git a/Tests/VSWinStorePhone/Direct3DApp1/DirectXHelper.h b/Tests/VSWinStorePhone/Direct3DApp1/DirectXHelper.h
index d411a9b..3434ba9 100644
--- a/Tests/VSWinStorePhone/Direct3DApp1/DirectXHelper.h
+++ b/Tests/VSWinStorePhone/Direct3DApp1/DirectXHelper.h
@@ -1,8 +1,8 @@
#pragma once
-#include <wrl/client.h>
#include <ppl.h>
#include <ppltasks.h>
+#include <wrl/client.h>
namespace DX
{
diff --git a/Tests/VSWinStorePhone/Direct3DApp1/pch.h b/Tests/VSWinStorePhone/Direct3DApp1/pch.h
index 2302e66..78ebea3 100644
--- a/Tests/VSWinStorePhone/Direct3DApp1/pch.h
+++ b/Tests/VSWinStorePhone/Direct3DApp1/pch.h
@@ -1,7 +1,7 @@
#pragma once
-#include <wrl/client.h>
-#include <d3d11_1.h>
#include <DirectXMath.h>
-#include <memory>
#include <agile.h>
+#include <d3d11_1.h>
+#include <memory>
+#include <wrl/client.h>
diff --git a/Tests/Wrapping/qtwrappingmain.cxx b/Tests/Wrapping/qtwrappingmain.cxx
index fabecfc..55c7952 100644
--- a/Tests/Wrapping/qtwrappingmain.cxx
+++ b/Tests/Wrapping/qtwrappingmain.cxx
@@ -1,9 +1,9 @@
-#include <qapplication.h>
#include "qtwrapping.h"
+#include <qapplication.h>
#ifndef _WIN32
-# include <stdlib.h>
# include <stdio.h>
+# include <stdlib.h>
#endif
int main(int argc, char *argv[])
diff --git a/Tests/X11/HelloWorldX11.cxx b/Tests/X11/HelloWorldX11.cxx
index f2b8bdd..27ab843 100644
--- a/Tests/X11/HelloWorldX11.cxx
+++ b/Tests/X11/HelloWorldX11.cxx
@@ -19,8 +19,8 @@
/* include the X library headers */
#include <X11/Xlib.h>
-#include <X11/Xutil.h>
#include <X11/Xos.h>
+#include <X11/Xutil.h>
class Main {
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b0c37083f7705ab448562dfe351ce248a0c28397
commit b0c37083f7705ab448562dfe351ce248a0c28397
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Apr 29 09:40:20 2016 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Fri Apr 29 11:20:02 2016 -0400
Source: Stabilize include order
Each source file has a logical first include file. Include it in an
isolated block so that tools that sort includes do not move them.
diff --git a/Source/CPack/WiX/cmCPackWIXGenerator.h b/Source/CPack/WiX/cmCPackWIXGenerator.h
index 3f66b2c..8372cd6 100644
--- a/Source/CPack/WiX/cmCPackWIXGenerator.h
+++ b/Source/CPack/WiX/cmCPackWIXGenerator.h
@@ -13,11 +13,11 @@
#ifndef cmCPackWIXGenerator_h
#define cmCPackWIXGenerator_h
+#include <CPack/cmCPackGenerator.h>
+
#include "cmWIXPatch.h"
#include "cmWIXShortcut.h"
-#include <CPack/cmCPackGenerator.h>
-
#include <string>
#include <map>
diff --git a/Source/CPack/WiX/cmWIXAccessControlList.h b/Source/CPack/WiX/cmWIXAccessControlList.h
index 20902f7..54c2c19 100644
--- a/Source/CPack/WiX/cmWIXAccessControlList.h
+++ b/Source/CPack/WiX/cmWIXAccessControlList.h
@@ -13,11 +13,11 @@
#ifndef cmWIXAccessControlList_h
#define cmWIXAccessControlList_h
+#include "cmWIXSourceWriter.h"
+
#include <cmInstalledFile.h>
#include <CPack/cmCPackLog.h>
-#include "cmWIXSourceWriter.h"
-
class cmWIXAccessControlList
{
public:
diff --git a/Source/CPack/WiX/cmWIXFeaturesSourceWriter.h b/Source/CPack/WiX/cmWIXFeaturesSourceWriter.h
index 7670417..ff12e6c 100644
--- a/Source/CPack/WiX/cmWIXFeaturesSourceWriter.h
+++ b/Source/CPack/WiX/cmWIXFeaturesSourceWriter.h
@@ -14,6 +14,7 @@
#define cmWIXFeaturesSourceWriter_h
#include "cmWIXSourceWriter.h"
+
#include <CPack/cmCPackGenerator.h>
/** \class cmWIXFeaturesSourceWriter
diff --git a/Source/CPack/WiX/cmWIXFilesSourceWriter.cxx b/Source/CPack/WiX/cmWIXFilesSourceWriter.cxx
index d4698a7..446ce96 100644
--- a/Source/CPack/WiX/cmWIXFilesSourceWriter.cxx
+++ b/Source/CPack/WiX/cmWIXFilesSourceWriter.cxx
@@ -11,6 +11,7 @@
============================================================================*/
#include "cmWIXFilesSourceWriter.h"
+
#include "cmWIXAccessControlList.h"
#include <cmInstalledFile.h>
diff --git a/Source/CPack/WiX/cmWIXFilesSourceWriter.h b/Source/CPack/WiX/cmWIXFilesSourceWriter.h
index c48bc15..9df955b 100644
--- a/Source/CPack/WiX/cmWIXFilesSourceWriter.h
+++ b/Source/CPack/WiX/cmWIXFilesSourceWriter.h
@@ -14,6 +14,7 @@
#define cmWIXFilesSourceWriter_h
#include "cmWIXSourceWriter.h"
+
#include "cmWIXShortcut.h"
#include "cmWIXPatch.h"
diff --git a/Source/CPack/WiX/cmWIXPatchParser.h b/Source/CPack/WiX/cmWIXPatchParser.h
index acaeae3..42c0787 100644
--- a/Source/CPack/WiX/cmWIXPatchParser.h
+++ b/Source/CPack/WiX/cmWIXPatchParser.h
@@ -13,10 +13,10 @@
#ifndef cmCPackWIXPatchParser_h
#define cmCPackWIXPatchParser_h
-#include <cmXMLParser.h>
-
#include <CPack/cmCPackLog.h>
+#include <cmXMLParser.h>
+
#include <map>
#include <list>
diff --git a/Source/CPack/WiX/cmWIXRichTextFormatWriter.h b/Source/CPack/WiX/cmWIXRichTextFormatWriter.h
index f6327fb..acf1fa6 100644
--- a/Source/CPack/WiX/cmWIXRichTextFormatWriter.h
+++ b/Source/CPack/WiX/cmWIXRichTextFormatWriter.h
@@ -13,6 +13,8 @@
#ifndef cmWIXRichTextFormatWriter_h
#define cmWIXRichTextFormatWriter_h
+#include "cmStandardIncludes.h"
+
#include <cmsys/FStream.hxx>
/** \class cmWIXRichtTextFormatWriter
diff --git a/Source/CPack/WiX/cmWIXShortcut.h b/Source/CPack/WiX/cmWIXShortcut.h
index 5945e43..2a72394 100644
--- a/Source/CPack/WiX/cmWIXShortcut.h
+++ b/Source/CPack/WiX/cmWIXShortcut.h
@@ -13,13 +13,13 @@
#ifndef cmWIXShortcut_h
#define cmWIXShortcut_h
+#include <cmInstalledFile.h>
+
#include <string>
#include <map>
#include <set>
#include <vector>
-#include <cmInstalledFile.h>
-
class cmWIXFilesSourceWriter;
struct cmWIXShortcut
diff --git a/Source/CPack/WiX/cmWIXSourceWriter.cxx b/Source/CPack/WiX/cmWIXSourceWriter.cxx
index 63acb27..2e5194c 100644
--- a/Source/CPack/WiX/cmWIXSourceWriter.cxx
+++ b/Source/CPack/WiX/cmWIXSourceWriter.cxx
@@ -10,8 +10,6 @@
See the License for more information.
============================================================================*/
-#include "cmStandardIncludes.h"
-
#include "cmWIXSourceWriter.h"
#include <CPack/cmCPackGenerator.h>
diff --git a/Source/CPack/WiX/cmWIXSourceWriter.h b/Source/CPack/WiX/cmWIXSourceWriter.h
index 9e303f0..be0c169 100644
--- a/Source/CPack/WiX/cmWIXSourceWriter.h
+++ b/Source/CPack/WiX/cmWIXSourceWriter.h
@@ -13,11 +13,12 @@
#ifndef cmWIXSourceWriter_h
#define cmWIXSourceWriter_h
-#include <vector>
-#include <string>
+#include <CPack/cmCPackLog.h>
+
#include <cmsys/FStream.hxx>
-#include <CPack/cmCPackLog.h>
+#include <vector>
+#include <string>
/** \class cmWIXSourceWriter
* \brief Helper class to generate XML WiX source files
diff --git a/Source/CPack/cmCPackArchiveGenerator.h b/Source/CPack/cmCPackArchiveGenerator.h
index 16e7632..8b07339 100644
--- a/Source/CPack/cmCPackArchiveGenerator.h
+++ b/Source/CPack/cmCPackArchiveGenerator.h
@@ -13,9 +13,10 @@
#ifndef cmCPackArchiveGenerator_h
#define cmCPackArchiveGenerator_h
-#include "cmArchiveWrite.h"
#include "cmCPackGenerator.h"
+#include "cmArchiveWrite.h"
+
/** \class cmCPackArchiveGenerator
* \brief A generator base for libarchive generation.
diff --git a/Source/CPack/cmCPackBundleGenerator.cxx b/Source/CPack/cmCPackBundleGenerator.cxx
index b2d7019..e86667d 100644
--- a/Source/CPack/cmCPackBundleGenerator.cxx
+++ b/Source/CPack/cmCPackBundleGenerator.cxx
@@ -11,6 +11,7 @@
============================================================================*/
#include "cmCPackBundleGenerator.h"
+
#include "cmCPackLog.h"
#include "cmSystemTools.h"
diff --git a/Source/CPack/cmCPackComponentGroup.cxx b/Source/CPack/cmCPackComponentGroup.cxx
index fd20e9b..2d41e59 100644
--- a/Source/CPack/cmCPackComponentGroup.cxx
+++ b/Source/CPack/cmCPackComponentGroup.cxx
@@ -11,7 +11,9 @@
============================================================================*/
#include "cmCPackComponentGroup.h"
+
#include "cmSystemTools.h"
+
#include <vector>
#include <string>
diff --git a/Source/CPack/cmCPackDebGenerator.cxx b/Source/CPack/cmCPackDebGenerator.cxx
index 13c8d8f..9673942 100644
--- a/Source/CPack/cmCPackDebGenerator.cxx
+++ b/Source/CPack/cmCPackDebGenerator.cxx
@@ -9,6 +9,7 @@
implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the License for more information.
============================================================================*/
+
#include "cmCPackDebGenerator.h"
#include "cmSystemTools.h"
diff --git a/Source/CPack/cmCPackDebGenerator.h b/Source/CPack/cmCPackDebGenerator.h
index d678cfa..3d945dd 100644
--- a/Source/CPack/cmCPackDebGenerator.h
+++ b/Source/CPack/cmCPackDebGenerator.h
@@ -13,7 +13,6 @@
#ifndef cmCPackDebGenerator_h
#define cmCPackDebGenerator_h
-
#include "cmCPackGenerator.h"
/** \class cmCPackDebGenerator
diff --git a/Source/CPack/cmCPackDragNDropGenerator.cxx b/Source/CPack/cmCPackDragNDropGenerator.cxx
index d6de77d..eccc5cf 100644
--- a/Source/CPack/cmCPackDragNDropGenerator.cxx
+++ b/Source/CPack/cmCPackDragNDropGenerator.cxx
@@ -11,6 +11,7 @@
============================================================================*/
#include "cmCPackDragNDropGenerator.h"
+
#include "cmCPackLog.h"
#include "cmSystemTools.h"
#include "cmGeneratedFileStream.h"
diff --git a/Source/CPack/cmCPackGenerator.h b/Source/CPack/cmCPackGenerator.h
index 907bb1e..3a53d05 100644
--- a/Source/CPack/cmCPackGenerator.h
+++ b/Source/CPack/cmCPackGenerator.h
@@ -14,6 +14,7 @@
#define cmCPackGenerator_h
#include "cmObject.h"
+
#include "cmSystemTools.h"
#include <map>
#include <vector>
diff --git a/Source/CPack/cmCPackNSISGenerator.h b/Source/CPack/cmCPackNSISGenerator.h
index c7b2ce1..ab8ece4 100644
--- a/Source/CPack/cmCPackNSISGenerator.h
+++ b/Source/CPack/cmCPackNSISGenerator.h
@@ -13,8 +13,8 @@
#ifndef cmCPackNSISGenerator_h
#define cmCPackNSISGenerator_h
-
#include "cmCPackGenerator.h"
+
#include <set>
/** \class cmCPackNSISGenerator
diff --git a/Source/CPack/cmCPackOSXX11Generator.cxx b/Source/CPack/cmCPackOSXX11Generator.cxx
index 8940f54..cde08b1 100644
--- a/Source/CPack/cmCPackOSXX11Generator.cxx
+++ b/Source/CPack/cmCPackOSXX11Generator.cxx
@@ -9,6 +9,7 @@
implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the License for more information.
============================================================================*/
+
#include "cmCPackOSXX11Generator.h"
#include "cmake.h"
diff --git a/Source/CPack/cmCPackPackageMakerGenerator.h b/Source/CPack/cmCPackPackageMakerGenerator.h
index 7d349c6..4e8ff03 100644
--- a/Source/CPack/cmCPackPackageMakerGenerator.h
+++ b/Source/CPack/cmCPackPackageMakerGenerator.h
@@ -13,7 +13,6 @@
#ifndef cmCPackPackageMakerGenerator_h
#define cmCPackPackageMakerGenerator_h
-
#include "cmCPackGenerator.h"
class cmCPackComponent;
diff --git a/Source/CPack/cmCPackRPMGenerator.cxx b/Source/CPack/cmCPackRPMGenerator.cxx
index 71ab3a0..706f43a 100644
--- a/Source/CPack/cmCPackRPMGenerator.cxx
+++ b/Source/CPack/cmCPackRPMGenerator.cxx
@@ -10,6 +10,7 @@
See the License for more information.
============================================================================*/
#include "cmCPackRPMGenerator.h"
+
#include "cmCPackLog.h"
#include "cmSystemTools.h"
diff --git a/Source/CPack/cmCPackRPMGenerator.h b/Source/CPack/cmCPackRPMGenerator.h
index a7722bc..a4a1ba8 100644
--- a/Source/CPack/cmCPackRPMGenerator.h
+++ b/Source/CPack/cmCPackRPMGenerator.h
@@ -13,7 +13,6 @@
#ifndef cmCPackRPMGenerator_h
#define cmCPackRPMGenerator_h
-
#include "cmCPackGenerator.h"
/** \class cmCPackRPMGenerator
diff --git a/Source/CPack/cmCPackSTGZGenerator.h b/Source/CPack/cmCPackSTGZGenerator.h
index ccceec8..08152b5 100644
--- a/Source/CPack/cmCPackSTGZGenerator.h
+++ b/Source/CPack/cmCPackSTGZGenerator.h
@@ -13,7 +13,6 @@
#ifndef cmCPackSTGZGenerator_h
#define cmCPackSTGZGenerator_h
-
#include "cmCPackTGZGenerator.h"
/** \class cmCPackSTGZGenerator
diff --git a/Source/CPack/cmCPackTarBZip2Generator.cxx b/Source/CPack/cmCPackTarBZip2Generator.cxx
index 9ff588b..da16737 100644
--- a/Source/CPack/cmCPackTarBZip2Generator.cxx
+++ b/Source/CPack/cmCPackTarBZip2Generator.cxx
@@ -11,6 +11,7 @@
============================================================================*/
#include "cmCPackTarBZip2Generator.h"
+
//----------------------------------------------------------------------
cmCPackTarBZip2Generator::cmCPackTarBZip2Generator()
:cmCPackArchiveGenerator(cmArchiveWrite::CompressBZip2,
diff --git a/Source/CTest/cmCTestBatchTestHandler.cxx b/Source/CTest/cmCTestBatchTestHandler.cxx
index d62c260..e462d4a 100644
--- a/Source/CTest/cmCTestBatchTestHandler.cxx
+++ b/Source/CTest/cmCTestBatchTestHandler.cxx
@@ -11,6 +11,7 @@
============================================================================*/
#include "cmCTestBatchTestHandler.h"
+
#include "cmProcess.h"
#include "cmStandardIncludes.h"
#include "cmCTest.h"
diff --git a/Source/CTest/cmCTestBatchTestHandler.h b/Source/CTest/cmCTestBatchTestHandler.h
index e0c6e48..5ff0025 100644
--- a/Source/CTest/cmCTestBatchTestHandler.h
+++ b/Source/CTest/cmCTestBatchTestHandler.h
@@ -14,6 +14,7 @@
#define cmCTestBatchTestHandler_h
#include <cmStandardIncludes.h>
+
#include <cmCTestTestHandler.h>
#include <cmCTestMultiProcessHandler.h>
#include <cmCTestRunTest.h>
diff --git a/Source/CTest/cmCTestBuildHandler.h b/Source/CTest/cmCTestBuildHandler.h
index 2e9b92a..9231170 100644
--- a/Source/CTest/cmCTestBuildHandler.h
+++ b/Source/CTest/cmCTestBuildHandler.h
@@ -13,8 +13,8 @@
#ifndef cmCTestBuildHandler_h
#define cmCTestBuildHandler_h
-
#include "cmCTestGenericHandler.h"
+
#include "cmListFileCache.h"
#include <cmsys/RegularExpression.hxx>
diff --git a/Source/CTest/cmCTestConfigureHandler.h b/Source/CTest/cmCTestConfigureHandler.h
index d880bd7..4c1a96b 100644
--- a/Source/CTest/cmCTestConfigureHandler.h
+++ b/Source/CTest/cmCTestConfigureHandler.h
@@ -13,8 +13,8 @@
#ifndef cmCTestConfigureHandler_h
#define cmCTestConfigureHandler_h
-
#include "cmCTestGenericHandler.h"
+
#include "cmListFileCache.h"
/** \class cmCTestConfigureHandler
diff --git a/Source/CTest/cmCTestCoverageHandler.cxx b/Source/CTest/cmCTestCoverageHandler.cxx
index fd62696..b05496a 100644
--- a/Source/CTest/cmCTestCoverageHandler.cxx
+++ b/Source/CTest/cmCTestCoverageHandler.cxx
@@ -10,6 +10,7 @@
See the License for more information.
============================================================================*/
#include "cmCTestCoverageHandler.h"
+
#include "cmParsePHPCoverage.h"
#include "cmParseCoberturaCoverage.h"
#include "cmParseGTMCoverage.h"
diff --git a/Source/CTest/cmCTestCoverageHandler.h b/Source/CTest/cmCTestCoverageHandler.h
index 7102d1e..c91a2d7 100644
--- a/Source/CTest/cmCTestCoverageHandler.h
+++ b/Source/CTest/cmCTestCoverageHandler.h
@@ -13,8 +13,8 @@
#ifndef cmCTestCoverageHandler_h
#define cmCTestCoverageHandler_h
-
#include "cmCTestGenericHandler.h"
+
#include "cmListFileCache.h"
#include <cmsys/RegularExpression.hxx>
diff --git a/Source/CTest/cmCTestGenericHandler.cxx b/Source/CTest/cmCTestGenericHandler.cxx
index ad79ba2..7eccb9c 100644
--- a/Source/CTest/cmCTestGenericHandler.cxx
+++ b/Source/CTest/cmCTestGenericHandler.cxx
@@ -11,6 +11,7 @@
============================================================================*/
#include "cmCTestGenericHandler.h"
+
#include "cmSystemTools.h"
#include "cmCTest.h"
diff --git a/Source/CTest/cmCTestGenericHandler.h b/Source/CTest/cmCTestGenericHandler.h
index 4b7ae79..7a7e034 100644
--- a/Source/CTest/cmCTestGenericHandler.h
+++ b/Source/CTest/cmCTestGenericHandler.h
@@ -13,8 +13,8 @@
#ifndef cmCTestGenericHandler_h
#define cmCTestGenericHandler_h
-
#include "cmObject.h"
+
#include "cmCTest.h"
#include "cmSystemTools.h" //OutputOption
diff --git a/Source/CTest/cmCTestLaunch.h b/Source/CTest/cmCTestLaunch.h
index b13e484..1a908a3 100644
--- a/Source/CTest/cmCTestLaunch.h
+++ b/Source/CTest/cmCTestLaunch.h
@@ -13,6 +13,7 @@
#define cmCTestLaunch_h
#include "cmStandardIncludes.h"
+
#include <cmsys/RegularExpression.hxx>
class cmXMLWriter;
diff --git a/Source/CTest/cmCTestMemCheckHandler.cxx b/Source/CTest/cmCTestMemCheckHandler.cxx
index acf527a..3d0f16a 100644
--- a/Source/CTest/cmCTestMemCheckHandler.cxx
+++ b/Source/CTest/cmCTestMemCheckHandler.cxx
@@ -11,6 +11,7 @@
============================================================================*/
#include "cmCTestMemCheckHandler.h"
+
#include "cmXMLParser.h"
#include "cmCTest.h"
#include "cmake.h"
diff --git a/Source/CTest/cmCTestMemCheckHandler.h b/Source/CTest/cmCTestMemCheckHandler.h
index f1ac794..01311b6 100644
--- a/Source/CTest/cmCTestMemCheckHandler.h
+++ b/Source/CTest/cmCTestMemCheckHandler.h
@@ -13,9 +13,8 @@
#ifndef cmCTestMemCheckHandler_h
#define cmCTestMemCheckHandler_h
-
#include "cmCTestTestHandler.h"
-#include "cmStandardIncludes.h"
+
#include "cmListFileCache.h"
#include <vector>
#include <string>
diff --git a/Source/CTest/cmCTestMultiProcessHandler.cxx b/Source/CTest/cmCTestMultiProcessHandler.cxx
index 7c7f5df..df6aff1 100644
--- a/Source/CTest/cmCTestMultiProcessHandler.cxx
+++ b/Source/CTest/cmCTestMultiProcessHandler.cxx
@@ -10,6 +10,7 @@
See the License for more information.
============================================================================*/
#include "cmCTestMultiProcessHandler.h"
+
#include "cmProcess.h"
#include "cmStandardIncludes.h"
#include "cmCTest.h"
diff --git a/Source/CTest/cmCTestMultiProcessHandler.h b/Source/CTest/cmCTestMultiProcessHandler.h
index ed3e155..64e56e6 100644
--- a/Source/CTest/cmCTestMultiProcessHandler.h
+++ b/Source/CTest/cmCTestMultiProcessHandler.h
@@ -12,8 +12,8 @@
#ifndef cmCTestMultiProcessHandler_h
#define cmCTestMultiProcessHandler_h
-#include <cmStandardIncludes.h>
#include <cmCTestTestHandler.h>
+
#include <cmCTestRunTest.h>
/** \class cmCTestMultiProcessHandler
diff --git a/Source/CTest/cmCTestP4.h b/Source/CTest/cmCTestP4.h
index 7a53475..6f907d1 100644
--- a/Source/CTest/cmCTestP4.h
+++ b/Source/CTest/cmCTestP4.h
@@ -13,6 +13,7 @@
#define cmCTestP4_h
#include "cmCTestGlobalVC.h"
+
#include <vector>
#include <map>
diff --git a/Source/CTest/cmCTestReadCustomFilesCommand.cxx b/Source/CTest/cmCTestReadCustomFilesCommand.cxx
index 3b9d552..5db01f9 100644
--- a/Source/CTest/cmCTestReadCustomFilesCommand.cxx
+++ b/Source/CTest/cmCTestReadCustomFilesCommand.cxx
@@ -10,6 +10,7 @@
See the License for more information.
============================================================================*/
#include "cmCTestReadCustomFilesCommand.h"
+
#include "cmCTest.h"
bool cmCTestReadCustomFilesCommand
diff --git a/Source/CTest/cmCTestRunTest.cxx b/Source/CTest/cmCTestRunTest.cxx
index f329e77..34ad2d0 100644
--- a/Source/CTest/cmCTestRunTest.cxx
+++ b/Source/CTest/cmCTestRunTest.cxx
@@ -11,6 +11,7 @@
============================================================================*/
#include "cmCTestRunTest.h"
+
#include "cmCTestMemCheckHandler.h"
#include "cmCTest.h"
#include "cmSystemTools.h"
diff --git a/Source/CTest/cmCTestRunTest.h b/Source/CTest/cmCTestRunTest.h
index 3b5c831..5f3467a 100644
--- a/Source/CTest/cmCTestRunTest.h
+++ b/Source/CTest/cmCTestRunTest.h
@@ -12,8 +12,8 @@
#ifndef cmCTestRunTest_h
#define cmCTestRunTest_h
-#include <cmStandardIncludes.h>
#include <cmCTestTestHandler.h>
+
#include <cmProcess.h>
/** \class cmRunTest
diff --git a/Source/CTest/cmCTestScriptHandler.h b/Source/CTest/cmCTestScriptHandler.h
index c9d0b6a..2b66f70 100644
--- a/Source/CTest/cmCTestScriptHandler.h
+++ b/Source/CTest/cmCTestScriptHandler.h
@@ -13,8 +13,8 @@
#ifndef cmCTestScriptHandler_h
#define cmCTestScriptHandler_h
-
#include "cmCTestGenericHandler.h"
+
#include "cmListFileCache.h"
class cmMakefile;
diff --git a/Source/CTest/cmCTestSubmitCommand.h b/Source/CTest/cmCTestSubmitCommand.h
index 19e8eaf..ebc8c36 100644
--- a/Source/CTest/cmCTestSubmitCommand.h
+++ b/Source/CTest/cmCTestSubmitCommand.h
@@ -13,6 +13,7 @@
#define cmCTestSubmitCommand_h
#include "cmCTestHandlerCommand.h"
+
#include "cmCTest.h"
/** \class cmCTestSubmit
diff --git a/Source/CTest/cmCTestSubmitHandler.cxx b/Source/CTest/cmCTestSubmitHandler.cxx
index 833cad6..3b682e3 100644
--- a/Source/CTest/cmCTestSubmitHandler.cxx
+++ b/Source/CTest/cmCTestSubmitHandler.cxx
@@ -10,6 +10,7 @@
See the License for more information.
============================================================================*/
#include "cmCTestSubmitHandler.h"
+
#include "cmCTestScriptHandler.h"
#include "cmake.h"
#include "cmSystemTools.h"
diff --git a/Source/CTest/cmCTestTestHandler.cxx b/Source/CTest/cmCTestTestHandler.cxx
index 59ed98e..f91fa5f 100644
--- a/Source/CTest/cmCTestTestHandler.cxx
+++ b/Source/CTest/cmCTestTestHandler.cxx
@@ -11,6 +11,7 @@
============================================================================*/
#include "cmCTestTestHandler.h"
+
#include "cmCTestMultiProcessHandler.h"
#include "cmCTestBatchTestHandler.h"
#include "cmCTest.h"
diff --git a/Source/CTest/cmCTestTestHandler.h b/Source/CTest/cmCTestTestHandler.h
index d12c2b6..28338dd 100644
--- a/Source/CTest/cmCTestTestHandler.h
+++ b/Source/CTest/cmCTestTestHandler.h
@@ -13,8 +13,8 @@
#ifndef cmCTestTestHandler_h
#define cmCTestTestHandler_h
-
#include "cmCTestGenericHandler.h"
+
#include <cmsys/RegularExpression.hxx>
class cmMakefile;
diff --git a/Source/CTest/cmCTestUpdateHandler.h b/Source/CTest/cmCTestUpdateHandler.h
index d2423c0..463703c 100644
--- a/Source/CTest/cmCTestUpdateHandler.h
+++ b/Source/CTest/cmCTestUpdateHandler.h
@@ -13,8 +13,8 @@
#ifndef cmCTestUpdateHandler_h
#define cmCTestUpdateHandler_h
-
#include "cmCTestGenericHandler.h"
+
#include "cmListFileCache.h"
/** \class cmCTestUpdateHandler
diff --git a/Source/CTest/cmCTestUploadCommand.h b/Source/CTest/cmCTestUploadCommand.h
index 4a07608..1802254 100644
--- a/Source/CTest/cmCTestUploadCommand.h
+++ b/Source/CTest/cmCTestUploadCommand.h
@@ -13,6 +13,7 @@
#define cmCTestUploadCommand_h
#include "cmCTestHandlerCommand.h"
+
#include "cmCTest.h"
/** \class cmCTestUpload
diff --git a/Source/CTest/cmParseBlanketJSCoverage.cxx b/Source/CTest/cmParseBlanketJSCoverage.cxx
index 1edd01f..26dd425 100644
--- a/Source/CTest/cmParseBlanketJSCoverage.cxx
+++ b/Source/CTest/cmParseBlanketJSCoverage.cxx
@@ -9,11 +9,11 @@
implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the License for more information.
============================================================================*/
-#include "cmStandardIncludes.h"
+#include "cmParseBlanketJSCoverage.h"
+
#include <stdio.h>
#include <stdlib.h>
#include "cmSystemTools.h"
-#include "cmParseBlanketJSCoverage.h"
#include <cmsys/Directory.hxx>
#include <cmsys/Glob.hxx>
#include <cmsys/FStream.hxx>
diff --git a/Source/CTest/cmParseBlanketJSCoverage.h b/Source/CTest/cmParseBlanketJSCoverage.h
index fc1d477..d34492d 100644
--- a/Source/CTest/cmParseBlanketJSCoverage.h
+++ b/Source/CTest/cmParseBlanketJSCoverage.h
@@ -13,7 +13,6 @@
#ifndef cmParseBlanketJSCoverage_h
#define cmParseBlanketJSCoverage_h
-#include "cmStandardIncludes.h"
#include "cmCTestCoverageHandler.h"
diff --git a/Source/CTest/cmParseCacheCoverage.cxx b/Source/CTest/cmParseCacheCoverage.cxx
index 92bf88e..38e0ac2 100644
--- a/Source/CTest/cmParseCacheCoverage.cxx
+++ b/Source/CTest/cmParseCacheCoverage.cxx
@@ -1,8 +1,8 @@
-#include "cmStandardIncludes.h"
+#include "cmParseCacheCoverage.h"
+
#include <stdio.h>
#include <stdlib.h>
#include "cmSystemTools.h"
-#include "cmParseCacheCoverage.h"
#include <cmsys/Directory.hxx>
#include <cmsys/Glob.hxx>
#include <cmsys/FStream.hxx>
diff --git a/Source/CTest/cmParseCoberturaCoverage.cxx b/Source/CTest/cmParseCoberturaCoverage.cxx
index 515d041..5b4a376 100644
--- a/Source/CTest/cmParseCoberturaCoverage.cxx
+++ b/Source/CTest/cmParseCoberturaCoverage.cxx
@@ -1,7 +1,7 @@
-#include "cmStandardIncludes.h"
+#include "cmParseCoberturaCoverage.h"
+
#include "cmSystemTools.h"
#include "cmXMLParser.h"
-#include "cmParseCoberturaCoverage.h"
#include <cmsys/Directory.hxx>
#include <cmsys/FStream.hxx>
diff --git a/Source/CTest/cmParseCoberturaCoverage.h b/Source/CTest/cmParseCoberturaCoverage.h
index ff5954d..c3e3ec9 100644
--- a/Source/CTest/cmParseCoberturaCoverage.h
+++ b/Source/CTest/cmParseCoberturaCoverage.h
@@ -13,7 +13,6 @@
#ifndef cmParseCoberturaCoverage_h
#define cmParseCoberturaCoverage_h
-#include "cmStandardIncludes.h"
#include "cmCTestCoverageHandler.h"
/** \class cmParsePythonCoverage
diff --git a/Source/CTest/cmParseDelphiCoverage.cxx b/Source/CTest/cmParseDelphiCoverage.cxx
index e453fe1..ed52626 100644
--- a/Source/CTest/cmParseDelphiCoverage.cxx
+++ b/Source/CTest/cmParseDelphiCoverage.cxx
@@ -1,9 +1,9 @@
-#include "cmStandardIncludes.h"
+#include "cmParseDelphiCoverage.h"
+
#include <stdio.h>
#include <stdlib.h>
#include "cmSystemTools.h"
#include "cmXMLParser.h"
-#include "cmParseDelphiCoverage.h"
#include <cmsys/Directory.hxx>
#include <cmsys/Glob.hxx>
#include <cmsys/FStream.hxx>
diff --git a/Source/CTest/cmParseDelphiCoverage.h b/Source/CTest/cmParseDelphiCoverage.h
index 018340b..2c3f3b3 100644
--- a/Source/CTest/cmParseDelphiCoverage.h
+++ b/Source/CTest/cmParseDelphiCoverage.h
@@ -13,7 +13,6 @@
#ifndef cmParseDelphiCoverage_h
#define cmParseDelphiCoverage_h
-#include "cmStandardIncludes.h"
#include "cmCTestCoverageHandler.h"
diff --git a/Source/CTest/cmParseGTMCoverage.cxx b/Source/CTest/cmParseGTMCoverage.cxx
index f3f8008..5692246 100644
--- a/Source/CTest/cmParseGTMCoverage.cxx
+++ b/Source/CTest/cmParseGTMCoverage.cxx
@@ -1,8 +1,8 @@
-#include "cmStandardIncludes.h"
+#include "cmParseGTMCoverage.h"
+
#include <stdio.h>
#include <stdlib.h>
#include "cmSystemTools.h"
-#include "cmParseGTMCoverage.h"
#include <cmsys/Directory.hxx>
#include <cmsys/Glob.hxx>
#include <cmsys/FStream.hxx>
diff --git a/Source/CTest/cmParseJacocoCoverage.cxx b/Source/CTest/cmParseJacocoCoverage.cxx
index 47e3b32..f5386c9 100644
--- a/Source/CTest/cmParseJacocoCoverage.cxx
+++ b/Source/CTest/cmParseJacocoCoverage.cxx
@@ -1,9 +1,9 @@
-#include "cmStandardIncludes.h"
+#include "cmParseJacocoCoverage.h"
+
#include <stdio.h>
#include <stdlib.h>
#include "cmSystemTools.h"
#include "cmXMLParser.h"
-#include "cmParseJacocoCoverage.h"
#include <cmsys/Directory.hxx>
#include <cmsys/Glob.hxx>
#include <cmsys/FStream.hxx>
diff --git a/Source/CTest/cmParseJacocoCoverage.h b/Source/CTest/cmParseJacocoCoverage.h
index dad05a3..cf86508 100644
--- a/Source/CTest/cmParseJacocoCoverage.h
+++ b/Source/CTest/cmParseJacocoCoverage.h
@@ -13,7 +13,6 @@
#ifndef cmParseJacocoCoverage_h
#define cmParseJacocoCoverage_h
-#include "cmStandardIncludes.h"
#include "cmCTestCoverageHandler.h"
diff --git a/Source/CTest/cmParseMumpsCoverage.cxx b/Source/CTest/cmParseMumpsCoverage.cxx
index 225e704..6567906 100644
--- a/Source/CTest/cmParseMumpsCoverage.cxx
+++ b/Source/CTest/cmParseMumpsCoverage.cxx
@@ -1,8 +1,8 @@
-#include "cmStandardIncludes.h"
+#include "cmParseGTMCoverage.h"
+
#include <stdio.h>
#include <stdlib.h>
#include "cmSystemTools.h"
-#include "cmParseGTMCoverage.h"
#include <cmsys/Directory.hxx>
#include <cmsys/Glob.hxx>
#include <cmsys/FStream.hxx>
diff --git a/Source/CTest/cmParseMumpsCoverage.h b/Source/CTest/cmParseMumpsCoverage.h
index bc71891..ab957b8 100644
--- a/Source/CTest/cmParseMumpsCoverage.h
+++ b/Source/CTest/cmParseMumpsCoverage.h
@@ -13,7 +13,6 @@
#ifndef cmParseMumpsCoverage_h
#define cmParseMumpsCoverage_h
-#include "cmStandardIncludes.h"
#include "cmCTestCoverageHandler.h"
/** \class cmParseMumpsCoverage
diff --git a/Source/CTest/cmParsePHPCoverage.cxx b/Source/CTest/cmParsePHPCoverage.cxx
index c7f5a68..7c2901e 100644
--- a/Source/CTest/cmParsePHPCoverage.cxx
+++ b/Source/CTest/cmParsePHPCoverage.cxx
@@ -1,6 +1,6 @@
-#include "cmStandardIncludes.h"
-#include "cmSystemTools.h"
#include "cmParsePHPCoverage.h"
+
+#include "cmSystemTools.h"
#include <cmsys/Directory.hxx>
#include <cmsys/FStream.hxx>
diff --git a/Source/CTest/cmParsePHPCoverage.h b/Source/CTest/cmParsePHPCoverage.h
index 92a7634..706d036 100644
--- a/Source/CTest/cmParsePHPCoverage.h
+++ b/Source/CTest/cmParsePHPCoverage.h
@@ -13,7 +13,6 @@
#ifndef cmParsePHPCoverage_h
#define cmParsePHPCoverage_h
-#include "cmStandardIncludes.h"
#include "cmCTestCoverageHandler.h"
/** \class cmParsePHPCoverage
diff --git a/Source/CTest/cmProcess.cxx b/Source/CTest/cmProcess.cxx
index 6441886..c9a4618 100644
--- a/Source/CTest/cmProcess.cxx
+++ b/Source/CTest/cmProcess.cxx
@@ -11,6 +11,7 @@
============================================================================*/
#include <cmProcess.h>
+
#include <cmSystemTools.h>
cmProcess::cmProcess()
diff --git a/Source/CTest/cmProcess.h b/Source/CTest/cmProcess.h
index c9fd859..326456e 100644
--- a/Source/CTest/cmProcess.h
+++ b/Source/CTest/cmProcess.h
@@ -12,8 +12,8 @@
#ifndef cmProcess_h
#define cmProcess_h
-
#include "cmStandardIncludes.h"
+
#include <cmsys/Process.h>
diff --git a/Source/CursesDialog/ccmake.cxx b/Source/CursesDialog/ccmake.cxx
index 5236e57..7bff0f0 100644
--- a/Source/CursesDialog/ccmake.cxx
+++ b/Source/CursesDialog/ccmake.cxx
@@ -9,6 +9,8 @@
implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the License for more information.
============================================================================*/
+#include "cmCursesStandardIncludes.h"
+
#include "../cmSystemTools.h"
#include "../cmake.h"
#include "../cmDocumentation.h"
@@ -17,7 +19,6 @@
#include <sys/ioctl.h>
#include "cmCursesMainForm.h"
-#include "cmCursesStandardIncludes.h"
#include <cmsys/Encoding.hxx>
#include <form.h>
diff --git a/Source/CursesDialog/cmCursesBoolWidget.cxx b/Source/CursesDialog/cmCursesBoolWidget.cxx
index 29d9cb2..0529b78 100644
--- a/Source/CursesDialog/cmCursesBoolWidget.cxx
+++ b/Source/CursesDialog/cmCursesBoolWidget.cxx
@@ -10,6 +10,7 @@
See the License for more information.
============================================================================*/
#include "cmCursesBoolWidget.h"
+
#include "cmCursesMainForm.h"
cmCursesBoolWidget::cmCursesBoolWidget(int width, int height,
diff --git a/Source/CursesDialog/cmCursesBoolWidget.h b/Source/CursesDialog/cmCursesBoolWidget.h
index 8a57c73..65a8ddb 100644
--- a/Source/CursesDialog/cmCursesBoolWidget.h
+++ b/Source/CursesDialog/cmCursesBoolWidget.h
@@ -13,6 +13,7 @@
#define cmCursesBoolWidget_h
#include "cmCursesWidget.h"
+
class cmCursesMainForm;
class cmCursesBoolWidget : public cmCursesWidget
diff --git a/Source/CursesDialog/cmCursesCacheEntryComposite.cxx b/Source/CursesDialog/cmCursesCacheEntryComposite.cxx
index 7e09242..ace5c43 100644
--- a/Source/CursesDialog/cmCursesCacheEntryComposite.cxx
+++ b/Source/CursesDialog/cmCursesCacheEntryComposite.cxx
@@ -10,6 +10,7 @@
See the License for more information.
============================================================================*/
#include "cmCursesCacheEntryComposite.h"
+
#include "cmCursesOptionsWidget.h"
#include "cmCursesStringWidget.h"
#include "cmCursesLabelWidget.h"
diff --git a/Source/CursesDialog/cmCursesForm.h b/Source/CursesDialog/cmCursesForm.h
index 9837f5a..2c45494 100644
--- a/Source/CursesDialog/cmCursesForm.h
+++ b/Source/CursesDialog/cmCursesForm.h
@@ -12,8 +12,8 @@
#ifndef cmCursesForm_h
#define cmCursesForm_h
-#include "../cmStandardIncludes.h"
#include "cmCursesStandardIncludes.h"
+
#include <cmsys/FStream.hxx>
class cmCursesForm
diff --git a/Source/CursesDialog/cmCursesLabelWidget.h b/Source/CursesDialog/cmCursesLabelWidget.h
index 98170f5..c31a58c 100644
--- a/Source/CursesDialog/cmCursesLabelWidget.h
+++ b/Source/CursesDialog/cmCursesLabelWidget.h
@@ -13,7 +13,6 @@
#define cmCursesLabelWidget_h
#include "cmCursesWidget.h"
-#include "cmCursesStandardIncludes.h"
class cmCursesMainForm;
diff --git a/Source/CursesDialog/cmCursesLongMessageForm.cxx b/Source/CursesDialog/cmCursesLongMessageForm.cxx
index 6144ddc..cd8f3f1 100644
--- a/Source/CursesDialog/cmCursesLongMessageForm.cxx
+++ b/Source/CursesDialog/cmCursesLongMessageForm.cxx
@@ -9,10 +9,11 @@
implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the License for more information.
============================================================================*/
+#include "cmCursesLongMessageForm.h"
+
#include "../cmSystemTools.h"
#include "../cmake.h"
#include "../cmVersion.h"
-#include "cmCursesLongMessageForm.h"
#include "cmCursesMainForm.h"
inline int ctrl(int z)
diff --git a/Source/CursesDialog/cmCursesLongMessageForm.h b/Source/CursesDialog/cmCursesLongMessageForm.h
index 6e37eea..e9bd542 100644
--- a/Source/CursesDialog/cmCursesLongMessageForm.h
+++ b/Source/CursesDialog/cmCursesLongMessageForm.h
@@ -12,10 +12,10 @@
#ifndef cmCursesLongMessageForm_h
#define cmCursesLongMessageForm_h
-#include "../cmStandardIncludes.h"
-#include "cmCursesForm.h"
#include "cmCursesStandardIncludes.h"
+#include "cmCursesForm.h"
+
class cmCursesCacheEntryComposite;
class cmCursesLongMessageForm : public cmCursesForm
diff --git a/Source/CursesDialog/cmCursesMainForm.cxx b/Source/CursesDialog/cmCursesMainForm.cxx
index a2fc2c0..8c2a8b4 100644
--- a/Source/CursesDialog/cmCursesMainForm.cxx
+++ b/Source/CursesDialog/cmCursesMainForm.cxx
@@ -9,10 +9,11 @@
implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the License for more information.
============================================================================*/
+#include "cmCursesMainForm.h"
+
#include "../cmSystemTools.h"
#include "../cmVersion.h"
#include "../cmake.h"
-#include "cmCursesMainForm.h"
#include "cmCursesStringWidget.h"
#include "cmCursesLabelWidget.h"
#include "cmCursesBoolWidget.h"
diff --git a/Source/CursesDialog/cmCursesMainForm.h b/Source/CursesDialog/cmCursesMainForm.h
index d194168..9a80ba2 100644
--- a/Source/CursesDialog/cmCursesMainForm.h
+++ b/Source/CursesDialog/cmCursesMainForm.h
@@ -12,10 +12,10 @@
#ifndef cmCursesMainForm_h
#define cmCursesMainForm_h
-#include "../cmStandardIncludes.h"
+#include "cmCursesStandardIncludes.h"
+
#include "../cmState.h"
#include "cmCursesForm.h"
-#include "cmCursesStandardIncludes.h"
class cmCursesCacheEntryComposite;
class cmCursesWidget;
diff --git a/Source/CursesDialog/cmCursesOptionsWidget.cxx b/Source/CursesDialog/cmCursesOptionsWidget.cxx
index 30110a4..05aeab1 100644
--- a/Source/CursesDialog/cmCursesOptionsWidget.cxx
+++ b/Source/CursesDialog/cmCursesOptionsWidget.cxx
@@ -10,6 +10,7 @@
See the License for more information.
============================================================================*/
#include "cmCursesOptionsWidget.h"
+
#include "cmCursesMainForm.h"
inline int ctrl(int z)
diff --git a/Source/CursesDialog/cmCursesOptionsWidget.h b/Source/CursesDialog/cmCursesOptionsWidget.h
index 324014e..ba359d3 100644
--- a/Source/CursesDialog/cmCursesOptionsWidget.h
+++ b/Source/CursesDialog/cmCursesOptionsWidget.h
@@ -13,6 +13,7 @@
#define cmCursesOptionsWidget_h
#include "cmCursesWidget.h"
+
class cmCursesMainForm;
class cmCursesOptionsWidget : public cmCursesWidget
diff --git a/Source/CursesDialog/cmCursesStandardIncludes.h b/Source/CursesDialog/cmCursesStandardIncludes.h
index 6047ec5..69a05b2 100644
--- a/Source/CursesDialog/cmCursesStandardIncludes.h
+++ b/Source/CursesDialog/cmCursesStandardIncludes.h
@@ -11,6 +11,9 @@
============================================================================*/
#ifndef cmCursesStandardIncludes_h
#define cmCursesStandardIncludes_h
+
+#include "../cmStandardIncludes.h"
+
#if defined(__sun__) && defined(__GNUC__)
#define _MSE_INT_H
#endif
diff --git a/Source/CursesDialog/cmCursesStringWidget.cxx b/Source/CursesDialog/cmCursesStringWidget.cxx
index 1c832dd..6bd7b45 100644
--- a/Source/CursesDialog/cmCursesStringWidget.cxx
+++ b/Source/CursesDialog/cmCursesStringWidget.cxx
@@ -10,6 +10,7 @@
See the License for more information.
============================================================================*/
#include "cmCursesStringWidget.h"
+
#include "cmCursesMainForm.h"
inline int ctrl(int z)
diff --git a/Source/CursesDialog/cmCursesWidget.h b/Source/CursesDialog/cmCursesWidget.h
index 7bbdff1..1f53786 100644
--- a/Source/CursesDialog/cmCursesWidget.h
+++ b/Source/CursesDialog/cmCursesWidget.h
@@ -12,9 +12,10 @@
#ifndef cmCursesWidget_h
#define cmCursesWidget_h
-#include "../cmState.h"
#include "cmCursesStandardIncludes.h"
+#include "../cmState.h"
+
class cmCursesMainForm;
class cmCursesWidget
diff --git a/Source/QtDialog/AddCacheEntry.cxx b/Source/QtDialog/AddCacheEntry.cxx
index 3881045..b575f75 100644
--- a/Source/QtDialog/AddCacheEntry.cxx
+++ b/Source/QtDialog/AddCacheEntry.cxx
@@ -11,6 +11,7 @@
============================================================================*/
#include "AddCacheEntry.h"
+
#include <QMetaProperty>
#include <QCompleter>
diff --git a/Source/QtDialog/AddCacheEntry.h b/Source/QtDialog/AddCacheEntry.h
index 38c3a74..c327915 100644
--- a/Source/QtDialog/AddCacheEntry.h
+++ b/Source/QtDialog/AddCacheEntry.h
@@ -13,11 +13,12 @@
#ifndef AddCacheEntry_h
#define AddCacheEntry_h
+#include "QCMake.h"
+
#include <QWidget>
#include <QCheckBox>
#include <QStringList>
-#include "QCMake.h"
#include "ui_AddCacheEntry.h"
class AddCacheEntry : public QWidget, public Ui::AddCacheEntry
diff --git a/Source/QtDialog/CMakeSetup.cxx b/Source/QtDialog/CMakeSetup.cxx
index cff4f6f..72adb8d 100644
--- a/Source/QtDialog/CMakeSetup.cxx
+++ b/Source/QtDialog/CMakeSetup.cxx
@@ -10,6 +10,7 @@
See the License for more information.
============================================================================*/
#include "QCMake.h" // include to disable MS warnings
+
#include <QApplication>
#include <QDir>
#include <QTranslator>
diff --git a/Source/QtDialog/CMakeSetupDialog.cxx b/Source/QtDialog/CMakeSetupDialog.cxx
index 2fc4faf..f25f402 100644
--- a/Source/QtDialog/CMakeSetupDialog.cxx
+++ b/Source/QtDialog/CMakeSetupDialog.cxx
@@ -11,6 +11,7 @@
============================================================================*/
#include "CMakeSetupDialog.h"
+
#include <QFileDialog>
#include <QProgressBar>
#include <QMessageBox>
diff --git a/Source/QtDialog/CMakeSetupDialog.h b/Source/QtDialog/CMakeSetupDialog.h
index 4b53b1c..eaac61c 100644
--- a/Source/QtDialog/CMakeSetupDialog.h
+++ b/Source/QtDialog/CMakeSetupDialog.h
@@ -14,6 +14,7 @@
#define CMakeSetupDialog_h
#include "QCMake.h"
+
#include <QMainWindow>
#include <QThread>
#include <QEventLoop>
diff --git a/Source/QtDialog/Compilers.h b/Source/QtDialog/Compilers.h
index 3f7b834..ee89886 100644
--- a/Source/QtDialog/Compilers.h
+++ b/Source/QtDialog/Compilers.h
@@ -4,6 +4,7 @@
#define COMPILERS_HPP
#include <QWidget>
+
#include <ui_Compilers.h>
class Compilers : public QWidget, public Ui::Compilers
diff --git a/Source/QtDialog/FirstConfigure.cxx b/Source/QtDialog/FirstConfigure.cxx
index 61aad72..64fe676 100644
--- a/Source/QtDialog/FirstConfigure.cxx
+++ b/Source/QtDialog/FirstConfigure.cxx
@@ -1,5 +1,6 @@
#include "FirstConfigure.h"
+
#include "Compilers.h"
#include <QSettings>
diff --git a/Source/QtDialog/FirstConfigure.h b/Source/QtDialog/FirstConfigure.h
index 09952b6..3c574d4 100644
--- a/Source/QtDialog/FirstConfigure.h
+++ b/Source/QtDialog/FirstConfigure.h
@@ -4,7 +4,9 @@
#include <QWizard>
#include <QWizardPage>
+
#include "cmake.h"
+
#include "ui_Compilers.h"
#include "ui_CrossCompiler.h"
diff --git a/Source/QtDialog/QCMake.h b/Source/QtDialog/QCMake.h
index 8942e7c..ca6f0f4 100644
--- a/Source/QtDialog/QCMake.h
+++ b/Source/QtDialog/QCMake.h
@@ -12,6 +12,9 @@
#ifndef QCMake_h
#define QCMake_h
+
+#include "cmake.h"
+
#ifdef _MSC_VER
#pragma warning ( disable : 4127 )
#pragma warning ( disable : 4512 )
@@ -27,8 +30,6 @@
#include <QMetaType>
#include <QAtomicInt>
-#include "cmake.h"
-
/// struct to represent cmake properties in Qt
/// Value is of type String or Bool
struct QCMakeProperty
diff --git a/Source/QtDialog/QCMakeCacheView.h b/Source/QtDialog/QCMakeCacheView.h
index 41f0bd8..5ac0966 100644
--- a/Source/QtDialog/QCMakeCacheView.h
+++ b/Source/QtDialog/QCMakeCacheView.h
@@ -14,6 +14,7 @@
#define QCMakeCacheView_h
#include "QCMake.h"
+
#include <QTreeView>
#include <QSet>
#include <QStandardItemModel>
diff --git a/Source/QtDialog/QCMakeWidgets.h b/Source/QtDialog/QCMakeWidgets.h
index 8f58df2..2207282 100644
--- a/Source/QtDialog/QCMakeWidgets.h
+++ b/Source/QtDialog/QCMakeWidgets.h
@@ -16,6 +16,7 @@
#include <QLineEdit>
#include <QComboBox>
#include <QCompleter>
+
class QToolButton;
// common widgets for Qt based CMake
diff --git a/Source/cmAddDependenciesCommand.cxx b/Source/cmAddDependenciesCommand.cxx
index 01e5253..3b28359 100644
--- a/Source/cmAddDependenciesCommand.cxx
+++ b/Source/cmAddDependenciesCommand.cxx
@@ -10,6 +10,7 @@
See the License for more information.
============================================================================*/
#include "cmAddDependenciesCommand.h"
+
#include "cmGlobalGenerator.h"
// cmDependenciesCommand
diff --git a/Source/cmAuxSourceDirectoryCommand.cxx b/Source/cmAuxSourceDirectoryCommand.cxx
index 92ac07d..07cb295 100644
--- a/Source/cmAuxSourceDirectoryCommand.cxx
+++ b/Source/cmAuxSourceDirectoryCommand.cxx
@@ -10,6 +10,7 @@
See the License for more information.
============================================================================*/
#include "cmAuxSourceDirectoryCommand.h"
+
#include "cmSourceFile.h"
#include <cmsys/Directory.hxx>
diff --git a/Source/cmCPluginAPI.cxx b/Source/cmCPluginAPI.cxx
index fb78446..b203a22 100644
--- a/Source/cmCPluginAPI.cxx
+++ b/Source/cmCPluginAPI.cxx
@@ -14,8 +14,9 @@
these routines just manipulate arguments and then call the associated
methods on the CMake classes. */
-#include "cmMakefile.h"
#include "cmCPluginAPI.h"
+
+#include "cmMakefile.h"
#include "cmVersion.h"
#include "cmSourceFile.h"
diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx
index f3e7121..4ba15ac 100644
--- a/Source/cmCTest.cxx
+++ b/Source/cmCTest.cxx
@@ -12,6 +12,7 @@
#include "cmCurl.h" // include before anything that includes windows.h
#include "cmCTest.h"
+
#include "cmake.h"
#include "cmMakefile.h"
#include "cmGlobalGenerator.h"
diff --git a/Source/cmCTest.h b/Source/cmCTest.h
index 73c2807..07081fc 100644
--- a/Source/cmCTest.h
+++ b/Source/cmCTest.h
@@ -14,6 +14,7 @@
#define cmCTest_h
#include "cmStandardIncludes.h"
+
#include "cmListFileCache.h"
#include <time.h>
diff --git a/Source/cmCacheManager.cxx b/Source/cmCacheManager.cxx
index 7466c29..2cda018 100644
--- a/Source/cmCacheManager.cxx
+++ b/Source/cmCacheManager.cxx
@@ -9,8 +9,8 @@
implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the License for more information.
============================================================================*/
-
#include "cmCacheManager.h"
+
#include "cmSystemTools.h"
#include "cmGeneratedFileStream.h"
#include "cmake.h"
diff --git a/Source/cmCacheManager.h b/Source/cmCacheManager.h
index 6f063eb..614ff69 100644
--- a/Source/cmCacheManager.h
+++ b/Source/cmCacheManager.h
@@ -13,6 +13,7 @@
#define cmCacheManager_h
#include "cmStandardIncludes.h"
+
#include "cmPropertyMap.h"
#include "cmState.h"
diff --git a/Source/cmCallVisualStudioMacro.cxx b/Source/cmCallVisualStudioMacro.cxx
index 0e04838..636a827 100644
--- a/Source/cmCallVisualStudioMacro.cxx
+++ b/Source/cmCallVisualStudioMacro.cxx
@@ -9,8 +9,8 @@
implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the License for more information.
============================================================================*/
-
#include "cmCallVisualStudioMacro.h"
+
#include "cmSystemTools.h"
diff --git a/Source/cmCommand.h b/Source/cmCommand.h
index 59bc396..d7f5c99 100644
--- a/Source/cmCommand.h
+++ b/Source/cmCommand.h
@@ -13,6 +13,7 @@
#define cmCommand_h
#include "cmObject.h"
+
#include "cmListFileCache.h"
#include "cmMakefile.h"
#include "cmCommandArgumentsHelper.h"
diff --git a/Source/cmCommands.h b/Source/cmCommands.h
index 7a94423..0786a64 100644
--- a/Source/cmCommands.h
+++ b/Source/cmCommands.h
@@ -11,6 +11,7 @@
============================================================================*/
#ifndef cmCommands_h
#define cmCommands_h
+
#include "cmStandardIncludes.h"
#include <vector>
diff --git a/Source/cmComputeLinkDepends.h b/Source/cmComputeLinkDepends.h
index f10e4e4..9b0bfaa 100644
--- a/Source/cmComputeLinkDepends.h
+++ b/Source/cmComputeLinkDepends.h
@@ -13,8 +13,8 @@
#define cmComputeLinkDepends_h
#include "cmStandardIncludes.h"
-#include "cmLinkItem.h"
+#include "cmLinkItem.h"
#include "cmGraphAdjacencyList.h"
#include <queue>
diff --git a/Source/cmConditionEvaluator.cxx b/Source/cmConditionEvaluator.cxx
index 07c9dd6..c43ec47 100644
--- a/Source/cmConditionEvaluator.cxx
+++ b/Source/cmConditionEvaluator.cxx
@@ -11,6 +11,7 @@
============================================================================*/
#include "cmConditionEvaluator.h"
+
#include "cmOutputConverter.h"
#include "cmAlgorithms.h"
diff --git a/Source/cmCoreTryCompile.cxx b/Source/cmCoreTryCompile.cxx
index cfd31b2..c38429f 100644
--- a/Source/cmCoreTryCompile.cxx
+++ b/Source/cmCoreTryCompile.cxx
@@ -10,6 +10,7 @@
See the License for more information.
============================================================================*/
#include "cmCoreTryCompile.h"
+
#include "cmake.h"
#include "cmOutputConverter.h"
#include "cmGlobalGenerator.h"
diff --git a/Source/cmCreateTestSourceList.cxx b/Source/cmCreateTestSourceList.cxx
index e670991..65eee34 100644
--- a/Source/cmCreateTestSourceList.cxx
+++ b/Source/cmCreateTestSourceList.cxx
@@ -10,6 +10,7 @@
See the License for more information.
============================================================================*/
#include "cmCreateTestSourceList.h"
+
#include "cmSourceFile.h"
// cmCreateTestSourceList
diff --git a/Source/cmCurl.cxx b/Source/cmCurl.cxx
index 4f3d890..35a68c0 100644
--- a/Source/cmCurl.cxx
+++ b/Source/cmCurl.cxx
@@ -10,6 +10,7 @@
See the License for more information.
============================================================================*/
#include "cmCurl.h"
+
#include "cmSystemTools.h"
// curl versions before 7.21.5 did not provide this error code
diff --git a/Source/cmCurl.h b/Source/cmCurl.h
index 0c5609c..2bc54cd 100644
--- a/Source/cmCurl.h
+++ b/Source/cmCurl.h
@@ -12,10 +12,10 @@
#ifndef cmCurl_h
#define cmCurl_h
-#include <cmsys/Configure.h>
-#include "cm_curl.h"
#include "cmStandardIncludes.h"
+#include "cm_curl.h"
+
std::string cmCurlSetCAInfo(::CURL *curl, const char* cafile = 0);
#endif
diff --git a/Source/cmCustomCommand.h b/Source/cmCustomCommand.h
index f9b38c3..0370497 100644
--- a/Source/cmCustomCommand.h
+++ b/Source/cmCustomCommand.h
@@ -13,6 +13,7 @@
#define cmCustomCommand_h
#include "cmStandardIncludes.h"
+
#include "cmListFileCache.h"
class cmMakefile;
diff --git a/Source/cmDefinePropertyCommand.cxx b/Source/cmDefinePropertyCommand.cxx
index 0efc7fc..0334948 100644
--- a/Source/cmDefinePropertyCommand.cxx
+++ b/Source/cmDefinePropertyCommand.cxx
@@ -10,6 +10,7 @@
See the License for more information.
============================================================================*/
#include "cmDefinePropertyCommand.h"
+
#include "cmake.h"
#include "cmState.h"
diff --git a/Source/cmDependsC.h b/Source/cmDependsC.h
index 07d3c21..cf0a423 100644
--- a/Source/cmDependsC.h
+++ b/Source/cmDependsC.h
@@ -13,6 +13,7 @@
#define cmDependsC_h
#include "cmDepends.h"
+
#include <cmsys/RegularExpression.hxx>
#include <queue>
diff --git a/Source/cmDocumentation.h b/Source/cmDocumentation.h
index b6c5fde..a1d73f5 100644
--- a/Source/cmDocumentation.h
+++ b/Source/cmDocumentation.h
@@ -13,6 +13,7 @@
#define _cmDocumentation_h
#include "cmStandardIncludes.h"
+
#include "cmDocumentationFormatter.h"
#include "cmDocumentationSection.h"
#include "cmake.h"
diff --git a/Source/cmDocumentationSection.h b/Source/cmDocumentationSection.h
index d796da8..66b94c2 100644
--- a/Source/cmDocumentationSection.h
+++ b/Source/cmDocumentationSection.h
@@ -12,7 +12,6 @@
#ifndef _cmDocumentationSection_h
#define _cmDocumentationSection_h
-#include "cmStandardIncludes.h"
#include "cmDocumentationFormatter.h"
// Low-level interface for custom documents:
diff --git a/Source/cmELF.cxx b/Source/cmELF.cxx
index b480cd5..8d8e396 100644
--- a/Source/cmELF.cxx
+++ b/Source/cmELF.cxx
@@ -10,6 +10,7 @@
See the License for more information.
============================================================================*/
#include "cmStandardIncludes.h" // to get CMAKE_USE_ELF_PARSER first
+
#include "cmELF.h"
#include <cmsys/auto_ptr.hxx>
diff --git a/Source/cmEndIfCommand.cxx b/Source/cmEndIfCommand.cxx
index 0ac09de..05f23c4 100644
--- a/Source/cmEndIfCommand.cxx
+++ b/Source/cmEndIfCommand.cxx
@@ -10,6 +10,7 @@
See the License for more information.
============================================================================*/
#include "cmEndIfCommand.h"
+
#include <stdlib.h> // required for atof
bool cmEndIfCommand::InitialPass(std::vector<std::string> const&,
cmExecutionStatus &)
diff --git a/Source/cmExecProgramCommand.cxx b/Source/cmExecProgramCommand.cxx
index 41785c2..1109737 100644
--- a/Source/cmExecProgramCommand.cxx
+++ b/Source/cmExecProgramCommand.cxx
@@ -10,6 +10,7 @@
See the License for more information.
============================================================================*/
#include "cmExecProgramCommand.h"
+
#include "cmSystemTools.h"
#include <cmsys/Process.h>
diff --git a/Source/cmExecuteProcessCommand.cxx b/Source/cmExecuteProcessCommand.cxx
index a371390..1731b91 100644
--- a/Source/cmExecuteProcessCommand.cxx
+++ b/Source/cmExecuteProcessCommand.cxx
@@ -10,6 +10,7 @@
See the License for more information.
============================================================================*/
#include "cmExecuteProcessCommand.h"
+
#include "cmSystemTools.h"
#include <cmsys/Process.h>
diff --git a/Source/cmExportCommand.cxx b/Source/cmExportCommand.cxx
index 4eec66a..94e1d92 100644
--- a/Source/cmExportCommand.cxx
+++ b/Source/cmExportCommand.cxx
@@ -10,6 +10,7 @@
See the License for more information.
============================================================================*/
#include "cmExportCommand.h"
+
#include "cmGlobalGenerator.h"
#include "cmGeneratedFileStream.h"
#include "cmake.h"
diff --git a/Source/cmExportLibraryDependenciesCommand.cxx b/Source/cmExportLibraryDependenciesCommand.cxx
index 21d961f..132df74 100644
--- a/Source/cmExportLibraryDependenciesCommand.cxx
+++ b/Source/cmExportLibraryDependenciesCommand.cxx
@@ -10,6 +10,7 @@
See the License for more information.
============================================================================*/
#include "cmExportLibraryDependenciesCommand.h"
+
#include "cmGlobalGenerator.h"
#include "cmGeneratedFileStream.h"
#include "cmake.h"
diff --git a/Source/cmExportSet.cxx b/Source/cmExportSet.cxx
index 0059b64..e7739fb 100644
--- a/Source/cmExportSet.cxx
+++ b/Source/cmExportSet.cxx
@@ -11,6 +11,7 @@
============================================================================*/
#include "cmExportSet.h"
+
#include "cmTargetExport.h"
#include "cmAlgorithms.h"
#include "cmLocalGenerator.h"
diff --git a/Source/cmExportSet.h b/Source/cmExportSet.h
index d780a22..a3359ac 100644
--- a/Source/cmExportSet.h
+++ b/Source/cmExportSet.h
@@ -13,6 +13,7 @@
#define cmExportSet_h
#include "cmSystemTools.h"
+
class cmTargetExport;
class cmInstallExportGenerator;
class cmLocalGenerator;
diff --git a/Source/cmExportSetMap.cxx b/Source/cmExportSetMap.cxx
index cf431c6..b0021e7 100644
--- a/Source/cmExportSetMap.cxx
+++ b/Source/cmExportSetMap.cxx
@@ -11,6 +11,7 @@
============================================================================*/
#include "cmExportSetMap.h"
+
#include "cmExportSet.h"
#include "cmAlgorithms.h"
diff --git a/Source/cmExportSetMap.h b/Source/cmExportSetMap.h
index 965046c..87f2060 100644
--- a/Source/cmExportSetMap.h
+++ b/Source/cmExportSetMap.h
@@ -13,6 +13,7 @@
#define cmExportSetMap_h
#include "cmSystemTools.h"
+
class cmExportSet;
/// A name -> cmExportSet map with overloaded operator[].
diff --git a/Source/cmExternalMakefileProjectGenerator.cxx b/Source/cmExternalMakefileProjectGenerator.cxx
index 9264671..cdf0292 100644
--- a/Source/cmExternalMakefileProjectGenerator.cxx
+++ b/Source/cmExternalMakefileProjectGenerator.cxx
@@ -9,10 +9,11 @@
implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the License for more information.
============================================================================*/
-#include <assert.h>
#include "cmExternalMakefileProjectGenerator.h"
+#include <assert.h>
+
void cmExternalMakefileProjectGenerator
::EnableLanguage(std::vector<std::string> const&,
cmMakefile *, bool)
diff --git a/Source/cmExtraCodeBlocksGenerator.cxx b/Source/cmExtraCodeBlocksGenerator.cxx
index 52512a8..2d26cc3 100644
--- a/Source/cmExtraCodeBlocksGenerator.cxx
+++ b/Source/cmExtraCodeBlocksGenerator.cxx
@@ -11,6 +11,7 @@
See the License for more information.
============================================================================*/
#include "cmExtraCodeBlocksGenerator.h"
+
#include "cmGlobalUnixMakefileGenerator3.h"
#include "cmLocalUnixMakefileGenerator3.h"
#include "cmMakefile.h"
diff --git a/Source/cmExtraCodeLiteGenerator.cxx b/Source/cmExtraCodeLiteGenerator.cxx
index 9fc7b1e..e2b84c6 100644
--- a/Source/cmExtraCodeLiteGenerator.cxx
+++ b/Source/cmExtraCodeLiteGenerator.cxx
@@ -12,6 +12,7 @@
See the License for more information.
============================================================================*/
#include "cmExtraCodeLiteGenerator.h"
+
#include "cmGlobalUnixMakefileGenerator3.h"
#include "cmLocalUnixMakefileGenerator3.h"
#include "cmMakefile.h"
diff --git a/Source/cmExtraEclipseCDT4Generator.cxx b/Source/cmExtraEclipseCDT4Generator.cxx
index 9e67301..22b2f91 100644
--- a/Source/cmExtraEclipseCDT4Generator.cxx
+++ b/Source/cmExtraEclipseCDT4Generator.cxx
@@ -12,6 +12,7 @@
See the License for more information.
============================================================================*/
#include "cmExtraEclipseCDT4Generator.h"
+
#include "cmGlobalUnixMakefileGenerator3.h"
#include "cmLocalUnixMakefileGenerator3.h"
#include "cmMakefile.h"
diff --git a/Source/cmExtraKateGenerator.cxx b/Source/cmExtraKateGenerator.cxx
index ff5d3ab..8e60d50 100644
--- a/Source/cmExtraKateGenerator.cxx
+++ b/Source/cmExtraKateGenerator.cxx
@@ -11,6 +11,7 @@
See the License for more information.
============================================================================*/
#include "cmExtraKateGenerator.h"
+
#include "cmGlobalUnixMakefileGenerator3.h"
#include "cmLocalUnixMakefileGenerator3.h"
#include "cmMakefile.h"
diff --git a/Source/cmExtraSublimeTextGenerator.cxx b/Source/cmExtraSublimeTextGenerator.cxx
index 92d38b9..f84eeb0 100644
--- a/Source/cmExtraSublimeTextGenerator.cxx
+++ b/Source/cmExtraSublimeTextGenerator.cxx
@@ -11,6 +11,7 @@
See the License for more information.
============================================================================*/
#include "cmExtraSublimeTextGenerator.h"
+
#include "cmake.h"
#include "cmGeneratedFileStream.h"
#include "cmGeneratorTarget.h"
diff --git a/Source/cmFileCommand.cxx b/Source/cmFileCommand.cxx
index b0a61b2..42922e1 100644
--- a/Source/cmFileCommand.cxx
+++ b/Source/cmFileCommand.cxx
@@ -10,6 +10,7 @@
See the License for more information.
============================================================================*/
#include "cmFileCommand.h"
+
#include "cmCryptoHash.h"
#include "cmake.h"
#include "cmHexFileConverter.h"
diff --git a/Source/cmFindCommon.cxx b/Source/cmFindCommon.cxx
index 913985f..1286a00 100644
--- a/Source/cmFindCommon.cxx
+++ b/Source/cmFindCommon.cxx
@@ -10,6 +10,7 @@
See the License for more information.
============================================================================*/
#include "cmFindCommon.h"
+
#include <functional>
#include <algorithm>
diff --git a/Source/cmFindFileCommand.cxx b/Source/cmFindFileCommand.cxx
index 615e7c1..a6666ba 100644
--- a/Source/cmFindFileCommand.cxx
+++ b/Source/cmFindFileCommand.cxx
@@ -10,6 +10,7 @@
See the License for more information.
============================================================================*/
#include "cmFindFileCommand.h"
+
#include "cmSystemTools.h"
cmFindFileCommand::cmFindFileCommand()
diff --git a/Source/cmFindLibraryCommand.cxx b/Source/cmFindLibraryCommand.cxx
index e7696af..91c7b5c 100644
--- a/Source/cmFindLibraryCommand.cxx
+++ b/Source/cmFindLibraryCommand.cxx
@@ -10,6 +10,7 @@
See the License for more information.
============================================================================*/
#include "cmFindLibraryCommand.h"
+
#include <cmsys/Directory.hxx>
cmFindLibraryCommand::cmFindLibraryCommand()
diff --git a/Source/cmFindProgramCommand.cxx b/Source/cmFindProgramCommand.cxx
index 219ad48..1734c01 100644
--- a/Source/cmFindProgramCommand.cxx
+++ b/Source/cmFindProgramCommand.cxx
@@ -10,6 +10,7 @@
See the License for more information.
============================================================================*/
#include "cmFindProgramCommand.h"
+
#include <stdlib.h>
#if defined(__APPLE__)
diff --git a/Source/cmForEachCommand.h b/Source/cmForEachCommand.h
index 36e8808..027b8cb 100644
--- a/Source/cmForEachCommand.h
+++ b/Source/cmForEachCommand.h
@@ -13,6 +13,7 @@
#define cmForEachCommand_h
#include "cmCommand.h"
+
#include "cmFunctionBlocker.h"
#include "cmListFileCache.h"
diff --git a/Source/cmFunctionBlocker.h b/Source/cmFunctionBlocker.h
index a3b8078..d0d52ce 100644
--- a/Source/cmFunctionBlocker.h
+++ b/Source/cmFunctionBlocker.h
@@ -13,6 +13,7 @@
#define cmFunctionBlocker_h
#include "cmStandardIncludes.h"
+
#include "cmExecutionStatus.h"
#include "cmListFileCache.h"
class cmMakefile;
diff --git a/Source/cmFunctionCommand.h b/Source/cmFunctionCommand.h
index 2df435e..1a5ce59 100644
--- a/Source/cmFunctionCommand.h
+++ b/Source/cmFunctionCommand.h
@@ -13,6 +13,7 @@
#define cmFunctionCommand_h
#include "cmCommand.h"
+
#include "cmFunctionBlocker.h"
class cmFunctionFunctionBlocker : public cmFunctionBlocker
diff --git a/Source/cmGeneratedFileStream.h b/Source/cmGeneratedFileStream.h
index 8df3e1a..cb397c1 100644
--- a/Source/cmGeneratedFileStream.h
+++ b/Source/cmGeneratedFileStream.h
@@ -13,6 +13,7 @@
#define cmGeneratedFileStream_h
#include "cmStandardIncludes.h"
+
#include <cmsys/FStream.hxx>
// This is the first base class of cmGeneratedFileStream. It will be
diff --git a/Source/cmGeneratorExpression.h b/Source/cmGeneratorExpression.h
index efd381b..001f2df 100644
--- a/Source/cmGeneratorExpression.h
+++ b/Source/cmGeneratorExpression.h
@@ -14,6 +14,7 @@
#define cmGeneratorExpression_h
#include "cmStandardIncludes.h"
+
#include "cmListFileCache.h"
#include <cmsys/RegularExpression.hxx>
diff --git a/Source/cmGeneratorExpressionContext.cxx b/Source/cmGeneratorExpressionContext.cxx
index 5c9462f..b3bcb50 100644
--- a/Source/cmGeneratorExpressionContext.cxx
+++ b/Source/cmGeneratorExpressionContext.cxx
@@ -11,6 +11,7 @@
============================================================================*/
#include "cmGeneratorExpressionContext.h"
+
#include "cmGeneratorTarget.h"
cmGeneratorExpressionContext::cmGeneratorExpressionContext(
diff --git a/Source/cmGeneratorExpressionEvaluationFile.h b/Source/cmGeneratorExpressionEvaluationFile.h
index ad41274..f34dadc 100644
--- a/Source/cmGeneratorExpressionEvaluationFile.h
+++ b/Source/cmGeneratorExpressionEvaluationFile.h
@@ -12,12 +12,11 @@
#ifndef cmGeneratorExpressionEvaluationFile_h
#define cmGeneratorExpressionEvaluationFile_h
-#include "cmStandardIncludes.h"
+#include "cmGeneratorExpression.h"
+
#include <sys/types.h>
#include <cmsys/auto_ptr.hxx>
-#include "cmGeneratorExpression.h"
-
class cmLocalGenerator;
//----------------------------------------------------------------------------
diff --git a/Source/cmGeneratorExpressionEvaluator.cxx b/Source/cmGeneratorExpressionEvaluator.cxx
index af94bcc..0fe864c 100644
--- a/Source/cmGeneratorExpressionEvaluator.cxx
+++ b/Source/cmGeneratorExpressionEvaluator.cxx
@@ -9,9 +9,9 @@
implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the License for more information.
============================================================================*/
-#include "cmMakefile.h"
-
#include "cmGeneratorExpressionEvaluator.h"
+
+#include "cmMakefile.h"
#include "cmGeneratorExpressionParser.h"
#include "cmGeneratorExpressionDAGChecker.h"
#include "cmGeneratorExpression.h"
diff --git a/Source/cmGeneratorExpressionEvaluator.h b/Source/cmGeneratorExpressionEvaluator.h
index 407f83f..ba27e5a 100644
--- a/Source/cmGeneratorExpressionEvaluator.h
+++ b/Source/cmGeneratorExpressionEvaluator.h
@@ -12,9 +12,10 @@
#ifndef cmGeneratorExpressionEvaluator_h
#define cmGeneratorExpressionEvaluator_h
-#include "cmListFileCache.h"
#include "cmGeneratorExpressionContext.h"
+#include "cmListFileCache.h"
+
#include <vector>
#include <string>
diff --git a/Source/cmGeneratorExpressionNode.cxx b/Source/cmGeneratorExpressionNode.cxx
index 32b2f82..7f3d7d6 100644
--- a/Source/cmGeneratorExpressionNode.cxx
+++ b/Source/cmGeneratorExpressionNode.cxx
@@ -11,6 +11,7 @@
============================================================================*/
#include "cmGeneratorExpressionNode.h"
+
#include "cmGlobalGenerator.h"
#include "cmAlgorithms.h"
#include "cmOutputConverter.h"
diff --git a/Source/cmGeneratorExpressionNode.h b/Source/cmGeneratorExpressionNode.h
index 854811b..b803d12 100644
--- a/Source/cmGeneratorExpressionNode.h
+++ b/Source/cmGeneratorExpressionNode.h
@@ -12,10 +12,11 @@
#ifndef cmGeneratorExpressionNode_h
#define cmGeneratorExpressionNode_h
+#include "cmGeneratorExpression.h"
+
#include "cmGeneratorExpressionEvaluator.h"
#include "cmGeneratorExpressionParser.h"
#include "cmGeneratorExpressionDAGChecker.h"
-#include "cmGeneratorExpression.h"
#include "cmLocalGenerator.h"
#include "cmSourceFile.h"
diff --git a/Source/cmGetFilenameComponentCommand.cxx b/Source/cmGetFilenameComponentCommand.cxx
index 0f56c8e..2026a45 100644
--- a/Source/cmGetFilenameComponentCommand.cxx
+++ b/Source/cmGetFilenameComponentCommand.cxx
@@ -10,6 +10,7 @@
See the License for more information.
============================================================================*/
#include "cmGetFilenameComponentCommand.h"
+
#include "cmSystemTools.h"
// cmGetFilenameComponentCommand
diff --git a/Source/cmGhsMultiGpj.h b/Source/cmGhsMultiGpj.h
index 91ff0f4..862b63c 100644
--- a/Source/cmGhsMultiGpj.h
+++ b/Source/cmGhsMultiGpj.h
@@ -12,6 +12,8 @@
#ifndef cmGhsMultiGpj_h
#define cmGhsMultiGpj_h
+#include "cmStandardIncludes.h"
+
class cmGeneratedFileStream;
class GhsMultiGpj
diff --git a/Source/cmGhsMultiTargetGenerator.cxx b/Source/cmGhsMultiTargetGenerator.cxx
index 12e2eee..b7b122c 100644
--- a/Source/cmGhsMultiTargetGenerator.cxx
+++ b/Source/cmGhsMultiTargetGenerator.cxx
@@ -10,6 +10,7 @@
See the License for more information.
============================================================================*/
#include "cmGhsMultiTargetGenerator.h"
+
#include "cmGlobalGhsMultiGenerator.h"
#include "cmLocalGhsMultiGenerator.h"
#include "cmMakefile.h"
diff --git a/Source/cmGhsMultiTargetGenerator.h b/Source/cmGhsMultiTargetGenerator.h
index 3a13600..93761f2 100644
--- a/Source/cmGhsMultiTargetGenerator.h
+++ b/Source/cmGhsMultiTargetGenerator.h
@@ -12,10 +12,10 @@
#ifndef cmGhsMultiTargetGenerator_h
#define cmGhsMultiTargetGenerator_h
-#include "cmStandardIncludes.h"
-#include "cmTarget.h"
#include "cmGhsMultiGpj.h"
+#include "cmTarget.h"
+
class cmGeneratedFileStream;
class cmGlobalGhsMultiGenerator;
class cmLocalGhsMultiGenerator;
diff --git a/Source/cmGlobalBorlandMakefileGenerator.cxx b/Source/cmGlobalBorlandMakefileGenerator.cxx
index 40e8d29..374cc88 100644
--- a/Source/cmGlobalBorlandMakefileGenerator.cxx
+++ b/Source/cmGlobalBorlandMakefileGenerator.cxx
@@ -10,6 +10,7 @@
See the License for more information.
============================================================================*/
#include "cmGlobalBorlandMakefileGenerator.h"
+
#include "cmLocalUnixMakefileGenerator3.h"
#include "cmMakefile.h"
#include "cmake.h"
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 1d0ade4..5040cfd 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -17,6 +17,7 @@
#endif
#include "cmGlobalGenerator.h"
+
#include "cmLocalGenerator.h"
#include "cmExternalMakefileProjectGenerator.h"
#include "cmake.h"
diff --git a/Source/cmGlobalGhsMultiGenerator.cxx b/Source/cmGlobalGhsMultiGenerator.cxx
index 1bcbd26..e9a48c8 100644
--- a/Source/cmGlobalGhsMultiGenerator.cxx
+++ b/Source/cmGlobalGhsMultiGenerator.cxx
@@ -10,6 +10,7 @@
See the License for more information.
============================================================================*/
#include "cmGlobalGhsMultiGenerator.h"
+
#include "cmLocalGhsMultiGenerator.h"
#include "cmMakefile.h"
#include "cmVersion.h"
diff --git a/Source/cmGlobalGhsMultiGenerator.h b/Source/cmGlobalGhsMultiGenerator.h
index 6f86c5d..b8d6ade 100644
--- a/Source/cmGlobalGhsMultiGenerator.h
+++ b/Source/cmGlobalGhsMultiGenerator.h
@@ -12,8 +12,9 @@
#ifndef cmGhsMultiGenerator_h
#define cmGhsMultiGenerator_h
-#include "cmGlobalGeneratorFactory.h"
#include "cmGlobalGenerator.h"
+
+#include "cmGlobalGeneratorFactory.h"
#include "cmGhsMultiGpj.h"
class cmGeneratedFileStream;
diff --git a/Source/cmGlobalJOMMakefileGenerator.cxx b/Source/cmGlobalJOMMakefileGenerator.cxx
index 3f33f91..31cd2d3 100644
--- a/Source/cmGlobalJOMMakefileGenerator.cxx
+++ b/Source/cmGlobalJOMMakefileGenerator.cxx
@@ -10,6 +10,7 @@
See the License for more information.
============================================================================*/
#include "cmGlobalJOMMakefileGenerator.h"
+
#include "cmLocalUnixMakefileGenerator3.h"
#include "cmMakefile.h"
diff --git a/Source/cmGlobalKdevelopGenerator.cxx b/Source/cmGlobalKdevelopGenerator.cxx
index b4f7670..758caae 100644
--- a/Source/cmGlobalKdevelopGenerator.cxx
+++ b/Source/cmGlobalKdevelopGenerator.cxx
@@ -11,6 +11,7 @@
See the License for more information.
============================================================================*/
#include "cmGlobalKdevelopGenerator.h"
+
#include "cmGlobalUnixMakefileGenerator3.h"
#include "cmLocalUnixMakefileGenerator3.h"
#include "cmMakefile.h"
diff --git a/Source/cmGlobalMSYSMakefileGenerator.cxx b/Source/cmGlobalMSYSMakefileGenerator.cxx
index 9a6f3ba..a2b0bd1 100644
--- a/Source/cmGlobalMSYSMakefileGenerator.cxx
+++ b/Source/cmGlobalMSYSMakefileGenerator.cxx
@@ -10,6 +10,7 @@
See the License for more information.
============================================================================*/
#include "cmGlobalMSYSMakefileGenerator.h"
+
#include "cmLocalUnixMakefileGenerator3.h"
#include "cmMakefile.h"
#include "cmake.h"
diff --git a/Source/cmGlobalMinGWMakefileGenerator.cxx b/Source/cmGlobalMinGWMakefileGenerator.cxx
index b6e52d7..c965f57 100644
--- a/Source/cmGlobalMinGWMakefileGenerator.cxx
+++ b/Source/cmGlobalMinGWMakefileGenerator.cxx
@@ -10,6 +10,7 @@
See the License for more information.
============================================================================*/
#include "cmGlobalMinGWMakefileGenerator.h"
+
#include "cmLocalUnixMakefileGenerator3.h"
#include "cmMakefile.h"
diff --git a/Source/cmGlobalNMakeMakefileGenerator.cxx b/Source/cmGlobalNMakeMakefileGenerator.cxx
index 7c570a6..0a9f644 100644
--- a/Source/cmGlobalNMakeMakefileGenerator.cxx
+++ b/Source/cmGlobalNMakeMakefileGenerator.cxx
@@ -10,6 +10,7 @@
See the License for more information.
============================================================================*/
#include "cmGlobalNMakeMakefileGenerator.h"
+
#include "cmLocalUnixMakefileGenerator3.h"
#include "cmMakefile.h"
diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx
index fadb0cf..88766fe 100644
--- a/Source/cmGlobalNinjaGenerator.cxx
+++ b/Source/cmGlobalNinjaGenerator.cxx
@@ -10,10 +10,11 @@
implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the License for more information.
============================================================================*/
+#include "cmGlobalNinjaGenerator.h"
+
#include "cmGeneratedFileStream.h"
#include "cmGeneratorExpressionEvaluationFile.h"
#include "cmGeneratorTarget.h"
-#include "cmGlobalNinjaGenerator.h"
#include "cmLocalNinjaGenerator.h"
#include "cmMakefile.h"
#include "cmVersion.h"
diff --git a/Source/cmGlobalNinjaGenerator.h b/Source/cmGlobalNinjaGenerator.h
index 3093a11..56e2bdb 100644
--- a/Source/cmGlobalNinjaGenerator.h
+++ b/Source/cmGlobalNinjaGenerator.h
@@ -11,11 +11,12 @@
See the License for more information.
============================================================================*/
#ifndef cmGlobalNinjaGenerator_h
-# define cmGlobalNinjaGenerator_h
+#define cmGlobalNinjaGenerator_h
-# include "cmGlobalCommonGenerator.h"
-# include "cmGlobalGeneratorFactory.h"
-# include "cmNinjaTypes.h"
+#include "cmGlobalCommonGenerator.h"
+
+#include "cmGlobalGeneratorFactory.h"
+#include "cmNinjaTypes.h"
//#define NINJA_GEN_VERBOSE_FILES
diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx
index ce7815d..e35aa2e 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.cxx
+++ b/Source/cmGlobalUnixMakefileGenerator3.cxx
@@ -10,6 +10,7 @@
See the License for more information.
============================================================================*/
#include "cmGlobalUnixMakefileGenerator3.h"
+
#include "cmLocalUnixMakefileGenerator3.h"
#include "cmMakefileTargetGenerator.h"
#include "cmMakefile.h"
diff --git a/Source/cmGlobalUnixMakefileGenerator3.h b/Source/cmGlobalUnixMakefileGenerator3.h
index 0591a5a..b035df4 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.h
+++ b/Source/cmGlobalUnixMakefileGenerator3.h
@@ -13,6 +13,7 @@
#define cmGlobalUnixMakefileGenerator3_h
#include "cmGlobalCommonGenerator.h"
+
#include "cmGlobalGeneratorFactory.h"
class cmGeneratedFileStream;
diff --git a/Source/cmGlobalVisualStudio10Generator.cxx b/Source/cmGlobalVisualStudio10Generator.cxx
index c24e7f5..ee5e605 100644
--- a/Source/cmGlobalVisualStudio10Generator.cxx
+++ b/Source/cmGlobalVisualStudio10Generator.cxx
@@ -10,7 +10,9 @@
See the License for more information.
============================================================================*/
#include "windows.h" // this must be first to define GetCurrentDirectory
+
#include "cmGlobalVisualStudio10Generator.h"
+
#include "cmLocalVisualStudio10Generator.h"
#include "cmMakefile.h"
#include "cmSourceFile.h"
diff --git a/Source/cmGlobalVisualStudio11Generator.cxx b/Source/cmGlobalVisualStudio11Generator.cxx
index 9b00357..5eafe8a 100644
--- a/Source/cmGlobalVisualStudio11Generator.cxx
+++ b/Source/cmGlobalVisualStudio11Generator.cxx
@@ -10,6 +10,7 @@
See the License for more information.
============================================================================*/
#include "cmGlobalVisualStudio11Generator.h"
+
#include "cmLocalVisualStudio10Generator.h"
#include "cmMakefile.h"
#include "cmAlgorithms.h"
diff --git a/Source/cmGlobalVisualStudio12Generator.cxx b/Source/cmGlobalVisualStudio12Generator.cxx
index 568d4d7..e92ab5b 100644
--- a/Source/cmGlobalVisualStudio12Generator.cxx
+++ b/Source/cmGlobalVisualStudio12Generator.cxx
@@ -10,6 +10,7 @@
See the License for more information.
============================================================================*/
#include "cmGlobalVisualStudio12Generator.h"
+
#include "cmLocalVisualStudio10Generator.h"
#include "cmMakefile.h"
#include "cmAlgorithms.h"
diff --git a/Source/cmGlobalVisualStudio14Generator.cxx b/Source/cmGlobalVisualStudio14Generator.cxx
index c058f8c..df61503 100644
--- a/Source/cmGlobalVisualStudio14Generator.cxx
+++ b/Source/cmGlobalVisualStudio14Generator.cxx
@@ -10,6 +10,7 @@
See the License for more information.
============================================================================*/
#include "cmGlobalVisualStudio14Generator.h"
+
#include "cmLocalVisualStudio10Generator.h"
#include "cmMakefile.h"
#include "cmAlgorithms.h"
diff --git a/Source/cmGlobalVisualStudio71Generator.cxx b/Source/cmGlobalVisualStudio71Generator.cxx
index 7b51fdf..bf59925 100644
--- a/Source/cmGlobalVisualStudio71Generator.cxx
+++ b/Source/cmGlobalVisualStudio71Generator.cxx
@@ -10,7 +10,9 @@
See the License for more information.
============================================================================*/
#include "windows.h" // this must be first to define GetCurrentDirectory
+
#include "cmGlobalVisualStudio71Generator.h"
+
#include "cmLocalVisualStudio7Generator.h"
#include "cmMakefile.h"
#include "cmake.h"
diff --git a/Source/cmGlobalVisualStudio7Generator.cxx b/Source/cmGlobalVisualStudio7Generator.cxx
index c1c8c77..f8fe074 100644
--- a/Source/cmGlobalVisualStudio7Generator.cxx
+++ b/Source/cmGlobalVisualStudio7Generator.cxx
@@ -10,8 +10,9 @@
See the License for more information.
============================================================================*/
#include "windows.h" // this must be first to define GetCurrentDirectory
-#include <assert.h>
+
#include "cmGlobalVisualStudio7Generator.h"
+
#include "cmGeneratedFileStream.h"
#include "cmLocalVisualStudio7Generator.h"
#include "cmMakefile.h"
@@ -19,6 +20,8 @@
#include "cmake.h"
#include <cmsys/Encoding.hxx>
+#include <assert.h>
+
//----------------------------------------------------------------------------
static cmVS7FlagTable cmVS7ExtraFlagTable[] =
{
diff --git a/Source/cmGlobalVisualStudio7Generator.h b/Source/cmGlobalVisualStudio7Generator.h
index 02f9809..a360bd9 100644
--- a/Source/cmGlobalVisualStudio7Generator.h
+++ b/Source/cmGlobalVisualStudio7Generator.h
@@ -13,6 +13,7 @@
#define cmGlobalVisualStudio7Generator_h
#include "cmGlobalVisualStudioGenerator.h"
+
#include "cmGlobalGeneratorFactory.h"
class cmTarget;
diff --git a/Source/cmGlobalVisualStudio8Generator.cxx b/Source/cmGlobalVisualStudio8Generator.cxx
index 5c50530..506d1a9 100644
--- a/Source/cmGlobalVisualStudio8Generator.cxx
+++ b/Source/cmGlobalVisualStudio8Generator.cxx
@@ -10,7 +10,9 @@
See the License for more information.
============================================================================*/
#include "windows.h" // this must be first to define GetCurrentDirectory
+
#include "cmGlobalVisualStudio8Generator.h"
+
#include "cmLocalVisualStudio7Generator.h"
#include "cmMakefile.h"
#include "cmVisualStudioWCEPlatformParser.h"
diff --git a/Source/cmGlobalVisualStudio9Generator.cxx b/Source/cmGlobalVisualStudio9Generator.cxx
index da6ffae..c2ef332 100644
--- a/Source/cmGlobalVisualStudio9Generator.cxx
+++ b/Source/cmGlobalVisualStudio9Generator.cxx
@@ -10,7 +10,9 @@
See the License for more information.
============================================================================*/
#include "windows.h" // this must be first to define GetCurrentDirectory
+
#include "cmGlobalVisualStudio9Generator.h"
+
#include "cmLocalVisualStudio7Generator.h"
#include "cmMakefile.h"
#include "cmVisualStudioWCEPlatformParser.h"
diff --git a/Source/cmGlobalWatcomWMakeGenerator.cxx b/Source/cmGlobalWatcomWMakeGenerator.cxx
index 153773f..63f82bb 100644
--- a/Source/cmGlobalWatcomWMakeGenerator.cxx
+++ b/Source/cmGlobalWatcomWMakeGenerator.cxx
@@ -10,6 +10,7 @@
See the License for more information.
============================================================================*/
#include "cmGlobalWatcomWMakeGenerator.h"
+
#include "cmLocalUnixMakefileGenerator3.h"
#include "cmMakefile.h"
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 755c8a6..6258341 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -10,6 +10,7 @@
See the License for more information.
============================================================================*/
#include "cmGlobalXCodeGenerator.h"
+
#include "cmLocalXCodeGenerator.h"
#include "cmMakefile.h"
#include "cmXCodeObject.h"
diff --git a/Source/cmGlobalXCodeGenerator.h b/Source/cmGlobalXCodeGenerator.h
index f7bfb26..2a48ac8 100644
--- a/Source/cmGlobalXCodeGenerator.h
+++ b/Source/cmGlobalXCodeGenerator.h
@@ -13,6 +13,7 @@
#define cmGlobalXCodeGenerator_h
#include "cmGlobalGenerator.h"
+
#include "cmXCodeObject.h"
#include "cmCustomCommand.h"
class cmGlobalGeneratorFactory;
diff --git a/Source/cmGraphVizWriter.cxx b/Source/cmGraphVizWriter.cxx
index 448306f..5b7d229 100644
--- a/Source/cmGraphVizWriter.cxx
+++ b/Source/cmGraphVizWriter.cxx
@@ -10,6 +10,7 @@
See the License for more information.
============================================================================*/
#include "cmGraphVizWriter.h"
+
#include "cmMakefile.h"
#include "cmLocalGenerator.h"
#include "cmGlobalGenerator.h"
diff --git a/Source/cmGraphVizWriter.h b/Source/cmGraphVizWriter.h
index 90d31d3..8b1438e 100644
--- a/Source/cmGraphVizWriter.h
+++ b/Source/cmGraphVizWriter.h
@@ -1,5 +1,3 @@
-#ifndef CMGRAPHVIZWRITER_H
-#define CMGRAPHVIZWRITER_H
/*============================================================================
CMake - Cross Platform Makefile Generator
Copyright 2000-2009 Kitware, Inc., Insight Software Consortium
@@ -11,7 +9,11 @@
implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the License for more information.
============================================================================*/
+#ifndef CMGRAPHVIZWRITER_H
+#define CMGRAPHVIZWRITER_H
+
#include "cmStandardIncludes.h"
+
#include "cmLocalGenerator.h"
#include "cmGeneratedFileStream.h"
#include <cmsys/RegularExpression.hxx>
diff --git a/Source/cmHexFileConverter.h b/Source/cmHexFileConverter.h
index e11d74a..89b8533 100644
--- a/Source/cmHexFileConverter.h
+++ b/Source/cmHexFileConverter.h
@@ -12,6 +12,8 @@
#ifndef cmHexFileConverter_h
#define cmHexFileConverter_h
+#include "cmStandardIncludes.h"
+
/** \class cmHexFileConverter
* \brief Can detects Intel Hex and Motorola S-record files and convert them
* to binary files.
diff --git a/Source/cmIDEOptions.h b/Source/cmIDEOptions.h
index 7386016..8c985c7 100644
--- a/Source/cmIDEOptions.h
+++ b/Source/cmIDEOptions.h
@@ -13,6 +13,7 @@
#define cmIDEOptions_h
#include "cmStandardIncludes.h"
+
#include "cmIDEFlagTable.h"
/** \class cmIDEOptions
diff --git a/Source/cmIfCommand.cxx b/Source/cmIfCommand.cxx
index fc54ca5..1b8ba0b 100644
--- a/Source/cmIfCommand.cxx
+++ b/Source/cmIfCommand.cxx
@@ -10,6 +10,7 @@
See the License for more information.
============================================================================*/
#include "cmIfCommand.h"
+
#include "cmStringCommand.h"
#include "cmOutputConverter.h"
diff --git a/Source/cmIfCommand.h b/Source/cmIfCommand.h
index 689efce..9054a0b 100644
--- a/Source/cmIfCommand.h
+++ b/Source/cmIfCommand.h
@@ -13,6 +13,7 @@
#define cmIfCommand_h
#include "cmCommand.h"
+
#include "cmFunctionBlocker.h"
class cmIfFunctionBlocker : public cmFunctionBlocker
diff --git a/Source/cmInstallCommandArguments.cxx b/Source/cmInstallCommandArguments.cxx
index 6ded365..57f5f31 100644
--- a/Source/cmInstallCommandArguments.cxx
+++ b/Source/cmInstallCommandArguments.cxx
@@ -10,6 +10,7 @@
See the License for more information.
============================================================================*/
#include "cmInstallCommandArguments.h"
+
#include "cmSystemTools.h"
// Table of valid permissions.
diff --git a/Source/cmInstallCommandArguments.h b/Source/cmInstallCommandArguments.h
index 694f1ed..e83a397 100644
--- a/Source/cmInstallCommandArguments.h
+++ b/Source/cmInstallCommandArguments.h
@@ -14,6 +14,7 @@
#define cmInstallCommandArguments_h
#include "cmStandardIncludes.h"
+
#include "cmCommandArgumentsHelper.h"
class cmInstallCommandArguments
diff --git a/Source/cmInstallProgramsCommand.cxx b/Source/cmInstallProgramsCommand.cxx
index b6d0c45..790215d 100644
--- a/Source/cmInstallProgramsCommand.cxx
+++ b/Source/cmInstallProgramsCommand.cxx
@@ -10,6 +10,7 @@
See the License for more information.
============================================================================*/
#include "cmInstallProgramsCommand.h"
+
#include "cmInstallFilesGenerator.h"
// cmExecutableCommand
bool cmInstallProgramsCommand
diff --git a/Source/cmInstalledFile.cxx b/Source/cmInstalledFile.cxx
index fa5e815..7025d0f 100644
--- a/Source/cmInstalledFile.cxx
+++ b/Source/cmInstalledFile.cxx
@@ -10,6 +10,7 @@
See the License for more information.
============================================================================*/
#include "cmInstalledFile.h"
+
#include "cmSystemTools.h"
#include "cmMakefile.h"
#include "cmAlgorithms.h"
diff --git a/Source/cmListCommand.cxx b/Source/cmListCommand.cxx
index 15a1af5..514bc05 100644
--- a/Source/cmListCommand.cxx
+++ b/Source/cmListCommand.cxx
@@ -10,6 +10,7 @@
See the License for more information.
============================================================================*/
#include "cmListCommand.h"
+
#include <cmsys/RegularExpression.hxx>
#include <cmsys/SystemTools.hxx>
#include "cmAlgorithms.h"
diff --git a/Source/cmLoadCommandCommand.cxx b/Source/cmLoadCommandCommand.cxx
index 403f7fc..ed1adc0 100644
--- a/Source/cmLoadCommandCommand.cxx
+++ b/Source/cmLoadCommandCommand.cxx
@@ -10,6 +10,7 @@
See the License for more information.
============================================================================*/
#include "cmLoadCommandCommand.h"
+
#include "cmCPluginAPI.h"
#include "cmCPluginAPI.cxx"
#include "cmDynamicLoader.h"
diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h
index b673a85..d9c68f9 100644
--- a/Source/cmLocalGenerator.h
+++ b/Source/cmLocalGenerator.h
@@ -13,6 +13,7 @@
#define cmLocalGenerator_h
#include "cmStandardIncludes.h"
+
#include "cmState.h"
#include "cmake.h"
#include "cmOutputConverter.h"
diff --git a/Source/cmLocalGhsMultiGenerator.cxx b/Source/cmLocalGhsMultiGenerator.cxx
index a77a75e..91e75d3 100644
--- a/Source/cmLocalGhsMultiGenerator.cxx
+++ b/Source/cmLocalGhsMultiGenerator.cxx
@@ -10,6 +10,7 @@
See the License for more information.
============================================================================*/
#include "cmLocalGhsMultiGenerator.h"
+
#include "cmGlobalGhsMultiGenerator.h"
#include "cmGeneratorTarget.h"
#include "cmMakefile.h"
diff --git a/Source/cmLocalNinjaGenerator.cxx b/Source/cmLocalNinjaGenerator.cxx
index 030b094..143c14e 100644
--- a/Source/cmLocalNinjaGenerator.cxx
+++ b/Source/cmLocalNinjaGenerator.cxx
@@ -11,6 +11,7 @@
See the License for more information.
============================================================================*/
#include "cmLocalNinjaGenerator.h"
+
#include "cmCustomCommandGenerator.h"
#include "cmMakefile.h"
#include "cmGlobalNinjaGenerator.h"
diff --git a/Source/cmLocalNinjaGenerator.h b/Source/cmLocalNinjaGenerator.h
index 5e1d6f2..9746a3c 100644
--- a/Source/cmLocalNinjaGenerator.h
+++ b/Source/cmLocalNinjaGenerator.h
@@ -11,10 +11,11 @@
See the License for more information.
============================================================================*/
#ifndef cmLocalNinjaGenerator_h
-# define cmLocalNinjaGenerator_h
+#define cmLocalNinjaGenerator_h
-# include "cmLocalCommonGenerator.h"
-# include "cmNinjaTypes.h"
+#include "cmLocalCommonGenerator.h"
+
+#include "cmNinjaTypes.h"
class cmCustomCommandGenerator;
class cmGlobalNinjaGenerator;
diff --git a/Source/cmLocalVisualStudio10Generator.cxx b/Source/cmLocalVisualStudio10Generator.cxx
index d0784ad..ce20c97 100644
--- a/Source/cmLocalVisualStudio10Generator.cxx
+++ b/Source/cmLocalVisualStudio10Generator.cxx
@@ -10,11 +10,13 @@
See the License for more information.
============================================================================*/
#include "cmLocalVisualStudio10Generator.h"
+
#include "cmMakefile.h"
#include "cmVisualStudio10TargetGenerator.h"
#include "cmGlobalVisualStudio10Generator.h"
#include <cm_expat.h>
#include "cmXMLParser.h"
+
class cmVS10XMLParser : public cmXMLParser
{
public:
diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx
index 2f66517..de974c2 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -9,8 +9,9 @@
implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the License for more information.
============================================================================*/
-#include "cmGlobalVisualStudio7Generator.h"
#include "cmLocalVisualStudio7Generator.h"
+
+#include "cmGlobalVisualStudio7Generator.h"
#include "cmXMLParser.h"
#include <cm_expat.h>
#include "cmMakefile.h"
diff --git a/Source/cmLocalVisualStudio7Generator.h b/Source/cmLocalVisualStudio7Generator.h
index 562f485..5d9a634 100644
--- a/Source/cmLocalVisualStudio7Generator.h
+++ b/Source/cmLocalVisualStudio7Generator.h
@@ -13,6 +13,7 @@
#define cmLocalVisualStudio7Generator_h
#include "cmLocalVisualStudioGenerator.h"
+
#include "cmVisualStudioGeneratorOptions.h"
class cmSourceFile;
diff --git a/Source/cmLocalVisualStudioGenerator.cxx b/Source/cmLocalVisualStudioGenerator.cxx
index 561f9a1..a5b8f99 100644
--- a/Source/cmLocalVisualStudioGenerator.cxx
+++ b/Source/cmLocalVisualStudioGenerator.cxx
@@ -10,6 +10,7 @@
See the License for more information.
============================================================================*/
#include "cmLocalVisualStudioGenerator.h"
+
#include "cmGlobalGenerator.h"
#include "cmMakefile.h"
#include "cmSourceFile.h"
diff --git a/Source/cmLocalVisualStudioGenerator.h b/Source/cmLocalVisualStudioGenerator.h
index f95eefa..caffff7 100644
--- a/Source/cmLocalVisualStudioGenerator.h
+++ b/Source/cmLocalVisualStudioGenerator.h
@@ -13,6 +13,7 @@
#define cmLocalVisualStudioGenerator_h
#include "cmLocalGenerator.h"
+
#include "cmGlobalVisualStudioGenerator.h"
#include <cmsys/auto_ptr.hxx>
diff --git a/Source/cmLocalXCodeGenerator.cxx b/Source/cmLocalXCodeGenerator.cxx
index aec2603..c837445 100644
--- a/Source/cmLocalXCodeGenerator.cxx
+++ b/Source/cmLocalXCodeGenerator.cxx
@@ -10,6 +10,7 @@
See the License for more information.
============================================================================*/
#include "cmLocalXCodeGenerator.h"
+
#include "cmGlobalXCodeGenerator.h"
#include "cmSourceFile.h"
#include "cmMakefile.h"
diff --git a/Source/cmLocale.h b/Source/cmLocale.h
index 727f0f5..69640f6 100644
--- a/Source/cmLocale.h
+++ b/Source/cmLocale.h
@@ -12,6 +12,8 @@
#ifndef cmLocale_h
#define cmLocale_h
+#include "cmStandardIncludes.h"
+
#include <locale.h>
class cmLocaleRAII
diff --git a/Source/cmMachO.cxx b/Source/cmMachO.cxx
index 1607845..6210da3 100644
--- a/Source/cmMachO.cxx
+++ b/Source/cmMachO.cxx
@@ -10,6 +10,7 @@
See the License for more information.
============================================================================*/
#include "cmStandardIncludes.h" // to get CMAKE_USE_MACH_PARSER first
+
#include "cmMachO.h"
#include <cmsys/FStream.hxx>
diff --git a/Source/cmMacroCommand.h b/Source/cmMacroCommand.h
index 5c1cc00..6f1ae9e 100644
--- a/Source/cmMacroCommand.h
+++ b/Source/cmMacroCommand.h
@@ -13,6 +13,7 @@
#define cmMacroCommand_h
#include "cmCommand.h"
+
#include "cmFunctionBlocker.h"
class cmMacroFunctionBlocker : public cmFunctionBlocker
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index f01ff74..29b947c 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -10,6 +10,7 @@
See the License for more information.
============================================================================*/
#include "cmMakefile.h"
+
#include "cmVersion.h"
#include "cmCommand.h"
#include "cmSourceFile.h"
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index 089a83d..0300d3f 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -12,6 +12,8 @@
#ifndef cmMakefile_h
#define cmMakefile_h
+#include "cmStandardIncludes.h"
+
#include "cmExecutionStatus.h"
#include "cmListFileCache.h"
#include "cmSystemTools.h"
diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
index 322f37d..3519400 100644
--- a/Source/cmNinjaNormalTargetGenerator.cxx
+++ b/Source/cmNinjaNormalTargetGenerator.cxx
@@ -11,6 +11,7 @@
See the License for more information.
============================================================================*/
#include "cmNinjaNormalTargetGenerator.h"
+
#include "cmLocalNinjaGenerator.h"
#include "cmGlobalNinjaGenerator.h"
#include "cmSourceFile.h"
diff --git a/Source/cmNinjaNormalTargetGenerator.h b/Source/cmNinjaNormalTargetGenerator.h
index 556ed5e..300618c 100644
--- a/Source/cmNinjaNormalTargetGenerator.h
+++ b/Source/cmNinjaNormalTargetGenerator.h
@@ -11,13 +11,13 @@
See the License for more information.
============================================================================*/
#ifndef cmNinjaNormalTargetGenerator_h
-# define cmNinjaNormalTargetGenerator_h
+#define cmNinjaNormalTargetGenerator_h
-# include "cmNinjaTargetGenerator.h"
-# include "cmNinjaTypes.h"
-# include "cmStandardIncludes.h"
+#include "cmNinjaTargetGenerator.h"
-# include <set>
+#include "cmNinjaTypes.h"
+
+#include <set>
class cmSourceFile;
class cmOSXBundleGenerator;
diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx
index fd1d16d..97ef00d 100644
--- a/Source/cmNinjaTargetGenerator.cxx
+++ b/Source/cmNinjaTargetGenerator.cxx
@@ -11,6 +11,7 @@
See the License for more information.
============================================================================*/
#include "cmNinjaTargetGenerator.h"
+
#include "cmGlobalNinjaGenerator.h"
#include "cmLocalNinjaGenerator.h"
#include "cmGeneratedFileStream.h"
diff --git a/Source/cmNinjaTargetGenerator.h b/Source/cmNinjaTargetGenerator.h
index 371bc3c..40f96b4 100644
--- a/Source/cmNinjaTargetGenerator.h
+++ b/Source/cmNinjaTargetGenerator.h
@@ -15,7 +15,6 @@
#include "cmCommonTargetGenerator.h"
-#include "cmStandardIncludes.h"
#include "cmNinjaTypes.h"
#include "cmGlobalNinjaGenerator.h"
#include "cmLocalNinjaGenerator.h"
diff --git a/Source/cmNinjaTypes.h b/Source/cmNinjaTypes.h
index 498f6b6..82a5220 100644
--- a/Source/cmNinjaTypes.h
+++ b/Source/cmNinjaTypes.h
@@ -11,7 +11,9 @@
See the License for more information.
============================================================================*/
#ifndef cmNinjaTypes_h
-# define cmNinjaTypes_h
+#define cmNinjaTypes_h
+
+#include "cmStandardIncludes.h"
typedef std::vector<std::string> cmNinjaDeps;
typedef std::map<std::string, std::string> cmNinjaVars;
diff --git a/Source/cmNinjaUtilityTargetGenerator.cxx b/Source/cmNinjaUtilityTargetGenerator.cxx
index ac66fcd..c2162ce 100644
--- a/Source/cmNinjaUtilityTargetGenerator.cxx
+++ b/Source/cmNinjaUtilityTargetGenerator.cxx
@@ -11,6 +11,7 @@
See the License for more information.
============================================================================*/
#include "cmNinjaUtilityTargetGenerator.h"
+
#include "cmCustomCommand.h"
#include "cmGeneratedFileStream.h"
#include "cmGlobalNinjaGenerator.h"
diff --git a/Source/cmNinjaUtilityTargetGenerator.h b/Source/cmNinjaUtilityTargetGenerator.h
index add0291..fec2946 100644
--- a/Source/cmNinjaUtilityTargetGenerator.h
+++ b/Source/cmNinjaUtilityTargetGenerator.h
@@ -11,10 +11,11 @@
See the License for more information.
============================================================================*/
#ifndef cmNinjaUtilityTargetGenerator_h
-# define cmNinjaUtilityTargetGenerator_h
+#define cmNinjaUtilityTargetGenerator_h
-# include "cmNinjaTargetGenerator.h"
-# include "cmNinjaTypes.h"
+#include "cmNinjaTargetGenerator.h"
+
+#include "cmNinjaTypes.h"
class cmSourceFile;
diff --git a/Source/cmOSXBundleGenerator.cxx b/Source/cmOSXBundleGenerator.cxx
index 934e198..6991d7b 100644
--- a/Source/cmOSXBundleGenerator.cxx
+++ b/Source/cmOSXBundleGenerator.cxx
@@ -10,6 +10,7 @@
See the License for more information.
============================================================================*/
#include "cmOSXBundleGenerator.h"
+
#include "cmMakefile.h"
#include "cmTarget.h"
#include "cmLocalGenerator.h"
diff --git a/Source/cmOSXBundleGenerator.h b/Source/cmOSXBundleGenerator.h
index f945c15..2400262 100644
--- a/Source/cmOSXBundleGenerator.h
+++ b/Source/cmOSXBundleGenerator.h
@@ -13,6 +13,7 @@
#define cmOSXBundleGenerator_h
#include "cmStandardIncludes.h"
+
#include "cmSourceFile.h"
#include <string>
diff --git a/Source/cmOutputRequiredFilesCommand.cxx b/Source/cmOutputRequiredFilesCommand.cxx
index 54208ac..3b98c87 100644
--- a/Source/cmOutputRequiredFilesCommand.cxx
+++ b/Source/cmOutputRequiredFilesCommand.cxx
@@ -10,6 +10,7 @@
See the License for more information.
============================================================================*/
#include "cmOutputRequiredFilesCommand.h"
+
#include "cmAlgorithms.h"
#include <cmsys/FStream.hxx>
diff --git a/Source/cmParseArgumentsCommand.cxx b/Source/cmParseArgumentsCommand.cxx
index ca76c88..7fc8ae4 100644
--- a/Source/cmParseArgumentsCommand.cxx
+++ b/Source/cmParseArgumentsCommand.cxx
@@ -12,6 +12,7 @@
============================================================================*/
#include "cmParseArgumentsCommand.h"
+
#include "cmAlgorithms.h"
//----------------------------------------------------------------------------
diff --git a/Source/cmPolicies.cxx b/Source/cmPolicies.cxx
index bce69c5..68a9085 100644
--- a/Source/cmPolicies.cxx
+++ b/Source/cmPolicies.cxx
@@ -1,4 +1,5 @@
#include "cmPolicies.h"
+
#include "cmake.h"
#include "cmMakefile.h"
#include "cmVersion.h"
diff --git a/Source/cmProperty.cxx b/Source/cmProperty.cxx
index ef57068..4cdf650 100644
--- a/Source/cmProperty.cxx
+++ b/Source/cmProperty.cxx
@@ -10,6 +10,7 @@
See the License for more information.
============================================================================*/
#include "cmProperty.h"
+
#include "cmSystemTools.h"
void cmProperty::Set(const char *value)
diff --git a/Source/cmPropertyDefinition.cxx b/Source/cmPropertyDefinition.cxx
index 1af967c..9bb812e 100644
--- a/Source/cmPropertyDefinition.cxx
+++ b/Source/cmPropertyDefinition.cxx
@@ -10,6 +10,7 @@
See the License for more information.
============================================================================*/
#include "cmPropertyDefinition.h"
+
#include "cmSystemTools.h"
void cmPropertyDefinition
diff --git a/Source/cmPropertyDefinitionMap.cxx b/Source/cmPropertyDefinitionMap.cxx
index 776fad1..cfc4bc3 100644
--- a/Source/cmPropertyDefinitionMap.cxx
+++ b/Source/cmPropertyDefinitionMap.cxx
@@ -10,6 +10,7 @@
See the License for more information.
============================================================================*/
#include "cmPropertyDefinitionMap.h"
+
#include "cmSystemTools.h"
#include "cmDocumentationSection.h"
diff --git a/Source/cmPropertyMap.cxx b/Source/cmPropertyMap.cxx
index ef09dbc..e6b1529 100644
--- a/Source/cmPropertyMap.cxx
+++ b/Source/cmPropertyMap.cxx
@@ -10,6 +10,7 @@
See the License for more information.
============================================================================*/
#include "cmPropertyMap.h"
+
#include "cmSystemTools.h"
#include "cmake.h"
#include "cmState.h"
diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx
index 07fc239..f376caa 100644
--- a/Source/cmQtAutoGenerators.cxx
+++ b/Source/cmQtAutoGenerators.cxx
@@ -11,6 +11,8 @@
See the License for more information.
============================================================================*/
+#include "cmQtAutoGenerators.h"
+
#include "cmGlobalGenerator.h"
#include "cmOutputConverter.h"
#include "cmMakefile.h"
@@ -29,8 +31,6 @@
#include <unistd.h>
#endif
-#include "cmQtAutoGenerators.h"
-
static bool requiresMocing(const std::string& text, std::string ¯oName)
{
// this simple check is much much faster than the regexp
diff --git a/Source/cmQtAutoGenerators.h b/Source/cmQtAutoGenerators.h
index e46e0fc..04d2860 100644
--- a/Source/cmQtAutoGenerators.h
+++ b/Source/cmQtAutoGenerators.h
@@ -14,6 +14,8 @@
#ifndef cmQtAutoGenerators_h
#define cmQtAutoGenerators_h
+#include "cmStandardIncludes.h"
+
#include <list>
#include <vector>
#include <string>
diff --git a/Source/cmSearchPath.cxx b/Source/cmSearchPath.cxx
index c9cc817..01781b2 100644
--- a/Source/cmSearchPath.cxx
+++ b/Source/cmSearchPath.cxx
@@ -9,8 +9,8 @@
implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the License for more information.
============================================================================*/
-
#include "cmSearchPath.h"
+
#include "cmFindCommon.h"
#include "cmAlgorithms.h"
diff --git a/Source/cmSetPropertyCommand.cxx b/Source/cmSetPropertyCommand.cxx
index 17ad475..fc5c95a 100644
--- a/Source/cmSetPropertyCommand.cxx
+++ b/Source/cmSetPropertyCommand.cxx
@@ -10,6 +10,7 @@
See the License for more information.
============================================================================*/
#include "cmSetPropertyCommand.h"
+
#include "cmSetTargetPropertiesCommand.h"
#include "cmSetTestsPropertiesCommand.h"
#include "cmSetSourceFilesPropertiesCommand.h"
diff --git a/Source/cmSetTargetPropertiesCommand.cxx b/Source/cmSetTargetPropertiesCommand.cxx
index b1c13ac..b4c58d4 100644
--- a/Source/cmSetTargetPropertiesCommand.cxx
+++ b/Source/cmSetTargetPropertiesCommand.cxx
@@ -10,6 +10,7 @@
See the License for more information.
============================================================================*/
#include "cmSetTargetPropertiesCommand.h"
+
#include "cmGlobalGenerator.h"
// cmSetTargetPropertiesCommand
diff --git a/Source/cmSourceFile.h b/Source/cmSourceFile.h
index 1433b54..e5e2ab9 100644
--- a/Source/cmSourceFile.h
+++ b/Source/cmSourceFile.h
@@ -13,6 +13,7 @@
#define cmSourceFile_h
#include "cmSourceFileLocation.h"
+
#include "cmCustomCommand.h"
#include "cmPropertyMap.h"
diff --git a/Source/cmSourceGroup.h b/Source/cmSourceGroup.h
index e8cf519..316d725 100644
--- a/Source/cmSourceGroup.h
+++ b/Source/cmSourceGroup.h
@@ -13,6 +13,7 @@
#define cmSourceGroup_h
#include "cmStandardIncludes.h"
+
#include <cmsys/RegularExpression.hxx>
class cmSourceFile;
diff --git a/Source/cmStandardIncludes.h b/Source/cmStandardIncludes.h
index 272c136..83cbf67 100644
--- a/Source/cmStandardIncludes.h
+++ b/Source/cmStandardIncludes.h
@@ -17,6 +17,7 @@
#define cmStandardIncludes_h
#include <cmConfigure.h>
+
#include <cmsys/Configure.hxx>
#ifdef _MSC_VER
diff --git a/Source/cmState.h b/Source/cmState.h
index 7ead7e0..7b11034 100644
--- a/Source/cmState.h
+++ b/Source/cmState.h
@@ -13,6 +13,7 @@
#define cmState_h
#include "cmStandardIncludes.h"
+
#include "cmPropertyDefinitionMap.h"
#include "cmPropertyMap.h"
#include "cmLinkedTree.h"
diff --git a/Source/cmStringCommand.cxx b/Source/cmStringCommand.cxx
index 3c027a0..82c530c 100644
--- a/Source/cmStringCommand.cxx
+++ b/Source/cmStringCommand.cxx
@@ -10,6 +10,7 @@
See the License for more information.
============================================================================*/
#include "cmStringCommand.h"
+
#include "cmCryptoHash.h"
#include <cmsys/RegularExpression.hxx>
diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx
index 9af54bf..c36a339 100644
--- a/Source/cmSystemTools.cxx
+++ b/Source/cmSystemTools.cxx
@@ -9,8 +9,8 @@
implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the License for more information.
============================================================================*/
-
#include "cmSystemTools.h"
+
#include "cmAlgorithms.h"
#include <ctype.h>
#include <errno.h>
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index e118356..275dd6f 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -10,6 +10,7 @@
See the License for more information.
============================================================================*/
#include "cmTarget.h"
+
#include "cmake.h"
#include "cmMakefile.h"
#include "cmSourceFile.h"
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 4e97c2c..b398043 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -12,6 +12,8 @@
#ifndef cmTarget_h
#define cmTarget_h
+#include "cmStandardIncludes.h"
+
#include "cmCustomCommand.h"
#include "cmPropertyMap.h"
#include "cmPolicies.h"
diff --git a/Source/cmTest.cxx b/Source/cmTest.cxx
index 6fcd0dc..812e4d3 100644
--- a/Source/cmTest.cxx
+++ b/Source/cmTest.cxx
@@ -10,6 +10,7 @@
See the License for more information.
============================================================================*/
#include "cmTest.h"
+
#include "cmSystemTools.h"
#include "cmake.h"
diff --git a/Source/cmTest.h b/Source/cmTest.h
index ca88afe..44a2d00 100644
--- a/Source/cmTest.h
+++ b/Source/cmTest.h
@@ -12,6 +12,8 @@
#ifndef cmTest_h
#define cmTest_h
+#include "cmStandardIncludes.h"
+
#include "cmCustomCommand.h"
#include "cmPropertyMap.h"
#include "cmListFileCache.h"
diff --git a/Source/cmTimestamp.h b/Source/cmTimestamp.h
index 7c4b216..72d5cc2 100644
--- a/Source/cmTimestamp.h
+++ b/Source/cmTimestamp.h
@@ -12,6 +12,8 @@
#ifndef cmTimestamp_h
#define cmTimestamp_h
+#include "cmStandardIncludes.h"
+
#include <string>
#include <time.h>
diff --git a/Source/cmTryRunCommand.cxx b/Source/cmTryRunCommand.cxx
index d4a36c9..fdc9142 100644
--- a/Source/cmTryRunCommand.cxx
+++ b/Source/cmTryRunCommand.cxx
@@ -10,6 +10,7 @@
See the License for more information.
============================================================================*/
#include "cmTryRunCommand.h"
+
#include "cmTryCompileCommand.h"
#include <cmsys/FStream.hxx>
diff --git a/Source/cmUseMangledMesaCommand.cxx b/Source/cmUseMangledMesaCommand.cxx
index 2ee664f..057b67e 100644
--- a/Source/cmUseMangledMesaCommand.cxx
+++ b/Source/cmUseMangledMesaCommand.cxx
@@ -10,6 +10,7 @@
See the License for more information.
============================================================================*/
#include "cmUseMangledMesaCommand.h"
+
#include "cmSystemTools.h"
#include <cmsys/RegularExpression.hxx>
diff --git a/Source/cmVariableRequiresCommand.cxx b/Source/cmVariableRequiresCommand.cxx
index 1d33db1..a830842 100644
--- a/Source/cmVariableRequiresCommand.cxx
+++ b/Source/cmVariableRequiresCommand.cxx
@@ -10,6 +10,7 @@
See the License for more information.
============================================================================*/
#include "cmVariableRequiresCommand.h"
+
#include "cmState.h"
// cmLibraryCommand
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index 31873b5..7ff9f04 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -9,8 +9,9 @@
implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the License for more information.
============================================================================*/
-#include "windows.h"
#include "cmVisualStudio10TargetGenerator.h"
+
+#include "windows.h"
#include "cmGlobalVisualStudio10Generator.h"
#include "cmGeneratorTarget.h"
#include "cmComputeLinkInformation.h"
diff --git a/Source/cmVisualStudio10TargetGenerator.h b/Source/cmVisualStudio10TargetGenerator.h
index 044e0dd..6c946c9 100644
--- a/Source/cmVisualStudio10TargetGenerator.h
+++ b/Source/cmVisualStudio10TargetGenerator.h
@@ -11,6 +11,7 @@
============================================================================*/
#ifndef cmVisualStudioTargetGenerator_h
#define cmVisualStudioTargetGenerator_h
+
#include "cmStandardIncludes.h"
class cmMakefile;
diff --git a/Source/cmVisualStudioGeneratorOptions.cxx b/Source/cmVisualStudioGeneratorOptions.cxx
index bd4eb69..142e36f 100644
--- a/Source/cmVisualStudioGeneratorOptions.cxx
+++ b/Source/cmVisualStudioGeneratorOptions.cxx
@@ -1,4 +1,5 @@
#include "cmVisualStudioGeneratorOptions.h"
+
#include "cmOutputConverter.h"
#include "cmSystemTools.h"
#include "cmVisualStudio10TargetGenerator.h"
diff --git a/Source/cmVisualStudioWCEPlatformParser.cxx b/Source/cmVisualStudioWCEPlatformParser.cxx
index ca226fb..b6ee754 100644
--- a/Source/cmVisualStudioWCEPlatformParser.cxx
+++ b/Source/cmVisualStudioWCEPlatformParser.cxx
@@ -10,6 +10,7 @@
See the License for more information.
============================================================================*/
#include "cmVisualStudioWCEPlatformParser.h"
+
#include "cmGlobalVisualStudioGenerator.h"
#include "cmXMLParser.h"
diff --git a/Source/cmVisualStudioWCEPlatformParser.h b/Source/cmVisualStudioWCEPlatformParser.h
index 042df01..14f8df8 100644
--- a/Source/cmVisualStudioWCEPlatformParser.h
+++ b/Source/cmVisualStudioWCEPlatformParser.h
@@ -11,6 +11,7 @@
============================================================================*/
#ifndef cmVisualStudioWCEPlatformParser_h
#define cmVisualStudioWCEPlatformParser_h
+
#include "cmStandardIncludes.h"
#include "cmXMLParser.h"
diff --git a/Source/cmWhileCommand.cxx b/Source/cmWhileCommand.cxx
index 7bb78bf..5fdccaa 100644
--- a/Source/cmWhileCommand.cxx
+++ b/Source/cmWhileCommand.cxx
@@ -10,6 +10,7 @@
See the License for more information.
============================================================================*/
#include "cmWhileCommand.h"
+
#include "cmConditionEvaluator.h"
cmWhileFunctionBlocker::cmWhileFunctionBlocker(cmMakefile* mf):
diff --git a/Source/cmWhileCommand.h b/Source/cmWhileCommand.h
index 85a0bd3..902c55a 100644
--- a/Source/cmWhileCommand.h
+++ b/Source/cmWhileCommand.h
@@ -13,6 +13,7 @@
#define cmWhileCommand_h
#include "cmCommand.h"
+
#include "cmFunctionBlocker.h"
#include "cmListFileCache.h"
diff --git a/Source/cmWriteFileCommand.cxx b/Source/cmWriteFileCommand.cxx
index cc9f220..d52d6b5 100644
--- a/Source/cmWriteFileCommand.cxx
+++ b/Source/cmWriteFileCommand.cxx
@@ -10,6 +10,7 @@
See the License for more information.
============================================================================*/
#include "cmWriteFileCommand.h"
+
#include <cmsys/FStream.hxx>
#include <sys/types.h>
diff --git a/Source/cmXCode21Object.cxx b/Source/cmXCode21Object.cxx
index 3973540..bd055e5 100644
--- a/Source/cmXCode21Object.cxx
+++ b/Source/cmXCode21Object.cxx
@@ -10,6 +10,7 @@
See the License for more information.
============================================================================*/
#include "cmXCode21Object.h"
+
#include "cmSystemTools.h"
//----------------------------------------------------------------------------
diff --git a/Source/cmXCodeObject.cxx b/Source/cmXCodeObject.cxx
index 911e154..87b2e89 100644
--- a/Source/cmXCodeObject.cxx
+++ b/Source/cmXCodeObject.cxx
@@ -10,6 +10,7 @@
See the License for more information.
============================================================================*/
#include "cmXCodeObject.h"
+
#include "cmSystemTools.h"
#include <CoreFoundation/CoreFoundation.h> // CFUUIDCreate
diff --git a/Source/cmXCodeObject.h b/Source/cmXCodeObject.h
index 2d876da..d00cf0f 100644
--- a/Source/cmXCodeObject.h
+++ b/Source/cmXCodeObject.h
@@ -13,6 +13,7 @@
#define cmXCodeObject_h
#include "cmStandardIncludes.h"
+
class cmGeneratorTarget;
class cmXCodeObject
diff --git a/Source/cmXMLParser.cxx b/Source/cmXMLParser.cxx
index 1d3e0e9..6a24faa 100644
--- a/Source/cmXMLParser.cxx
+++ b/Source/cmXMLParser.cxx
@@ -10,6 +10,7 @@
See the License for more information.
============================================================================*/
#include "cmXMLParser.h"
+
#include <cmsys/FStream.hxx>
#include <cm_expat.h>
diff --git a/Source/cmXMLSafe.h b/Source/cmXMLSafe.h
index ead2e01..981359a 100644
--- a/Source/cmXMLSafe.h
+++ b/Source/cmXMLSafe.h
@@ -13,6 +13,7 @@
#define cmXMLSafe_h
#include <cmsys/Configure.hxx>
+
#include <string>
#include <iosfwd>
diff --git a/Source/cmXMLWriter.cxx b/Source/cmXMLWriter.cxx
index 6a9172a..ec26467 100644
--- a/Source/cmXMLWriter.cxx
+++ b/Source/cmXMLWriter.cxx
@@ -10,6 +10,7 @@
See the License for more information.
============================================================================*/
#include "cmXMLWriter.h"
+
#include "cmXMLSafe.h"
#include <cassert>
diff --git a/Source/cmXMLWriter.h b/Source/cmXMLWriter.h
index 3083059..8fedcd4 100644
--- a/Source/cmXMLWriter.h
+++ b/Source/cmXMLWriter.h
@@ -13,6 +13,7 @@
#define cmXMLWiter_h
#include "cmStandardIncludes.h"
+
#include "cmXMLSafe.h"
#include <ostream>
diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index 8e3380f..f336384 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -10,6 +10,7 @@
See the License for more information.
============================================================================*/
#include "cmake.h"
+
#include "cmMakefile.h"
#include "cmLocalGenerator.h"
#include "cmExternalMakefileProjectGenerator.h"
diff --git a/Source/cmake.h b/Source/cmake.h
index 8644dda..8fb4195 100644
--- a/Source/cmake.h
+++ b/Source/cmake.h
@@ -13,6 +13,8 @@
#ifndef cmake_h
#define cmake_h
+#include "cmStandardIncludes.h"
+
#include "cmListFileCache.h"
#include "cmSystemTools.h"
#include "cmInstalledFile.h"
diff --git a/Source/cmakexbuild.cxx b/Source/cmakexbuild.cxx
index 9aaeeaa..03059f5 100644
--- a/Source/cmakexbuild.cxx
+++ b/Source/cmakexbuild.cxx
@@ -9,8 +9,9 @@
implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the License for more information.
============================================================================*/
-#include <cmsys/Process.h>
#include "cmStandardIncludes.h"
+
+#include <cmsys/Process.h>
#include "cmSystemTools.h"
// This is a wrapper program for xcodebuild
diff --git a/Source/cmcldeps.cxx b/Source/cmcldeps.cxx
index f3c6059..3f3ec4d 100644
--- a/Source/cmcldeps.cxx
+++ b/Source/cmcldeps.cxx
@@ -19,11 +19,11 @@
// /showIncludes is equivalent to -MD, not -MMD, that is, system headers are
// included.
+#include <cmSystemTools.h>
+#include <cmsys/Encoding.hxx>
#include <windows.h>
#include <sstream>
-#include <cmSystemTools.h>
-#include <cmsys/Encoding.hxx>
// We don't want any wildcard expansion.
// See http://msdn.microsoft.com/en-us/library/zay8tzh6(v=vs.85).aspx
diff --git a/Source/cmcmd.cxx b/Source/cmcmd.cxx
index 0b9518c..2b153bd 100644
--- a/Source/cmcmd.cxx
+++ b/Source/cmcmd.cxx
@@ -10,6 +10,7 @@
See the License for more information.
============================================================================*/
#include "cmcmd.h"
+
#include "cmMakefile.h"
#include "cmLocalGenerator.h"
#include "cmGlobalGenerator.h"
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0e7bca923e65df8fda37dd50ca68c7207eb3acbe
commit 0e7bca923e65df8fda37dd50ca68c7207eb3acbe
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Apr 29 08:49:35 2016 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Fri Apr 29 10:56:59 2016 -0400
Utilities/Release: Stabilize include order in WiX custom action
In `detect_nsis_overwrite.cpp` we include windows.h first, and we must
preserve that. Place the include in an isolated block so that tools
that sort includes do not move it.
diff --git a/Utilities/Release/WiX/CustomAction/detect_nsis_overwrite.cpp b/Utilities/Release/WiX/CustomAction/detect_nsis_overwrite.cpp
index dad1ae5..d4f628c 100644
--- a/Utilities/Release/WiX/CustomAction/detect_nsis_overwrite.cpp
+++ b/Utilities/Release/WiX/CustomAction/detect_nsis_overwrite.cpp
@@ -1,4 +1,5 @@
#include <windows.h>
+
#include <msi.h>
#include <msiquery.h>
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=eb817be034e0fd50b7abfc3ae032e2e06cbfd040
commit eb817be034e0fd50b7abfc3ae032e2e06cbfd040
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Apr 29 09:07:46 2016 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Fri Apr 29 10:56:59 2016 -0400
Tests: Stabilize include order in MFC, VSXaml, and VSWinStorePhone
These tests use a precompiled header that must be included first.
Include the header in an isolated block so that tools that sort
includes do not move it.
diff --git a/Tests/MFC/mfc1/ChildFrm.cpp b/Tests/MFC/mfc1/ChildFrm.cpp
index b04c4f2..889cceb 100644
--- a/Tests/MFC/mfc1/ChildFrm.cpp
+++ b/Tests/MFC/mfc1/ChildFrm.cpp
@@ -1,6 +1,8 @@
// ChildFrm.cpp : implementation of the CChildFrame class
//
+
#include "stdafx.h"
+
#include "mfc1.h"
#include "ChildFrm.h"
diff --git a/Tests/MFC/mfc1/MainFrm.cpp b/Tests/MFC/mfc1/MainFrm.cpp
index 44554bf..222c3da 100644
--- a/Tests/MFC/mfc1/MainFrm.cpp
+++ b/Tests/MFC/mfc1/MainFrm.cpp
@@ -2,6 +2,7 @@
//
#include "stdafx.h"
+
#include "mfc1.h"
#include "MainFrm.h"
diff --git a/Tests/MFC/mfc1/mfc1.cpp b/Tests/MFC/mfc1/mfc1.cpp
index 9530cd2..057e1d5 100644
--- a/Tests/MFC/mfc1/mfc1.cpp
+++ b/Tests/MFC/mfc1/mfc1.cpp
@@ -2,6 +2,7 @@
//
#include "stdafx.h"
+
#include "mfc1.h"
#include "MainFrm.h"
diff --git a/Tests/MFC/mfc1/mfc1Doc.cpp b/Tests/MFC/mfc1/mfc1Doc.cpp
index 8767052..db76b06 100644
--- a/Tests/MFC/mfc1/mfc1Doc.cpp
+++ b/Tests/MFC/mfc1/mfc1Doc.cpp
@@ -2,6 +2,7 @@
//
#include "stdafx.h"
+
#include "mfc1.h"
#include "mfc1Doc.h"
diff --git a/Tests/MFC/mfc1/mfc1View.cpp b/Tests/MFC/mfc1/mfc1View.cpp
index 06c7652..8000302 100644
--- a/Tests/MFC/mfc1/mfc1View.cpp
+++ b/Tests/MFC/mfc1/mfc1View.cpp
@@ -2,6 +2,7 @@
//
#include "stdafx.h"
+
#include "mfc1.h"
#include "mfc1Doc.h"
diff --git a/Tests/VSWinStorePhone/Direct3DApp1/CubeRenderer.cpp b/Tests/VSWinStorePhone/Direct3DApp1/CubeRenderer.cpp
index f4827f2..7632388 100644
--- a/Tests/VSWinStorePhone/Direct3DApp1/CubeRenderer.cpp
+++ b/Tests/VSWinStorePhone/Direct3DApp1/CubeRenderer.cpp
@@ -1,4 +1,5 @@
#include "pch.h"
+
#include "CubeRenderer.h"
using namespace DirectX;
diff --git a/Tests/VSWinStorePhone/Direct3DApp1/Direct3DApp1.cpp b/Tests/VSWinStorePhone/Direct3DApp1/Direct3DApp1.cpp
index 3dbb97f..3cfc589 100644
--- a/Tests/VSWinStorePhone/Direct3DApp1/Direct3DApp1.cpp
+++ b/Tests/VSWinStorePhone/Direct3DApp1/Direct3DApp1.cpp
@@ -1,4 +1,5 @@
#include "pch.h"
+
#include "Direct3DApp1.h"
#include "BasicTimer.h"
diff --git a/Tests/VSWinStorePhone/Direct3DApp1/Direct3DApp1.h b/Tests/VSWinStorePhone/Direct3DApp1/Direct3DApp1.h
index 40b69a1..6861e44 100644
--- a/Tests/VSWinStorePhone/Direct3DApp1/Direct3DApp1.h
+++ b/Tests/VSWinStorePhone/Direct3DApp1/Direct3DApp1.h
@@ -1,6 +1,7 @@
#pragma once
#include "pch.h"
+
#include "CubeRenderer.h"
ref class Direct3DApp1 sealed : public Windows::ApplicationModel::Core::IFrameworkView
diff --git a/Tests/VSWinStorePhone/Direct3DApp1/Direct3DBase.cpp b/Tests/VSWinStorePhone/Direct3DApp1/Direct3DBase.cpp
index 46727b5..f09c8da 100644
--- a/Tests/VSWinStorePhone/Direct3DApp1/Direct3DBase.cpp
+++ b/Tests/VSWinStorePhone/Direct3DApp1/Direct3DBase.cpp
@@ -1,4 +1,5 @@
#include "pch.h"
+
#include "Direct3DBase.h"
using namespace DirectX;
diff --git a/Tests/VSXaml/App.xaml.cpp b/Tests/VSXaml/App.xaml.cpp
index 334dc1f..2cb2b32 100644
--- a/Tests/VSXaml/App.xaml.cpp
+++ b/Tests/VSXaml/App.xaml.cpp
@@ -4,6 +4,7 @@
//
#include "pch.h"
+
#include "MainPage.xaml.h"
using namespace VSXaml;
@@ -122,4 +123,4 @@ void App::OnSuspending(Object^ sender, SuspendingEventArgs^ e)
void App::OnNavigationFailed(Platform::Object ^sender, Windows::UI::Xaml::Navigation::NavigationFailedEventArgs ^e)
{
throw ref new FailureException("Failed to load Page " + e->SourcePageType.Name);
-}
\ No newline at end of file
+}
diff --git a/Tests/VSXaml/MainPage.xaml.cpp b/Tests/VSXaml/MainPage.xaml.cpp
index d0a64e8..63f2dec 100644
--- a/Tests/VSXaml/MainPage.xaml.cpp
+++ b/Tests/VSXaml/MainPage.xaml.cpp
@@ -4,6 +4,7 @@
//
#include "pch.h"
+
#include "MainPage.xaml.h"
using namespace VSXaml;
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=eda313b485a9252c176090a8c358127a2116551d
commit eda313b485a9252c176090a8c358127a2116551d
Author: Daniel Pfeifer <daniel at pfeifer-mail.de>
AuthorDate: Wed Apr 27 23:29:43 2016 +0200
Commit: Brad King <brad.king at kitware.com>
CommitDate: Fri Apr 29 10:56:58 2016 -0400
Tests: Stabilize include order in StringFileTest
This test generates a header file which is not self-contained.
Include it in a separate block of includes so that tools that
sort includes do not move it.
diff --git a/Tests/StringFileTest/StringFile.cxx b/Tests/StringFileTest/StringFile.cxx
index 9eba6bf..073e30c 100644
--- a/Tests/StringFileTest/StringFile.cxx
+++ b/Tests/StringFileTest/StringFile.cxx
@@ -1,5 +1,6 @@
#include <stdio.h>
#include <string.h>
+
#include "OutputFile.h"
int main(int, char*[])
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7110b754fe8dc82c4e18c7de72e8eedcec4561da
commit 7110b754fe8dc82c4e18c7de72e8eedcec4561da
Author: Daniel Pfeifer <daniel at pfeifer-mail.de>
AuthorDate: Wed Apr 27 22:47:02 2016 +0200
Commit: Brad King <brad.king at kitware.com>
CommitDate: Fri Apr 29 09:12:32 2016 -0400
CursesDialog: add missing cmState include
diff --git a/Source/CursesDialog/cmCursesMainForm.h b/Source/CursesDialog/cmCursesMainForm.h
index 255c823..d194168 100644
--- a/Source/CursesDialog/cmCursesMainForm.h
+++ b/Source/CursesDialog/cmCursesMainForm.h
@@ -13,6 +13,7 @@
#define cmCursesMainForm_h
#include "../cmStandardIncludes.h"
+#include "../cmState.h"
#include "cmCursesForm.h"
#include "cmCursesStandardIncludes.h"
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d7a5f25599552b0d4dc7af59fef8af1addc090f1
commit d7a5f25599552b0d4dc7af59fef8af1addc090f1
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Apr 28 11:16:44 2016 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Fri Apr 29 09:12:32 2016 -0400
Modules: Remove unused CMakeTestWatcomVersion.c file
This file has not been used since commit v2.8.10~218^2~7^2 (Watcom:
Simplify compiler version detection, 2012-08-13).
diff --git a/Modules/CMakeTestWatcomVersion.c b/Modules/CMakeTestWatcomVersion.c
deleted file mode 100644
index 0343fb1..0000000
--- a/Modules/CMakeTestWatcomVersion.c
+++ /dev/null
@@ -1 +0,0 @@
-VERSION=__WATCOMC__
-----------------------------------------------------------------------
Summary of changes:
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list