[Cmake-commits] CMake branch, next, updated. v3.5.2-1149-g47be515
Brad King
brad.king at kitware.com
Fri Apr 29 11:38:59 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 47be51557ad4a5396c4b5fd231537c308cd637ae (commit)
via c8bdd9ed8746e6bcd3267953fd80fbfdbb271214 (commit)
from 76499b4e676225eb770fc880457e7271114f41a1 (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=47be51557ad4a5396c4b5fd231537c308cd637ae
commit 47be51557ad4a5396c4b5fd231537c308cd637ae
Merge: 76499b4 c8bdd9e
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Apr 29 11:38:54 2016 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Apr 29 11:38:54 2016 -0400
Merge topic 'clang-format-include-order' into next
c8bdd9ed Revise topic 'clang-format-include-order'
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c8bdd9ed8746e6bcd3267953fd80fbfdbb271214
commit c8bdd9ed8746e6bcd3267953fd80fbfdbb271214
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Apr 29 11:33:17 2016 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Fri Apr 29 11:33:55 2016 -0400
Revise topic 'clang-format-include-order'
Fix up the topic head with changes made in a rewritten version
of the topic.
diff --git a/Source/CPack/WiX/cmCPackWIXGenerator.h b/Source/CPack/WiX/cmCPackWIXGenerator.h
index a96f8b7..871527b 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 <map>
#include <string>
diff --git a/Source/CPack/WiX/cmWIXAccessControlList.h b/Source/CPack/WiX/cmWIXAccessControlList.h
index 3f8a913..7293995 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 <CPack/cmCPackLog.h>
#include <cmInstalledFile.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 2cde353..446ce96 100644
--- a/Source/CPack/WiX/cmWIXFilesSourceWriter.cxx
+++ b/Source/CPack/WiX/cmWIXFilesSourceWriter.cxx
@@ -11,12 +11,13 @@
============================================================================*/
#include "cmWIXFilesSourceWriter.h"
+
#include "cmWIXAccessControlList.h"
#include <cmInstalledFile.h>
-#include <sys/stat.h>
#include <sys/types.h>
+#include <sys/stat.h>
cmWIXFilesSourceWriter::cmWIXFilesSourceWriter(cmCPackLog* logger,
std::string const& filename):
diff --git a/Source/CPack/WiX/cmWIXFilesSourceWriter.h b/Source/CPack/WiX/cmWIXFilesSourceWriter.h
index cf4ebb2..734f901 100644
--- a/Source/CPack/WiX/cmWIXFilesSourceWriter.h
+++ b/Source/CPack/WiX/cmWIXFilesSourceWriter.h
@@ -13,9 +13,10 @@
#ifndef cmWIXFilesSourceWriter_h
#define cmWIXFilesSourceWriter_h
+#include "cmWIXSourceWriter.h"
+
#include "cmWIXPatch.h"
#include "cmWIXShortcut.h"
-#include "cmWIXSourceWriter.h"
#include <CPack/cmCPackGenerator.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 35fddea..598aa0d 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 <map>
#include <set>
#include <string>
#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 49a5089..2bf9674 100644
--- a/Source/CPack/WiX/cmWIXSourceWriter.h
+++ b/Source/CPack/WiX/cmWIXSourceWriter.h
@@ -13,12 +13,13 @@
#ifndef cmWIXSourceWriter_h
#define cmWIXSourceWriter_h
+#include <CPack/cmCPackLog.h>
+
#include <cmsys/FStream.hxx>
+
#include <string>
#include <vector>
-#include <CPack/cmCPackLog.h>
-
/** \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 f255bcf..b847589 100644
--- a/Source/CPack/cmCPackComponentGroup.cxx
+++ b/Source/CPack/cmCPackComponentGroup.cxx
@@ -11,7 +11,9 @@
============================================================================*/
#include "cmCPackComponentGroup.h"
+
#include "cmSystemTools.h"
+
#include <string>
#include <vector>
diff --git a/Source/CPack/cmCPackDebGenerator.cxx b/Source/CPack/cmCPackDebGenerator.cxx
index 8aa38c4..9e17bc8 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 "cmArchiveWrite.h"
@@ -759,8 +760,8 @@ std::string cmCPackDebGenerator::GetComponentInstallDirNameSuffix(
* SUCH DAMAGE.
*/
-#include <sys/stat.h>
#include <sys/types.h>
+#include <sys/stat.h>
#include <stdio.h>
#include <stdlib.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 8b343d3..b9c9c85 100644
--- a/Source/CPack/cmCPackDragNDropGenerator.cxx
+++ b/Source/CPack/cmCPackDragNDropGenerator.cxx
@@ -11,6 +11,7 @@
============================================================================*/
#include "cmCPackDragNDropGenerator.h"
+
#include "cmCPackLog.h"
#include "cmGeneratedFileStream.h"
#include "cmSystemTools.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/cmCPackGeneratorFactory.cxx b/Source/CPack/cmCPackGeneratorFactory.cxx
index 0cdef96..669964d 100644
--- a/Source/CPack/cmCPackGeneratorFactory.cxx
+++ b/Source/CPack/cmCPackGeneratorFactory.cxx
@@ -24,10 +24,10 @@
#include "cmCPackZIPGenerator.h"
#ifdef __APPLE__
-# include "cmCPackBundleGenerator.h"
-# include "cmCPackDragNDropGenerator.h"
-# include "cmCPackOSXX11Generator.h"
-# include "cmCPackPackageMakerGenerator.h"
+# include "cmCPackBundleGenerator.h"
+# include "cmCPackDragNDropGenerator.h"
+# include "cmCPackOSXX11Generator.h"
+# include "cmCPackPackageMakerGenerator.h"
#endif
#ifdef __CYGWIN__
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 93411e2..1d7ef69 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 "cmCPackLog.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.cxx b/Source/CPack/cmCPackSTGZGenerator.cxx
index 289cde8..8a83666 100644
--- a/Source/CPack/cmCPackSTGZGenerator.cxx
+++ b/Source/CPack/cmCPackSTGZGenerator.cxx
@@ -18,9 +18,9 @@
#include "cmSystemTools.h"
#include "cmake.h"
+#include <sys/types.h>
#include <cmsys/FStream.hxx>
#include <sys/stat.h>
-#include <sys/types.h>
//----------------------------------------------------------------------
cmCPackSTGZGenerator::cmCPackSTGZGenerator()
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 25544f4..41f4f12 100644
--- a/Source/CTest/cmCTestBatchTestHandler.cxx
+++ b/Source/CTest/cmCTestBatchTestHandler.cxx
@@ -10,10 +10,11 @@
See the License for more information.
============================================================================*/
-#include "cmStandardIncludes.h"
#include "cmCTestBatchTestHandler.h"
+
#include "cmCTest.h"
#include "cmProcess.h"
+#include "cmStandardIncludes.h"
#include "cmSystemTools.h"
#include <stdlib.h>
diff --git a/Source/CTest/cmCTestBatchTestHandler.h b/Source/CTest/cmCTestBatchTestHandler.h
index 2dc1aa4..b0fc8d5 100644
--- a/Source/CTest/cmCTestBatchTestHandler.h
+++ b/Source/CTest/cmCTestBatchTestHandler.h
@@ -14,6 +14,7 @@
#define cmCTestBatchTestHandler_h
#include <cmStandardIncludes.h>
+
#include <cmCTestMultiProcessHandler.h>
#include <cmCTestRunTest.h>
#include <cmCTestTestHandler.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.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/cmCTestGIT.cxx b/Source/CTest/cmCTestGIT.cxx
index 19d869c..3ff12c1 100644
--- a/Source/CTest/cmCTestGIT.cxx
+++ b/Source/CTest/cmCTestGIT.cxx
@@ -19,8 +19,8 @@
#include <cmsys/Process.h>
#include <cmsys/RegularExpression.hxx>
-#include <ctype.h>
#include <sys/types.h>
+#include <ctype.h>
#include <time.h>
//----------------------------------------------------------------------------
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 f254372..7a7e034 100644
--- a/Source/CTest/cmCTestGenericHandler.h
+++ b/Source/CTest/cmCTestGenericHandler.h
@@ -13,8 +13,9 @@
#ifndef cmCTestGenericHandler_h
#define cmCTestGenericHandler_h
-#include "cmCTest.h"
#include "cmObject.h"
+
+#include "cmCTest.h"
#include "cmSystemTools.h" //OutputOption
class cmMakefile;
diff --git a/Source/CTest/cmCTestLaunch.cxx b/Source/CTest/cmCTestLaunch.cxx
index 333524f..03b06f8 100644
--- a/Source/CTest/cmCTestLaunch.cxx
+++ b/Source/CTest/cmCTestLaunch.cxx
@@ -23,7 +23,7 @@
#ifdef _WIN32
#include <fcntl.h> // for _O_BINARY
-#include <io.h> // for _setmode
+#include <io.h> // for _setmode
#include <stdio.h> // for std{out,err} and fileno
#endif
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 e1a3b6b..9e3ba57 100644
--- a/Source/CTest/cmCTestMemCheckHandler.cxx
+++ b/Source/CTest/cmCTestMemCheckHandler.cxx
@@ -11,6 +11,7 @@
============================================================================*/
#include "cmCTestMemCheckHandler.h"
+
#include "cmCTest.h"
#include "cmGeneratedFileStream.h"
#include "cmMakefile.h"
diff --git a/Source/CTest/cmCTestMemCheckHandler.h b/Source/CTest/cmCTestMemCheckHandler.h
index cf01b04..6232924 100644
--- a/Source/CTest/cmCTestMemCheckHandler.h
+++ b/Source/CTest/cmCTestMemCheckHandler.h
@@ -13,8 +13,8 @@
#ifndef cmCTestMemCheckHandler_h
#define cmCTestMemCheckHandler_h
-#include "cmStandardIncludes.h"
#include "cmCTestTestHandler.h"
+
#include "cmListFileCache.h"
#include <string>
#include <vector>
diff --git a/Source/CTest/cmCTestMultiProcessHandler.cxx b/Source/CTest/cmCTestMultiProcessHandler.cxx
index 5b08ec8..1434518 100644
--- a/Source/CTest/cmCTestMultiProcessHandler.cxx
+++ b/Source/CTest/cmCTestMultiProcessHandler.cxx
@@ -11,10 +11,10 @@
============================================================================*/
#include "cmCTestMultiProcessHandler.h"
-#include "cmStandardIncludes.h"
#include "cmCTest.h"
#include "cmCTestScriptHandler.h"
#include "cmProcess.h"
+#include "cmStandardIncludes.h"
#include "cmSystemTools.h"
#include <cmsys/FStream.hxx>
#include <cmsys/SystemInformation.hxx>
diff --git a/Source/CTest/cmCTestMultiProcessHandler.h b/Source/CTest/cmCTestMultiProcessHandler.h
index 81b6a02..64e56e6 100644
--- a/Source/CTest/cmCTestMultiProcessHandler.h
+++ b/Source/CTest/cmCTestMultiProcessHandler.h
@@ -12,10 +12,10 @@
#ifndef cmCTestMultiProcessHandler_h
#define cmCTestMultiProcessHandler_h
-#include <cmStandardIncludes.h>
-#include <cmCTestRunTest.h>
#include <cmCTestTestHandler.h>
+#include <cmCTestRunTest.h>
+
/** \class cmCTestMultiProcessHandler
* \brief run parallel ctest
*
diff --git a/Source/CTest/cmCTestP4.cxx b/Source/CTest/cmCTestP4.cxx
index b801cfc..f7c960c 100644
--- a/Source/CTest/cmCTestP4.cxx
+++ b/Source/CTest/cmCTestP4.cxx
@@ -17,8 +17,8 @@
#include <cmsys/Process.h>
#include <cmsys/RegularExpression.hxx>
-#include <ctype.h>
#include <sys/types.h>
+#include <ctype.h>
#include <time.h>
//----------------------------------------------------------------------------
diff --git a/Source/CTest/cmCTestP4.h b/Source/CTest/cmCTestP4.h
index b48f06b..d666bd8 100644
--- a/Source/CTest/cmCTestP4.h
+++ b/Source/CTest/cmCTestP4.h
@@ -13,6 +13,7 @@
#define cmCTestP4_h
#include "cmCTestGlobalVC.h"
+
#include <map>
#include <vector>
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 5555af9..5d159c1 100644
--- a/Source/CTest/cmCTestRunTest.cxx
+++ b/Source/CTest/cmCTestRunTest.cxx
@@ -9,6 +9,7 @@
implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the License for more information.
============================================================================*/
+
#include "cmCTestRunTest.h"
#include "cmCTest.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 21170fb..ebc8c36 100644
--- a/Source/CTest/cmCTestSubmitCommand.h
+++ b/Source/CTest/cmCTestSubmitCommand.h
@@ -12,9 +12,10 @@
#ifndef cmCTestSubmitCommand_h
#define cmCTestSubmitCommand_h
-#include "cmCTest.h"
#include "cmCTestHandlerCommand.h"
+#include "cmCTest.h"
+
/** \class cmCTestSubmit
* \brief Run a ctest script
*
diff --git a/Source/CTest/cmCTestSubmitHandler.cxx b/Source/CTest/cmCTestSubmitHandler.cxx
index 2cb90f5..6a65839 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 "cmCTest.h"
#include "cmCTestScriptHandler.h"
#include "cmGeneratedFileStream.h"
diff --git a/Source/CTest/cmCTestTestHandler.cxx b/Source/CTest/cmCTestTestHandler.cxx
index 388fab0..d8229da 100644
--- a/Source/CTest/cmCTestTestHandler.cxx
+++ b/Source/CTest/cmCTestTestHandler.cxx
@@ -9,6 +9,7 @@
implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the License for more information.
============================================================================*/
+
#include "cmCTestTestHandler.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 5c145c0..1802254 100644
--- a/Source/CTest/cmCTestUploadCommand.h
+++ b/Source/CTest/cmCTestUploadCommand.h
@@ -12,9 +12,10 @@
#ifndef cmCTestUploadCommand_h
#define cmCTestUploadCommand_h
-#include "cmCTest.h"
#include "cmCTestHandlerCommand.h"
+#include "cmCTest.h"
+
/** \class cmCTestUpload
* \brief Run a ctest script
*
diff --git a/Source/CTest/cmParseBlanketJSCoverage.cxx b/Source/CTest/cmParseBlanketJSCoverage.cxx
index 2b3146e..1f1db3e 100644
--- a/Source/CTest/cmParseBlanketJSCoverage.cxx
+++ b/Source/CTest/cmParseBlanketJSCoverage.cxx
@@ -11,7 +11,6 @@
============================================================================*/
#include "cmParseBlanketJSCoverage.h"
-#include "cmStandardIncludes.h"
#include "cmSystemTools.h"
#include <cmsys/Directory.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 168a297..f838087 100644
--- a/Source/CTest/cmParseCacheCoverage.cxx
+++ b/Source/CTest/cmParseCacheCoverage.cxx
@@ -1,6 +1,5 @@
#include "cmParseCacheCoverage.h"
-#include "cmStandardIncludes.h"
#include "cmSystemTools.h"
#include <cmsys/Directory.hxx>
#include <cmsys/FStream.hxx>
diff --git a/Source/CTest/cmParseCoberturaCoverage.cxx b/Source/CTest/cmParseCoberturaCoverage.cxx
index d07b52a..5b4a376 100644
--- a/Source/CTest/cmParseCoberturaCoverage.cxx
+++ b/Source/CTest/cmParseCoberturaCoverage.cxx
@@ -1,6 +1,5 @@
#include "cmParseCoberturaCoverage.h"
-#include "cmStandardIncludes.h"
#include "cmSystemTools.h"
#include "cmXMLParser.h"
#include <cmsys/Directory.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 1a71234..09c4f02 100644
--- a/Source/CTest/cmParseDelphiCoverage.cxx
+++ b/Source/CTest/cmParseDelphiCoverage.cxx
@@ -1,6 +1,5 @@
#include "cmParseDelphiCoverage.h"
-#include "cmStandardIncludes.h"
#include "cmSystemTools.h"
#include "cmXMLParser.h"
#include <cmsys/Directory.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 7e0c610..ae7dedb 100644
--- a/Source/CTest/cmParseGTMCoverage.cxx
+++ b/Source/CTest/cmParseGTMCoverage.cxx
@@ -1,6 +1,5 @@
#include "cmParseGTMCoverage.h"
-#include "cmStandardIncludes.h"
#include "cmSystemTools.h"
#include <cmsys/Directory.hxx>
#include <cmsys/FStream.hxx>
diff --git a/Source/CTest/cmParseJacocoCoverage.cxx b/Source/CTest/cmParseJacocoCoverage.cxx
index a4f8fdb..d9c4ffb 100644
--- a/Source/CTest/cmParseJacocoCoverage.cxx
+++ b/Source/CTest/cmParseJacocoCoverage.cxx
@@ -1,6 +1,5 @@
#include "cmParseJacocoCoverage.h"
-#include "cmStandardIncludes.h"
#include "cmSystemTools.h"
#include "cmXMLParser.h"
#include <cmsys/Directory.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 03e346e..d0c7599 100644
--- a/Source/CTest/cmParseMumpsCoverage.cxx
+++ b/Source/CTest/cmParseMumpsCoverage.cxx
@@ -1,6 +1,5 @@
#include "cmParseGTMCoverage.h"
-#include "cmStandardIncludes.h"
#include "cmSystemTools.h"
#include <cmsys/Directory.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 7a19a80..7c2901e 100644
--- a/Source/CTest/cmParsePHPCoverage.cxx
+++ b/Source/CTest/cmParsePHPCoverage.cxx
@@ -1,6 +1,5 @@
#include "cmParsePHPCoverage.h"
-#include "cmStandardIncludes.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/QtDialog/AddCacheEntry.cxx b/Source/QtDialog/AddCacheEntry.cxx
index 8412ffa..efb2b65 100644
--- a/Source/QtDialog/AddCacheEntry.cxx
+++ b/Source/QtDialog/AddCacheEntry.cxx
@@ -11,6 +11,7 @@
============================================================================*/
#include "AddCacheEntry.h"
+
#include <QCompleter>
#include <QMetaProperty>
diff --git a/Source/QtDialog/AddCacheEntry.h b/Source/QtDialog/AddCacheEntry.h
index eb9db13..7c08af6 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 <QCheckBox>
#include <QStringList>
#include <QWidget>
-#include "QCMake.h"
#include "ui_AddCacheEntry.h"
class AddCacheEntry : public QWidget, public Ui::AddCacheEntry
diff --git a/Source/QtDialog/CMakeSetupDialog.cxx b/Source/QtDialog/CMakeSetupDialog.cxx
index 54d2f3e..945739d 100644
--- a/Source/QtDialog/CMakeSetupDialog.cxx
+++ b/Source/QtDialog/CMakeSetupDialog.cxx
@@ -11,6 +11,7 @@
============================================================================*/
#include "CMakeSetupDialog.h"
+
#include <QCloseEvent>
#include <QCoreApplication>
#include <QDialogButtonBox>
diff --git a/Source/QtDialog/CMakeSetupDialog.h b/Source/QtDialog/CMakeSetupDialog.h
index 01eb3ec..f9624d1 100644
--- a/Source/QtDialog/CMakeSetupDialog.h
+++ b/Source/QtDialog/CMakeSetupDialog.h
@@ -14,6 +14,7 @@
#define CMakeSetupDialog_h
#include "QCMake.h"
+
#include "ui_CMakeSetupDialog.h"
#include <QEventLoop>
#include <QMainWindow>
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 f644237..5c0af2b 100644
--- a/Source/QtDialog/FirstConfigure.cxx
+++ b/Source/QtDialog/FirstConfigure.cxx
@@ -1,5 +1,6 @@
#include "FirstConfigure.h"
+
#include "Compilers.h"
#include <QComboBox>
diff --git a/Source/QtDialog/FirstConfigure.h b/Source/QtDialog/FirstConfigure.h
index 3371005..3c574d4 100644
--- a/Source/QtDialog/FirstConfigure.h
+++ b/Source/QtDialog/FirstConfigure.h
@@ -2,11 +2,13 @@
#ifndef FirstConfigure_h
#define FirstConfigure_h
+#include <QWizard>
+#include <QWizardPage>
+
#include "cmake.h"
+
#include "ui_Compilers.h"
#include "ui_CrossCompiler.h"
-#include <QWizard>
-#include <QWizardPage>
class QRadioButton;
class QComboBox;
diff --git a/Source/QtDialog/QCMake.h b/Source/QtDialog/QCMake.h
index 825a9aa..5cae06d 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 <QStringList>
#include <QVariant>
-#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 602742c..5631b86 100644
--- a/Source/QtDialog/QCMakeCacheView.h
+++ b/Source/QtDialog/QCMakeCacheView.h
@@ -14,6 +14,7 @@
#define QCMakeCacheView_h
#include "QCMake.h"
+
#include <QItemDelegate>
#include <QSet>
#include <QStandardItemModel>
diff --git a/Source/QtDialog/QCMakeWidgets.h b/Source/QtDialog/QCMakeWidgets.h
index f6354a4..759b635 100644
--- a/Source/QtDialog/QCMakeWidgets.h
+++ b/Source/QtDialog/QCMakeWidgets.h
@@ -16,6 +16,7 @@
#include <QComboBox>
#include <QCompleter>
#include <QLineEdit>
+
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 65ef0b5..b203a22 100644
--- a/Source/cmCPluginAPI.cxx
+++ b/Source/cmCPluginAPI.cxx
@@ -15,6 +15,7 @@
methods on the CMake classes. */
#include "cmCPluginAPI.h"
+
#include "cmMakefile.h"
#include "cmVersion.h"
diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx
index 68b13be..1f07a07 100644
--- a/Source/cmCTest.cxx
+++ b/Source/cmCTest.cxx
@@ -11,8 +11,9 @@
============================================================================*/
#include "cmCurl.h" // include before anything that includes windows.h
-#include "cmAlgorithms.h"
#include "cmCTest.h"
+
+#include "cmAlgorithms.h"
#include "cmCTestCommand.h"
#include "cmCTestStartCommand.h"
#include "cmDynamicLoader.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 fd85c79..afa2ba7 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 "cmGeneratedFileStream.h"
#include "cmSystemTools.h"
#include "cmVersion.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 1aa3b7d..d5e394d 100644
--- a/Source/cmCommand.h
+++ b/Source/cmCommand.h
@@ -12,10 +12,11 @@
#ifndef cmCommand_h
#define cmCommand_h
+#include "cmObject.h"
+
#include "cmCommandArgumentsHelper.h"
#include "cmListFileCache.h"
#include "cmMakefile.h"
-#include "cmObject.h"
/** \class cmCommand
* \brief Superclass for all commands in CMake.
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..ea23308 100644
--- a/Source/cmComputeLinkDepends.h
+++ b/Source/cmComputeLinkDepends.h
@@ -13,9 +13,9 @@
#define cmComputeLinkDepends_h
#include "cmStandardIncludes.h"
-#include "cmLinkItem.h"
#include "cmGraphAdjacencyList.h"
+#include "cmLinkItem.h"
#include <queue>
diff --git a/Source/cmConditionEvaluator.cxx b/Source/cmConditionEvaluator.cxx
index 5d260ad..3711b9b 100644
--- a/Source/cmConditionEvaluator.cxx
+++ b/Source/cmConditionEvaluator.cxx
@@ -11,6 +11,7 @@
============================================================================*/
#include "cmConditionEvaluator.h"
+
#include "cmAlgorithms.h"
#include "cmOutputConverter.h"
diff --git a/Source/cmCoreTryCompile.cxx b/Source/cmCoreTryCompile.cxx
index 80eb96a..231c260 100644
--- a/Source/cmCoreTryCompile.cxx
+++ b/Source/cmCoreTryCompile.cxx
@@ -10,6 +10,7 @@
See the License for more information.
============================================================================*/
#include "cmCoreTryCompile.h"
+
#include "cmAlgorithms.h"
#include "cmExportTryCompileFileGenerator.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 0141ed3..2bc54cd 100644
--- a/Source/cmCurl.h
+++ b/Source/cmCurl.h
@@ -13,8 +13,8 @@
#define cmCurl_h
#include "cmStandardIncludes.h"
+
#include "cm_curl.h"
-#include <cmsys/Configure.h>
std::string cmCurlSetCAInfo(::CURL *curl, const char* cafile = 0);
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 daae3b9..47fc22e 100644
--- a/Source/cmDefinePropertyCommand.cxx
+++ b/Source/cmDefinePropertyCommand.cxx
@@ -10,6 +10,7 @@
See the License for more information.
============================================================================*/
#include "cmDefinePropertyCommand.h"
+
#include "cmState.h"
#include "cmake.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 6102574..0e6f577 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/FStream.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 3c19c83..bbd07db 100644
--- a/Source/cmExportCommand.cxx
+++ b/Source/cmExportCommand.cxx
@@ -10,6 +10,7 @@
See the License for more information.
============================================================================*/
#include "cmExportCommand.h"
+
#include "cmGeneratedFileStream.h"
#include "cmGlobalGenerator.h"
#include "cmake.h"
diff --git a/Source/cmExportLibraryDependenciesCommand.cxx b/Source/cmExportLibraryDependenciesCommand.cxx
index 995b15c..a715070 100644
--- a/Source/cmExportLibraryDependenciesCommand.cxx
+++ b/Source/cmExportLibraryDependenciesCommand.cxx
@@ -10,6 +10,7 @@
See the License for more information.
============================================================================*/
#include "cmExportLibraryDependenciesCommand.h"
+
#include "cmGeneratedFileStream.h"
#include "cmGlobalGenerator.h"
#include "cmVersion.h"
diff --git a/Source/cmExportSet.cxx b/Source/cmExportSet.cxx
index 3161591..83c4fdc 100644
--- a/Source/cmExportSet.cxx
+++ b/Source/cmExportSet.cxx
@@ -11,6 +11,7 @@
============================================================================*/
#include "cmExportSet.h"
+
#include "cmAlgorithms.h"
#include "cmLocalGenerator.h"
#include "cmTargetExport.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 b109473..d267cd3 100644
--- a/Source/cmExportSetMap.cxx
+++ b/Source/cmExportSetMap.cxx
@@ -11,6 +11,7 @@
============================================================================*/
#include "cmExportSetMap.h"
+
#include "cmAlgorithms.h"
#include "cmExportSet.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 2a68f6b..f6be583 100644
--- a/Source/cmExtraCodeBlocksGenerator.cxx
+++ b/Source/cmExtraCodeBlocksGenerator.cxx
@@ -11,6 +11,7 @@
See the License for more information.
============================================================================*/
#include "cmExtraCodeBlocksGenerator.h"
+
#include "cmGeneratedFileStream.h"
#include "cmGlobalUnixMakefileGenerator3.h"
#include "cmLocalUnixMakefileGenerator3.h"
diff --git a/Source/cmExtraCodeLiteGenerator.cxx b/Source/cmExtraCodeLiteGenerator.cxx
index 85b86ff..6c7d5f6 100644
--- a/Source/cmExtraCodeLiteGenerator.cxx
+++ b/Source/cmExtraCodeLiteGenerator.cxx
@@ -12,6 +12,7 @@
See the License for more information.
============================================================================*/
#include "cmExtraCodeLiteGenerator.h"
+
#include "cmGeneratedFileStream.h"
#include "cmGlobalUnixMakefileGenerator3.h"
#include "cmLocalUnixMakefileGenerator3.h"
diff --git a/Source/cmExtraEclipseCDT4Generator.cxx b/Source/cmExtraEclipseCDT4Generator.cxx
index 1859409..40cc904 100644
--- a/Source/cmExtraEclipseCDT4Generator.cxx
+++ b/Source/cmExtraEclipseCDT4Generator.cxx
@@ -12,6 +12,7 @@
See the License for more information.
============================================================================*/
#include "cmExtraEclipseCDT4Generator.h"
+
#include "cmGeneratedFileStream.h"
#include "cmGlobalUnixMakefileGenerator3.h"
#include "cmLocalUnixMakefileGenerator3.h"
diff --git a/Source/cmExtraKateGenerator.cxx b/Source/cmExtraKateGenerator.cxx
index 3c12ebb..4b779d8 100644
--- a/Source/cmExtraKateGenerator.cxx
+++ b/Source/cmExtraKateGenerator.cxx
@@ -11,6 +11,7 @@
See the License for more information.
============================================================================*/
#include "cmExtraKateGenerator.h"
+
#include "cmGeneratedFileStream.h"
#include "cmGlobalUnixMakefileGenerator3.h"
#include "cmLocalUnixMakefileGenerator3.h"
diff --git a/Source/cmExtraSublimeTextGenerator.cxx b/Source/cmExtraSublimeTextGenerator.cxx
index ed4bf01..a8367c4 100644
--- a/Source/cmExtraSublimeTextGenerator.cxx
+++ b/Source/cmExtraSublimeTextGenerator.cxx
@@ -11,6 +11,7 @@
See the License for more information.
============================================================================*/
#include "cmExtraSublimeTextGenerator.h"
+
#include "cmGeneratedFileStream.h"
#include "cmGeneratorTarget.h"
#include "cmGlobalUnixMakefileGenerator3.h"
diff --git a/Source/cmFileCommand.cxx b/Source/cmFileCommand.cxx
index 7e69ad4..035b97f 100644
--- a/Source/cmFileCommand.cxx
+++ b/Source/cmFileCommand.cxx
@@ -10,6 +10,7 @@
See the License for more information.
============================================================================*/
#include "cmFileCommand.h"
+
#include "cmAlgorithms.h"
#include "cmCryptoHash.h"
#include "cmCryptoHash.h"
@@ -27,9 +28,9 @@
#endif
#undef GetCurrentDirectory
+#include <sys/types.h>
#include <assert.h>
#include <sys/stat.h>
-#include <sys/types.h>
#include <cmsys/Directory.hxx>
#include <cmsys/Encoding.hxx>
diff --git a/Source/cmFindCommon.cxx b/Source/cmFindCommon.cxx
index 947ed2f..d70fa89 100644
--- a/Source/cmFindCommon.cxx
+++ b/Source/cmFindCommon.cxx
@@ -10,6 +10,7 @@
See the License for more information.
============================================================================*/
#include "cmFindCommon.h"
+
#include <algorithm>
#include <functional>
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 26a471f..f34dadc 100644
--- a/Source/cmGeneratorExpressionEvaluationFile.h
+++ b/Source/cmGeneratorExpressionEvaluationFile.h
@@ -12,12 +12,11 @@
#ifndef cmGeneratorExpressionEvaluationFile_h
#define cmGeneratorExpressionEvaluationFile_h
-#include "cmStandardIncludes.h"
-#include <cmsys/auto_ptr.hxx>
-#include <sys/types.h>
-
#include "cmGeneratorExpression.h"
+#include <sys/types.h>
+#include <cmsys/auto_ptr.hxx>
+
class cmLocalGenerator;
//----------------------------------------------------------------------------
diff --git a/Source/cmGeneratorExpressionEvaluator.cxx b/Source/cmGeneratorExpressionEvaluator.cxx
index f70a3b8..d9dd3b1 100644
--- a/Source/cmGeneratorExpressionEvaluator.cxx
+++ b/Source/cmGeneratorExpressionEvaluator.cxx
@@ -9,15 +9,15 @@
implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the License for more information.
============================================================================*/
-#include "cmMakefile.h"
+#include "cmGeneratorExpressionEvaluator.h"
#include "cmAlgorithms.h"
#include "cmGeneratorExpression.h"
#include "cmGeneratorExpressionDAGChecker.h"
-#include "cmGeneratorExpressionEvaluator.h"
#include "cmGeneratorExpressionParser.h"
#include "cmGlobalGenerator.h"
#include "cmLocalGenerator.h"
+#include "cmMakefile.h"
#include "cmSourceFile.h"
#include <cmsys/String.h>
diff --git a/Source/cmGeneratorExpressionEvaluator.h b/Source/cmGeneratorExpressionEvaluator.h
index b113c26..b60bb5d 100644
--- a/Source/cmGeneratorExpressionEvaluator.h
+++ b/Source/cmGeneratorExpressionEvaluator.h
@@ -13,6 +13,7 @@
#define cmGeneratorExpressionEvaluator_h
#include "cmGeneratorExpressionContext.h"
+
#include "cmListFileCache.h"
#include <string>
diff --git a/Source/cmGeneratorExpressionNode.cxx b/Source/cmGeneratorExpressionNode.cxx
index 067efb9..a9227b0 100644
--- a/Source/cmGeneratorExpressionNode.cxx
+++ b/Source/cmGeneratorExpressionNode.cxx
@@ -11,6 +11,7 @@
============================================================================*/
#include "cmGeneratorExpressionNode.h"
+
#include "cmAlgorithms.h"
#include "cmGlobalGenerator.h"
#include "cmMakefile.h"
diff --git a/Source/cmGeneratorExpressionNode.h b/Source/cmGeneratorExpressionNode.h
index ef4fe78..2d66727 100644
--- a/Source/cmGeneratorExpressionNode.h
+++ b/Source/cmGeneratorExpressionNode.h
@@ -13,6 +13,7 @@
#define cmGeneratorExpressionNode_h
#include "cmGeneratorExpression.h"
+
#include "cmGeneratorExpressionDAGChecker.h"
#include "cmGeneratorExpressionEvaluator.h"
#include "cmGeneratorExpressionParser.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 dd698b8..f845c59 100644
--- a/Source/cmGhsMultiTargetGenerator.cxx
+++ b/Source/cmGhsMultiTargetGenerator.cxx
@@ -10,6 +10,7 @@
See the License for more information.
============================================================================*/
#include "cmGhsMultiTargetGenerator.h"
+
#include "cmGeneratedFileStream.h"
#include "cmGlobalGhsMultiGenerator.h"
#include "cmLocalGhsMultiGenerator.h"
diff --git a/Source/cmGhsMultiTargetGenerator.h b/Source/cmGhsMultiTargetGenerator.h
index 40920a2..93761f2 100644
--- a/Source/cmGhsMultiTargetGenerator.h
+++ b/Source/cmGhsMultiTargetGenerator.h
@@ -12,8 +12,8 @@
#ifndef cmGhsMultiTargetGenerator_h
#define cmGhsMultiTargetGenerator_h
-#include "cmStandardIncludes.h"
#include "cmGhsMultiGpj.h"
+
#include "cmTarget.h"
class cmGeneratedFileStream;
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 f340b70..84ade25 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -16,6 +16,8 @@
#endif
#endif
+#include "cmGlobalGenerator.h"
+
#include "cmAlgorithms.h"
#include "cmCPackPropertiesGenerator.h"
#include "cmComputeTargetDepends.h"
@@ -24,7 +26,6 @@
#include "cmGeneratedFileStream.h"
#include "cmGeneratorExpression.h"
#include "cmGeneratorTarget.h"
-#include "cmGlobalGenerator.h"
#include "cmInstallGenerator.h"
#include "cmLocalGenerator.h"
#include "cmMakefile.h"
diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h
index c602eae..1576f09 100644
--- a/Source/cmGlobalGenerator.h
+++ b/Source/cmGlobalGenerator.h
@@ -19,8 +19,8 @@
#include "cmGeneratorExpression.h"
#include "cmGeneratorTarget.h"
#include "cmState.h"
-#include "cmSystemTools.h" // for cmSystemTools::OutputOption
-#include "cmTarget.h" // For cmTargets
+#include "cmSystemTools.h" // for cmSystemTools::OutputOption
+#include "cmTarget.h" // For cmTargets
#include "cmTargetDepend.h" // For cmTargetDependSet
#if defined(CMAKE_BUILD_WITH_CMAKE)
diff --git a/Source/cmGlobalGhsMultiGenerator.cxx b/Source/cmGlobalGhsMultiGenerator.cxx
index ba2d04c..df7011c 100644
--- a/Source/cmGlobalGhsMultiGenerator.cxx
+++ b/Source/cmGlobalGhsMultiGenerator.cxx
@@ -10,6 +10,7 @@
See the License for more information.
============================================================================*/
#include "cmGlobalGhsMultiGenerator.h"
+
#include "cmGeneratedFileStream.h"
#include "cmGhsMultiTargetGenerator.h"
#include "cmLocalGhsMultiGenerator.h"
diff --git a/Source/cmGlobalGhsMultiGenerator.h b/Source/cmGlobalGhsMultiGenerator.h
index 1c77182..5de9d2b 100644
--- a/Source/cmGlobalGhsMultiGenerator.h
+++ b/Source/cmGlobalGhsMultiGenerator.h
@@ -12,8 +12,9 @@
#ifndef cmGhsMultiGenerator_h
#define cmGhsMultiGenerator_h
-#include "cmGhsMultiGpj.h"
#include "cmGlobalGenerator.h"
+
+#include "cmGhsMultiGpj.h"
#include "cmGlobalGeneratorFactory.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 a8e9b46..e2f1fc5 100644
--- a/Source/cmGlobalKdevelopGenerator.cxx
+++ b/Source/cmGlobalKdevelopGenerator.cxx
@@ -11,6 +11,7 @@
See the License for more information.
============================================================================*/
#include "cmGlobalKdevelopGenerator.h"
+
#include "cmGeneratedFileStream.h"
#include "cmGlobalUnixMakefileGenerator3.h"
#include "cmLocalUnixMakefileGenerator3.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 783edbf..a8a7262 100644
--- a/Source/cmGlobalNinjaGenerator.cxx
+++ b/Source/cmGlobalNinjaGenerator.cxx
@@ -11,6 +11,7 @@
See the License for more information.
============================================================================*/
#include "cmGlobalNinjaGenerator.h"
+
#include "cmAlgorithms.h"
#include "cmGeneratedFileStream.h"
#include "cmGeneratorExpressionEvaluationFile.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 688d70a..0098f1e 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.cxx
+++ b/Source/cmGlobalUnixMakefileGenerator3.cxx
@@ -10,6 +10,7 @@
See the License for more information.
============================================================================*/
#include "cmGlobalUnixMakefileGenerator3.h"
+
#include "cmAlgorithms.h"
#include "cmGeneratedFileStream.h"
#include "cmGeneratorTarget.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/cmGlobalVisualStudio11Generator.cxx b/Source/cmGlobalVisualStudio11Generator.cxx
index c36c8b1..de6fc43 100644
--- a/Source/cmGlobalVisualStudio11Generator.cxx
+++ b/Source/cmGlobalVisualStudio11Generator.cxx
@@ -10,6 +10,7 @@
See the License for more information.
============================================================================*/
#include "cmGlobalVisualStudio11Generator.h"
+
#include "cmAlgorithms.h"
#include "cmLocalVisualStudio10Generator.h"
#include "cmMakefile.h"
diff --git a/Source/cmGlobalVisualStudio12Generator.cxx b/Source/cmGlobalVisualStudio12Generator.cxx
index d6257b5..bfd908f 100644
--- a/Source/cmGlobalVisualStudio12Generator.cxx
+++ b/Source/cmGlobalVisualStudio12Generator.cxx
@@ -10,6 +10,7 @@
See the License for more information.
============================================================================*/
#include "cmGlobalVisualStudio12Generator.h"
+
#include "cmAlgorithms.h"
#include "cmLocalVisualStudio10Generator.h"
#include "cmMakefile.h"
diff --git a/Source/cmGlobalVisualStudio14Generator.cxx b/Source/cmGlobalVisualStudio14Generator.cxx
index 2580b86..893cc7b 100644
--- a/Source/cmGlobalVisualStudio14Generator.cxx
+++ b/Source/cmGlobalVisualStudio14Generator.cxx
@@ -10,6 +10,7 @@
See the License for more information.
============================================================================*/
#include "cmGlobalVisualStudio14Generator.h"
+
#include "cmAlgorithms.h"
#include "cmLocalVisualStudio10Generator.h"
#include "cmMakefile.h"
diff --git a/Source/cmGlobalVisualStudio7Generator.cxx b/Source/cmGlobalVisualStudio7Generator.cxx
index 4afd4f4..f8fe074 100644
--- a/Source/cmGlobalVisualStudio7Generator.cxx
+++ b/Source/cmGlobalVisualStudio7Generator.cxx
@@ -18,9 +18,10 @@
#include "cmMakefile.h"
#include "cmUuid.h"
#include "cmake.h"
-#include <assert.h>
#include <cmsys/Encoding.hxx>
+#include <assert.h>
+
//----------------------------------------------------------------------------
static cmVS7FlagTable cmVS7ExtraFlagTable[] =
{
diff --git a/Source/cmGlobalVisualStudio7Generator.h b/Source/cmGlobalVisualStudio7Generator.h
index 6a3b952..a360bd9 100644
--- a/Source/cmGlobalVisualStudio7Generator.h
+++ b/Source/cmGlobalVisualStudio7Generator.h
@@ -12,9 +12,10 @@
#ifndef cmGlobalVisualStudio7Generator_h
#define cmGlobalVisualStudio7Generator_h
-#include "cmGlobalGeneratorFactory.h"
#include "cmGlobalVisualStudioGenerator.h"
+#include "cmGlobalGeneratorFactory.h"
+
class cmTarget;
struct cmIDEFlagTable;
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 3d75c63..19f7a74 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -10,6 +10,7 @@
See the License for more information.
============================================================================*/
#include "cmGlobalXCodeGenerator.h"
+
#include "cmAlgorithms.h"
#include "cmComputeLinkInformation.h"
#include "cmCustomCommandGenerator.h"
diff --git a/Source/cmGlobalXCodeGenerator.h b/Source/cmGlobalXCodeGenerator.h
index 9ebd853..c3b3613 100644
--- a/Source/cmGlobalXCodeGenerator.h
+++ b/Source/cmGlobalXCodeGenerator.h
@@ -12,8 +12,9 @@
#ifndef cmGlobalXCodeGenerator_h
#define cmGlobalXCodeGenerator_h
-#include "cmCustomCommand.h"
#include "cmGlobalGenerator.h"
+
+#include "cmCustomCommand.h"
#include "cmXCodeObject.h"
class cmGlobalGeneratorFactory;
class cmSourceFile;
diff --git a/Source/cmGraphVizWriter.cxx b/Source/cmGraphVizWriter.cxx
index 3289dd8..76b6430 100644
--- a/Source/cmGraphVizWriter.cxx
+++ b/Source/cmGraphVizWriter.cxx
@@ -10,6 +10,7 @@
See the License for more information.
============================================================================*/
#include "cmGraphVizWriter.h"
+
#include "cmGeneratedFileStream.h"
#include "cmGlobalGenerator.h"
#include "cmLocalGenerator.h"
diff --git a/Source/cmGraphVizWriter.h b/Source/cmGraphVizWriter.h
index 025a61f..7914ca3 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 "cmGeneratedFileStream.h"
#include "cmLocalGenerator.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 2a83a3e..37f03c5 100644
--- a/Source/cmIfCommand.cxx
+++ b/Source/cmIfCommand.cxx
@@ -10,6 +10,7 @@
See the License for more information.
============================================================================*/
#include "cmIfCommand.h"
+
#include "cmOutputConverter.h"
#include "cmStringCommand.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 a20f62c..c5ac9eb 100644
--- a/Source/cmInstalledFile.cxx
+++ b/Source/cmInstalledFile.cxx
@@ -10,6 +10,7 @@
See the License for more information.
============================================================================*/
#include "cmInstalledFile.h"
+
#include "cmAlgorithms.h"
#include "cmMakefile.h"
#include "cmSystemTools.h"
diff --git a/Source/cmListCommand.cxx b/Source/cmListCommand.cxx
index a5e84ee..05be9e5 100644
--- a/Source/cmListCommand.cxx
+++ b/Source/cmListCommand.cxx
@@ -10,6 +10,7 @@
See the License for more information.
============================================================================*/
#include "cmListCommand.h"
+
#include "cmAlgorithms.h"
#include <cmsys/RegularExpression.hxx>
#include <cmsys/SystemTools.hxx>
diff --git a/Source/cmLoadCommandCommand.cxx b/Source/cmLoadCommandCommand.cxx
index a0d336d..14b70e4 100644
--- a/Source/cmLoadCommandCommand.cxx
+++ b/Source/cmLoadCommandCommand.cxx
@@ -10,6 +10,7 @@
See the License for more information.
============================================================================*/
#include "cmLoadCommandCommand.h"
+
#include "cmCPluginAPI.cxx"
#include "cmCPluginAPI.h"
#include "cmDynamicLoader.h"
diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h
index 8d117e2..0bad0d6 100644
--- a/Source/cmLocalGenerator.h
+++ b/Source/cmLocalGenerator.h
@@ -13,6 +13,7 @@
#define cmLocalGenerator_h
#include "cmStandardIncludes.h"
+
#include "cmOutputConverter.h"
#include "cmState.h"
#include "cmake.h"
diff --git a/Source/cmLocalGhsMultiGenerator.cxx b/Source/cmLocalGhsMultiGenerator.cxx
index 2811433..f23f27d 100644
--- a/Source/cmLocalGhsMultiGenerator.cxx
+++ b/Source/cmLocalGhsMultiGenerator.cxx
@@ -10,6 +10,7 @@
See the License for more information.
============================================================================*/
#include "cmLocalGhsMultiGenerator.h"
+
#include "cmGeneratedFileStream.h"
#include "cmGeneratorTarget.h"
#include "cmGhsMultiTargetGenerator.h"
diff --git a/Source/cmLocalNinjaGenerator.cxx b/Source/cmLocalNinjaGenerator.cxx
index 2cff8c3..c26065c 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 "cmGeneratedFileStream.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 b16003d..314fa0f 100644
--- a/Source/cmLocalVisualStudio10Generator.cxx
+++ b/Source/cmLocalVisualStudio10Generator.cxx
@@ -10,11 +10,13 @@
See the License for more information.
============================================================================*/
#include "cmLocalVisualStudio10Generator.h"
+
#include "cmGlobalVisualStudio10Generator.h"
#include "cmMakefile.h"
#include "cmVisualStudio10TargetGenerator.h"
#include "cmXMLParser.h"
#include <cm_expat.h>
+
class cmVS10XMLParser : public cmXMLParser
{
public:
diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx
index 93d0a45..38b7ac3 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -10,6 +10,7 @@
See the License for more information.
============================================================================*/
#include "cmLocalVisualStudio7Generator.h"
+
#include "cmCustomCommandGenerator.h"
#include "cmGeneratorTarget.h"
#include "cmGlobalVisualStudio7Generator.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 5b8fa9b..23e2bfd 100644
--- a/Source/cmLocalVisualStudioGenerator.cxx
+++ b/Source/cmLocalVisualStudioGenerator.cxx
@@ -10,6 +10,7 @@
See the License for more information.
============================================================================*/
#include "cmLocalVisualStudioGenerator.h"
+
#include "cmCustomCommandGenerator.h"
#include "cmGlobalGenerator.h"
#include "cmMakefile.h"
diff --git a/Source/cmLocalVisualStudioGenerator.h b/Source/cmLocalVisualStudioGenerator.h
index 1f34494..caffff7 100644
--- a/Source/cmLocalVisualStudioGenerator.h
+++ b/Source/cmLocalVisualStudioGenerator.h
@@ -12,9 +12,10 @@
#ifndef cmLocalVisualStudioGenerator_h
#define cmLocalVisualStudioGenerator_h
-#include "cmGlobalVisualStudioGenerator.h"
#include "cmLocalGenerator.h"
+#include "cmGlobalVisualStudioGenerator.h"
+
#include <cmsys/auto_ptr.hxx>
class cmSourceFile;
diff --git a/Source/cmLocalXCodeGenerator.cxx b/Source/cmLocalXCodeGenerator.cxx
index 4da9fe0..d563fe7 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 "cmMakefile.h"
#include "cmSourceFile.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 cbe316d..bb4d4a1 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 ade352b..3bc1181 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -10,6 +10,7 @@
See the License for more information.
============================================================================*/
#include "cmMakefile.h"
+
#include "cmCommand.h"
#include "cmCommandArgumentParserHelper.h"
#include "cmCommands.h"
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index de2d84f..fa5e9b4 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -12,6 +12,8 @@
#ifndef cmMakefile_h
#define cmMakefile_h
+#include "cmStandardIncludes.h"
+
#include "cmAlgorithms.h"
#include "cmExecutionStatus.h"
#include "cmExpandedCommandArgument.h"
diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
index 4655d0a..0429421 100644
--- a/Source/cmNinjaNormalTargetGenerator.cxx
+++ b/Source/cmNinjaNormalTargetGenerator.cxx
@@ -11,6 +11,7 @@
See the License for more information.
============================================================================*/
#include "cmNinjaNormalTargetGenerator.h"
+
#include "cmAlgorithms.h"
#include "cmCustomCommandGenerator.h"
#include "cmGeneratedFileStream.h"
diff --git a/Source/cmNinjaNormalTargetGenerator.h b/Source/cmNinjaNormalTargetGenerator.h
index d85dce2..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 "cmStandardIncludes.h"
-# include "cmNinjaTargetGenerator.h"
-# include "cmNinjaTypes.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 a3d053d..8830b8f 100644
--- a/Source/cmNinjaTargetGenerator.cxx
+++ b/Source/cmNinjaTargetGenerator.cxx
@@ -11,6 +11,7 @@
See the License for more information.
============================================================================*/
#include "cmNinjaTargetGenerator.h"
+
#include "cmAlgorithms.h"
#include "cmComputeLinkInformation.h"
#include "cmCustomCommandGenerator.h"
diff --git a/Source/cmNinjaTargetGenerator.h b/Source/cmNinjaTargetGenerator.h
index 54e3111..8225a60 100644
--- a/Source/cmNinjaTargetGenerator.h
+++ b/Source/cmNinjaTargetGenerator.h
@@ -15,7 +15,6 @@
#include "cmCommonTargetGenerator.h"
-#include "cmStandardIncludes.h"
#include "cmGlobalNinjaGenerator.h"
#include "cmLocalNinjaGenerator.h"
#include "cmNinjaTypes.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 3013858..735730e 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 "cmCustomCommandGenerator.h"
#include "cmGeneratedFileStream.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 0563e96..9850728 100644
--- a/Source/cmOSXBundleGenerator.cxx
+++ b/Source/cmOSXBundleGenerator.cxx
@@ -10,6 +10,7 @@
See the License for more information.
============================================================================*/
#include "cmOSXBundleGenerator.h"
+
#include "cmLocalGenerator.h"
#include "cmMakefile.h"
#include "cmTarget.h"
diff --git a/Source/cmOSXBundleGenerator.h b/Source/cmOSXBundleGenerator.h
index d4a820d..3952e95 100644
--- a/Source/cmOSXBundleGenerator.h
+++ b/Source/cmOSXBundleGenerator.h
@@ -13,6 +13,7 @@
#define cmOSXBundleGenerator_h
#include "cmStandardIncludes.h"
+
#include "cmSourceFile.h"
#include <set>
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 f8465f2..0432da5 100644
--- a/Source/cmPolicies.cxx
+++ b/Source/cmPolicies.cxx
@@ -1,4 +1,5 @@
#include "cmPolicies.h"
+
#include "cmAlgorithms.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 ddaf0da..cba2b5a 100644
--- a/Source/cmPropertyDefinitionMap.cxx
+++ b/Source/cmPropertyDefinitionMap.cxx
@@ -10,6 +10,7 @@
See the License for more information.
============================================================================*/
#include "cmPropertyDefinitionMap.h"
+
#include "cmDocumentationSection.h"
#include "cmSystemTools.h"
diff --git a/Source/cmPropertyMap.cxx b/Source/cmPropertyMap.cxx
index 801c471..2b25023 100644
--- a/Source/cmPropertyMap.cxx
+++ b/Source/cmPropertyMap.cxx
@@ -10,6 +10,7 @@
See the License for more information.
============================================================================*/
#include "cmPropertyMap.h"
+
#include "cmState.h"
#include "cmSystemTools.h"
#include "cmake.h"
diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx
index 106ddb3..a55a3f3 100644
--- a/Source/cmQtAutoGenerators.cxx
+++ b/Source/cmQtAutoGenerators.cxx
@@ -11,6 +11,8 @@
See the License for more information.
============================================================================*/
+#include "cmQtAutoGenerators.h"
+
#include "cmAlgorithms.h"
#include "cmGlobalGenerator.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 5b97dee..315e915 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 <map>
#include <string>
diff --git a/Source/cmSearchPath.cxx b/Source/cmSearchPath.cxx
index e7c58de..70855b3 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 "cmAlgorithms.h"
#include "cmFindCommon.h"
diff --git a/Source/cmSetPropertyCommand.cxx b/Source/cmSetPropertyCommand.cxx
index caab5bd..fb13a19 100644
--- a/Source/cmSetPropertyCommand.cxx
+++ b/Source/cmSetPropertyCommand.cxx
@@ -10,6 +10,7 @@
See the License for more information.
============================================================================*/
#include "cmSetPropertyCommand.h"
+
#include "cmSetSourceFilesPropertiesCommand.h"
#include "cmSetTargetPropertiesCommand.h"
#include "cmSetTestsPropertiesCommand.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 dab45b5..e5e2ab9 100644
--- a/Source/cmSourceFile.h
+++ b/Source/cmSourceFile.h
@@ -12,9 +12,10 @@
#ifndef cmSourceFile_h
#define cmSourceFile_h
+#include "cmSourceFileLocation.h"
+
#include "cmCustomCommand.h"
#include "cmPropertyMap.h"
-#include "cmSourceFileLocation.h"
class cmake;
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 1c5b144..f80586e 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 afbac94..705c1a8 100644
--- a/Source/cmState.h
+++ b/Source/cmState.h
@@ -13,6 +13,7 @@
#define cmState_h
#include "cmStandardIncludes.h"
+
#include "cmAlgorithms.h"
#include "cmLinkedTree.h"
#include "cmPolicies.h"
diff --git a/Source/cmStringCommand.cxx b/Source/cmStringCommand.cxx
index 3a5d21f..e10e1ae 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 bf30083..f90eaf5 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 <assert.h>
#include <ctype.h>
@@ -41,8 +41,8 @@
# 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>
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index c988554..fe14af6 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -10,6 +10,7 @@
See the License for more information.
============================================================================*/
#include "cmTarget.h"
+
#include "cmAlgorithms.h"
#include "cmComputeLinkInformation.h"
#include "cmGeneratorExpression.h"
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index f12a6c7..262cc9b 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 "cmListFileCache.h"
#include "cmPolicies.h"
diff --git a/Source/cmTest.cxx b/Source/cmTest.cxx
index 672de6d..7182122 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 "cmMakefile.h"
diff --git a/Source/cmTest.h b/Source/cmTest.h
index 0229c96..46013af 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 "cmListFileCache.h"
#include "cmPropertyMap.h"
diff --git a/Source/cmTimestamp.cxx b/Source/cmTimestamp.cxx
index f66b77d..7d1ba32 100644
--- a/Source/cmTimestamp.cxx
+++ b/Source/cmTimestamp.cxx
@@ -14,9 +14,9 @@
#include <cstdlib>
#include <cstring>
+#include <sys/types.h>
#include <sstream>
#include <sys/stat.h>
-#include <sys/types.h>
//----------------------------------------------------------------------------
std::string cmTimestamp::CurrentTime(
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 73ecff3..f30071e 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/FStream.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.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 8bb7562..d52d6b5 100644
--- a/Source/cmWriteFileCommand.cxx
+++ b/Source/cmWriteFileCommand.cxx
@@ -10,10 +10,11 @@
See the License for more information.
============================================================================*/
#include "cmWriteFileCommand.h"
+
#include <cmsys/FStream.hxx>
-#include <sys/stat.h>
#include <sys/types.h>
+#include <sys/stat.h>
// cmLibraryCommand
bool cmWriteFileCommand
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 608e3e3..7cf34ba 100644
--- a/Source/cmXMLSafe.h
+++ b/Source/cmXMLSafe.h
@@ -13,6 +13,7 @@
#define cmXMLSafe_h
#include <cmsys/Configure.hxx>
+
#include <iosfwd>
#include <string>
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 dd84094..da6e59e 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -10,6 +10,7 @@
See the License for more information.
============================================================================*/
#include "cmake.h"
+
#include "cmAlgorithms.h"
#include "cmCommand.h"
#include "cmCommands.h"
@@ -99,7 +100,6 @@
# define CMAKE_USE_XCODE 1
# endif
# include <sys/types.h>
-
# include <sys/resource.h>
# include <sys/time.h>
#endif
diff --git a/Source/cmake.h b/Source/cmake.h
index 59bb6a5..e41ba56 100644
--- a/Source/cmake.h
+++ b/Source/cmake.h
@@ -13,6 +13,8 @@
#ifndef cmake_h
#define cmake_h
+#include "cmStandardIncludes.h"
+
#include "cmCacheManager.h"
#include "cmInstalledFile.h"
#include "cmListFileCache.h"
diff --git a/Source/cmakexbuild.cxx b/Source/cmakexbuild.cxx
index c0556d3..1385ff7 100644
--- a/Source/cmakexbuild.cxx
+++ b/Source/cmakexbuild.cxx
@@ -10,6 +10,7 @@
See the License for more information.
============================================================================*/
#include "cmStandardIncludes.h"
+
#include "cmSystemTools.h"
#include <cmsys/Process.h>
diff --git a/Source/cmcmd.cxx b/Source/cmcmd.cxx
index 52fa841..1f92b67 100644
--- a/Source/cmcmd.cxx
+++ b/Source/cmcmd.cxx
@@ -10,6 +10,7 @@
See the License for more information.
============================================================================*/
#include "cmcmd.h"
+
#include "cmAlgorithms.h"
#include "cmGlobalGenerator.h"
#include "cmLocalGenerator.h"
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/TestsWorkingDirectory/main.c b/Tests/TestsWorkingDirectory/main.c
index d4b760c..3616f8e 100644
--- a/Tests/TestsWorkingDirectory/main.c
+++ b/Tests/TestsWorkingDirectory/main.c
@@ -38,8 +38,8 @@ static const char* Getcwd(char* buf, unsigned int len)
}
#else
-#include <fcntl.h>
#include <sys/types.h>
+#include <fcntl.h>
#include <unistd.h>
static const char* Getcwd(char* buf, unsigned int len)
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;
-----------------------------------------------------------------------
Summary of changes:
Source/CPack/WiX/cmCPackWIXGenerator.h | 4 ++--
Source/CPack/WiX/cmWIXAccessControlList.h | 4 ++--
Source/CPack/WiX/cmWIXFeaturesSourceWriter.h | 1 +
Source/CPack/WiX/cmWIXFilesSourceWriter.cxx | 3 ++-
Source/CPack/WiX/cmWIXFilesSourceWriter.h | 3 ++-
Source/CPack/WiX/cmWIXPatchParser.h | 4 ++--
Source/CPack/WiX/cmWIXRichTextFormatWriter.h | 2 ++
Source/CPack/WiX/cmWIXShortcut.h | 4 ++--
Source/CPack/WiX/cmWIXSourceWriter.cxx | 2 --
Source/CPack/WiX/cmWIXSourceWriter.h | 5 +++--
Source/CPack/cmCPackArchiveGenerator.h | 3 ++-
Source/CPack/cmCPackBundleGenerator.cxx | 1 +
Source/CPack/cmCPackComponentGroup.cxx | 2 ++
Source/CPack/cmCPackDebGenerator.cxx | 3 ++-
Source/CPack/cmCPackDebGenerator.h | 1 -
Source/CPack/cmCPackDragNDropGenerator.cxx | 1 +
Source/CPack/cmCPackGenerator.h | 1 +
Source/CPack/cmCPackGeneratorFactory.cxx | 8 ++++----
Source/CPack/cmCPackNSISGenerator.h | 2 +-
Source/CPack/cmCPackOSXX11Generator.cxx | 1 +
Source/CPack/cmCPackPackageMakerGenerator.h | 1 -
Source/CPack/cmCPackRPMGenerator.cxx | 1 +
Source/CPack/cmCPackRPMGenerator.h | 1 -
Source/CPack/cmCPackSTGZGenerator.cxx | 2 +-
Source/CPack/cmCPackSTGZGenerator.h | 1 -
Source/CPack/cmCPackTarBZip2Generator.cxx | 1 +
Source/CTest/cmCTestBatchTestHandler.cxx | 3 ++-
Source/CTest/cmCTestBatchTestHandler.h | 1 +
Source/CTest/cmCTestBuildHandler.h | 2 +-
Source/CTest/cmCTestConfigureHandler.h | 2 +-
Source/CTest/cmCTestCoverageHandler.h | 2 +-
Source/CTest/cmCTestGIT.cxx | 2 +-
Source/CTest/cmCTestGenericHandler.cxx | 1 +
Source/CTest/cmCTestGenericHandler.h | 3 ++-
Source/CTest/cmCTestLaunch.cxx | 2 +-
Source/CTest/cmCTestLaunch.h | 1 +
Source/CTest/cmCTestMemCheckHandler.cxx | 1 +
Source/CTest/cmCTestMemCheckHandler.h | 2 +-
Source/CTest/cmCTestMultiProcessHandler.cxx | 2 +-
Source/CTest/cmCTestMultiProcessHandler.h | 4 ++--
Source/CTest/cmCTestP4.cxx | 2 +-
Source/CTest/cmCTestP4.h | 1 +
Source/CTest/cmCTestReadCustomFilesCommand.cxx | 1 +
Source/CTest/cmCTestRunTest.cxx | 1 +
Source/CTest/cmCTestRunTest.h | 2 +-
Source/CTest/cmCTestScriptHandler.h | 2 +-
Source/CTest/cmCTestSubmitCommand.h | 3 ++-
Source/CTest/cmCTestSubmitHandler.cxx | 1 +
Source/CTest/cmCTestTestHandler.cxx | 1 +
Source/CTest/cmCTestTestHandler.h | 2 +-
Source/CTest/cmCTestUpdateHandler.h | 2 +-
Source/CTest/cmCTestUploadCommand.h | 3 ++-
Source/CTest/cmParseBlanketJSCoverage.cxx | 1 -
Source/CTest/cmParseBlanketJSCoverage.h | 1 -
Source/CTest/cmParseCacheCoverage.cxx | 1 -
Source/CTest/cmParseCoberturaCoverage.cxx | 1 -
Source/CTest/cmParseCoberturaCoverage.h | 1 -
Source/CTest/cmParseDelphiCoverage.cxx | 1 -
Source/CTest/cmParseDelphiCoverage.h | 1 -
Source/CTest/cmParseGTMCoverage.cxx | 1 -
Source/CTest/cmParseJacocoCoverage.cxx | 1 -
Source/CTest/cmParseJacocoCoverage.h | 1 -
Source/CTest/cmParseMumpsCoverage.cxx | 1 -
Source/CTest/cmParseMumpsCoverage.h | 1 -
Source/CTest/cmParsePHPCoverage.cxx | 1 -
Source/CTest/cmParsePHPCoverage.h | 1 -
Source/CTest/cmProcess.cxx | 1 +
Source/CTest/cmProcess.h | 2 +-
Source/QtDialog/AddCacheEntry.cxx | 1 +
Source/QtDialog/AddCacheEntry.h | 3 ++-
Source/QtDialog/CMakeSetupDialog.cxx | 1 +
Source/QtDialog/CMakeSetupDialog.h | 1 +
Source/QtDialog/Compilers.h | 1 +
Source/QtDialog/FirstConfigure.cxx | 1 +
Source/QtDialog/FirstConfigure.h | 6 ++++--
Source/QtDialog/QCMake.h | 5 +++--
Source/QtDialog/QCMakeCacheView.h | 1 +
Source/QtDialog/QCMakeWidgets.h | 1 +
Source/cmAddDependenciesCommand.cxx | 1 +
Source/cmAuxSourceDirectoryCommand.cxx | 1 +
Source/cmCPluginAPI.cxx | 1 +
Source/cmCTest.cxx | 3 ++-
Source/cmCTest.h | 1 +
Source/cmCacheManager.cxx | 2 +-
Source/cmCacheManager.h | 1 +
Source/cmCallVisualStudioMacro.cxx | 2 +-
Source/cmCommand.h | 3 ++-
Source/cmCommands.h | 1 +
Source/cmComputeLinkDepends.h | 2 +-
Source/cmConditionEvaluator.cxx | 1 +
Source/cmCoreTryCompile.cxx | 1 +
Source/cmCreateTestSourceList.cxx | 1 +
Source/cmCurl.cxx | 1 +
Source/cmCurl.h | 2 +-
Source/cmCustomCommand.h | 1 +
Source/cmDefinePropertyCommand.cxx | 1 +
Source/cmDependsC.h | 1 +
Source/cmDocumentation.h | 1 +
Source/cmDocumentationSection.h | 1 -
Source/cmELF.cxx | 1 +
Source/cmEndIfCommand.cxx | 1 +
Source/cmExecProgramCommand.cxx | 1 +
Source/cmExecuteProcessCommand.cxx | 1 +
Source/cmExportCommand.cxx | 1 +
Source/cmExportLibraryDependenciesCommand.cxx | 1 +
Source/cmExportSet.cxx | 1 +
Source/cmExportSet.h | 1 +
Source/cmExportSetMap.cxx | 1 +
Source/cmExportSetMap.h | 1 +
Source/cmExternalMakefileProjectGenerator.cxx | 3 ++-
Source/cmExtraCodeBlocksGenerator.cxx | 1 +
Source/cmExtraCodeLiteGenerator.cxx | 1 +
Source/cmExtraEclipseCDT4Generator.cxx | 1 +
Source/cmExtraKateGenerator.cxx | 1 +
Source/cmExtraSublimeTextGenerator.cxx | 1 +
Source/cmFileCommand.cxx | 3 ++-
Source/cmFindCommon.cxx | 1 +
Source/cmFindFileCommand.cxx | 1 +
Source/cmFindLibraryCommand.cxx | 1 +
Source/cmFindProgramCommand.cxx | 1 +
Source/cmForEachCommand.h | 1 +
Source/cmFunctionBlocker.h | 1 +
Source/cmFunctionCommand.h | 1 +
Source/cmGeneratedFileStream.h | 1 +
Source/cmGeneratorExpression.h | 1 +
Source/cmGeneratorExpressionContext.cxx | 1 +
Source/cmGeneratorExpressionEvaluationFile.h | 7 +++----
Source/cmGeneratorExpressionEvaluator.cxx | 4 ++--
Source/cmGeneratorExpressionEvaluator.h | 1 +
Source/cmGeneratorExpressionNode.cxx | 1 +
Source/cmGeneratorExpressionNode.h | 1 +
Source/cmGetFilenameComponentCommand.cxx | 1 +
Source/cmGhsMultiGpj.h | 2 ++
Source/cmGhsMultiTargetGenerator.cxx | 1 +
Source/cmGhsMultiTargetGenerator.h | 2 +-
Source/cmGlobalBorlandMakefileGenerator.cxx | 1 +
Source/cmGlobalGenerator.cxx | 3 ++-
Source/cmGlobalGenerator.h | 4 ++--
Source/cmGlobalGhsMultiGenerator.cxx | 1 +
Source/cmGlobalGhsMultiGenerator.h | 3 ++-
Source/cmGlobalJOMMakefileGenerator.cxx | 1 +
Source/cmGlobalKdevelopGenerator.cxx | 1 +
Source/cmGlobalMSYSMakefileGenerator.cxx | 1 +
Source/cmGlobalMinGWMakefileGenerator.cxx | 1 +
Source/cmGlobalNMakeMakefileGenerator.cxx | 1 +
Source/cmGlobalNinjaGenerator.cxx | 1 +
Source/cmGlobalNinjaGenerator.h | 9 +++++----
Source/cmGlobalUnixMakefileGenerator3.cxx | 1 +
Source/cmGlobalUnixMakefileGenerator3.h | 1 +
Source/cmGlobalVisualStudio11Generator.cxx | 1 +
Source/cmGlobalVisualStudio12Generator.cxx | 1 +
Source/cmGlobalVisualStudio14Generator.cxx | 1 +
Source/cmGlobalVisualStudio7Generator.cxx | 3 ++-
Source/cmGlobalVisualStudio7Generator.h | 3 ++-
Source/cmGlobalWatcomWMakeGenerator.cxx | 1 +
Source/cmGlobalXCodeGenerator.cxx | 1 +
Source/cmGlobalXCodeGenerator.h | 3 ++-
Source/cmGraphVizWriter.cxx | 1 +
Source/cmGraphVizWriter.h | 6 ++++--
Source/cmHexFileConverter.h | 2 ++
Source/cmIDEOptions.h | 1 +
Source/cmIfCommand.cxx | 1 +
Source/cmIfCommand.h | 1 +
Source/cmInstallCommandArguments.cxx | 1 +
Source/cmInstallCommandArguments.h | 1 +
Source/cmInstallProgramsCommand.cxx | 1 +
Source/cmInstalledFile.cxx | 1 +
Source/cmListCommand.cxx | 1 +
Source/cmLoadCommandCommand.cxx | 1 +
Source/cmLocalGenerator.h | 1 +
Source/cmLocalGhsMultiGenerator.cxx | 1 +
Source/cmLocalNinjaGenerator.cxx | 1 +
Source/cmLocalNinjaGenerator.h | 7 ++++---
Source/cmLocalVisualStudio10Generator.cxx | 2 ++
Source/cmLocalVisualStudio7Generator.cxx | 1 +
Source/cmLocalVisualStudio7Generator.h | 1 +
Source/cmLocalVisualStudioGenerator.cxx | 1 +
Source/cmLocalVisualStudioGenerator.h | 3 ++-
Source/cmLocalXCodeGenerator.cxx | 1 +
Source/cmLocale.h | 2 ++
Source/cmMachO.cxx | 1 +
Source/cmMacroCommand.h | 1 +
Source/cmMakefile.cxx | 1 +
Source/cmMakefile.h | 2 ++
Source/cmNinjaNormalTargetGenerator.cxx | 1 +
Source/cmNinjaNormalTargetGenerator.h | 10 +++++-----
Source/cmNinjaTargetGenerator.cxx | 1 +
Source/cmNinjaTargetGenerator.h | 1 -
Source/cmNinjaTypes.h | 4 +++-
Source/cmNinjaUtilityTargetGenerator.cxx | 1 +
Source/cmNinjaUtilityTargetGenerator.h | 7 ++++---
Source/cmOSXBundleGenerator.cxx | 1 +
Source/cmOSXBundleGenerator.h | 1 +
Source/cmOutputRequiredFilesCommand.cxx | 1 +
Source/cmParseArgumentsCommand.cxx | 1 +
Source/cmPolicies.cxx | 1 +
Source/cmProperty.cxx | 1 +
Source/cmPropertyDefinition.cxx | 1 +
Source/cmPropertyDefinitionMap.cxx | 1 +
Source/cmPropertyMap.cxx | 1 +
Source/cmQtAutoGenerators.cxx | 4 ++--
Source/cmQtAutoGenerators.h | 2 ++
Source/cmSearchPath.cxx | 2 +-
Source/cmSetPropertyCommand.cxx | 1 +
Source/cmSetTargetPropertiesCommand.cxx | 1 +
Source/cmSourceFile.h | 3 ++-
Source/cmSourceGroup.h | 1 +
Source/cmStandardIncludes.h | 1 +
Source/cmState.h | 1 +
Source/cmStringCommand.cxx | 1 +
Source/cmSystemTools.cxx | 4 ++--
Source/cmTarget.cxx | 1 +
Source/cmTarget.h | 2 ++
Source/cmTest.cxx | 1 +
Source/cmTest.h | 2 ++
Source/cmTimestamp.cxx | 2 +-
Source/cmTimestamp.h | 2 ++
Source/cmTryRunCommand.cxx | 1 +
Source/cmUseMangledMesaCommand.cxx | 1 +
Source/cmVariableRequiresCommand.cxx | 1 +
Source/cmVisualStudio10TargetGenerator.h | 1 +
Source/cmVisualStudioGeneratorOptions.cxx | 1 +
Source/cmVisualStudioWCEPlatformParser.cxx | 1 +
Source/cmVisualStudioWCEPlatformParser.h | 1 +
Source/cmWhileCommand.cxx | 1 +
Source/cmWhileCommand.h | 1 +
Source/cmWriteFileCommand.cxx | 3 ++-
Source/cmXCode21Object.cxx | 1 +
Source/cmXCodeObject.cxx | 1 +
Source/cmXCodeObject.h | 1 +
Source/cmXMLParser.cxx | 1 +
Source/cmXMLSafe.h | 1 +
Source/cmXMLWriter.cxx | 1 +
Source/cmXMLWriter.h | 1 +
Source/cmake.cxx | 2 +-
Source/cmake.h | 2 ++
Source/cmakexbuild.cxx | 1 +
Source/cmcmd.cxx | 1 +
Tests/MFC/mfc1/mfc1.cpp | 2 +-
Tests/TestsWorkingDirectory/main.c | 2 +-
Tests/VSWinStorePhone/Direct3DApp1/Direct3DApp1.cpp | 2 +-
241 files changed, 293 insertions(+), 119 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list