diff options
| author | Brad King <brad.king@kitware.com> | 2016-04-29 09:40:20 -0400 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-04-29 13:58:31 -0400 |
| commit | 180538c70634dd6dc7fc68b4afbc1cd288c5b5c6 (patch) | |
| tree | 5467b11d2718a4f0b7f32248466a38403df84d6c | |
| parent | 0e7bca923e65df8fda37dd50ca68c7207eb3acbe (diff) | |
| download | cmake-180538c70634dd6dc7fc68b4afbc1cd288c5b5c6.tar.gz | |
Source: Stabilize include order
Each source file has a logical first include file. Include it in an
isolated block so that tools that sort includes do not move them.
254 files changed, 322 insertions, 114 deletions
diff --git a/Source/CPack/WiX/cmCPackWIXGenerator.h b/Source/CPack/WiX/cmCPackWIXGenerator.h index 3f66b2c023..8372cd6bbe 100644 --- a/Source/CPack/WiX/cmCPackWIXGenerator.h +++ b/Source/CPack/WiX/cmCPackWIXGenerator.h @@ -13,11 +13,11 @@ #ifndef cmCPackWIXGenerator_h #define cmCPackWIXGenerator_h +#include <CPack/cmCPackGenerator.h> + #include "cmWIXPatch.h" #include "cmWIXShortcut.h" -#include <CPack/cmCPackGenerator.h> - #include <string> #include <map> diff --git a/Source/CPack/WiX/cmWIXAccessControlList.h b/Source/CPack/WiX/cmWIXAccessControlList.h index 20902f768a..54c2c19b4c 100644 --- a/Source/CPack/WiX/cmWIXAccessControlList.h +++ b/Source/CPack/WiX/cmWIXAccessControlList.h @@ -13,11 +13,11 @@ #ifndef cmWIXAccessControlList_h #define cmWIXAccessControlList_h +#include "cmWIXSourceWriter.h" + #include <cmInstalledFile.h> #include <CPack/cmCPackLog.h> -#include "cmWIXSourceWriter.h" - class cmWIXAccessControlList { public: diff --git a/Source/CPack/WiX/cmWIXFeaturesSourceWriter.h b/Source/CPack/WiX/cmWIXFeaturesSourceWriter.h index 7670417550..ff12e6c4ac 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 d4698a7642..446ce9639a 100644 --- a/Source/CPack/WiX/cmWIXFilesSourceWriter.cxx +++ b/Source/CPack/WiX/cmWIXFilesSourceWriter.cxx @@ -11,6 +11,7 @@ ============================================================================*/ #include "cmWIXFilesSourceWriter.h" + #include "cmWIXAccessControlList.h" #include <cmInstalledFile.h> diff --git a/Source/CPack/WiX/cmWIXFilesSourceWriter.h b/Source/CPack/WiX/cmWIXFilesSourceWriter.h index c48bc15ba9..9df955ba9e 100644 --- a/Source/CPack/WiX/cmWIXFilesSourceWriter.h +++ b/Source/CPack/WiX/cmWIXFilesSourceWriter.h @@ -14,6 +14,7 @@ #define cmWIXFilesSourceWriter_h #include "cmWIXSourceWriter.h" + #include "cmWIXShortcut.h" #include "cmWIXPatch.h" diff --git a/Source/CPack/WiX/cmWIXPatchParser.h b/Source/CPack/WiX/cmWIXPatchParser.h index acaeae3642..42c0787f82 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 f6327fbd5d..acf1fa6f41 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 5945e43673..2a72394c5d 100644 --- a/Source/CPack/WiX/cmWIXShortcut.h +++ b/Source/CPack/WiX/cmWIXShortcut.h @@ -13,13 +13,13 @@ #ifndef cmWIXShortcut_h #define cmWIXShortcut_h +#include <cmInstalledFile.h> + #include <string> #include <map> #include <set> #include <vector> -#include <cmInstalledFile.h> - class cmWIXFilesSourceWriter; struct cmWIXShortcut diff --git a/Source/CPack/WiX/cmWIXSourceWriter.cxx b/Source/CPack/WiX/cmWIXSourceWriter.cxx index 63acb278fc..2e5194c20f 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 9e303f0d8c..be0c169e3e 100644 --- a/Source/CPack/WiX/cmWIXSourceWriter.h +++ b/Source/CPack/WiX/cmWIXSourceWriter.h @@ -13,11 +13,12 @@ #ifndef cmWIXSourceWriter_h #define cmWIXSourceWriter_h -#include <vector> -#include <string> +#include <CPack/cmCPackLog.h> + #include <cmsys/FStream.hxx> -#include <CPack/cmCPackLog.h> +#include <vector> +#include <string> /** \class cmWIXSourceWriter * \brief Helper class to generate XML WiX source files diff --git a/Source/CPack/cmCPackArchiveGenerator.h b/Source/CPack/cmCPackArchiveGenerator.h index 16e7632de4..8b0733959a 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 b2d7019449..e86667d5dd 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 fd20e9b20d..2d41e59e7a 100644 --- a/Source/CPack/cmCPackComponentGroup.cxx +++ b/Source/CPack/cmCPackComponentGroup.cxx @@ -11,7 +11,9 @@ ============================================================================*/ #include "cmCPackComponentGroup.h" + #include "cmSystemTools.h" + #include <vector> #include <string> diff --git a/Source/CPack/cmCPackDebGenerator.cxx b/Source/CPack/cmCPackDebGenerator.cxx index 13c8d8f6cb..96739427e1 100644 --- a/Source/CPack/cmCPackDebGenerator.cxx +++ b/Source/CPack/cmCPackDebGenerator.cxx @@ -9,6 +9,7 @@ implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License for more information. ============================================================================*/ + #include "cmCPackDebGenerator.h" #include "cmSystemTools.h" diff --git a/Source/CPack/cmCPackDebGenerator.h b/Source/CPack/cmCPackDebGenerator.h index d678cfacf3..3d945dd2ab 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 d6de77df92..eccc5cf563 100644 --- a/Source/CPack/cmCPackDragNDropGenerator.cxx +++ b/Source/CPack/cmCPackDragNDropGenerator.cxx @@ -11,6 +11,7 @@ ============================================================================*/ #include "cmCPackDragNDropGenerator.h" + #include "cmCPackLog.h" #include "cmSystemTools.h" #include "cmGeneratedFileStream.h" diff --git a/Source/CPack/cmCPackGenerator.h b/Source/CPack/cmCPackGenerator.h index 907bb1ee15..3a53d0522b 100644 --- a/Source/CPack/cmCPackGenerator.h +++ b/Source/CPack/cmCPackGenerator.h @@ -14,6 +14,7 @@ #define cmCPackGenerator_h #include "cmObject.h" + #include "cmSystemTools.h" #include <map> #include <vector> diff --git a/Source/CPack/cmCPackNSISGenerator.h b/Source/CPack/cmCPackNSISGenerator.h index c7b2ce1084..ab8ece472b 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 8940f54155..cde08b10d8 100644 --- a/Source/CPack/cmCPackOSXX11Generator.cxx +++ b/Source/CPack/cmCPackOSXX11Generator.cxx @@ -9,6 +9,7 @@ implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License for more information. ============================================================================*/ + #include "cmCPackOSXX11Generator.h" #include "cmake.h" diff --git a/Source/CPack/cmCPackPackageMakerGenerator.h b/Source/CPack/cmCPackPackageMakerGenerator.h index 7d349c6626..4e8ff03b4e 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 71ab3a0d53..706f43a680 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 a7722bc58f..a4a1ba87a3 100644 --- a/Source/CPack/cmCPackRPMGenerator.h +++ b/Source/CPack/cmCPackRPMGenerator.h @@ -13,7 +13,6 @@ #ifndef cmCPackRPMGenerator_h #define cmCPackRPMGenerator_h - #include "cmCPackGenerator.h" /** \class cmCPackRPMGenerator diff --git a/Source/CPack/cmCPackSTGZGenerator.h b/Source/CPack/cmCPackSTGZGenerator.h index ccceec8062..08152b5b22 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 9ff588b3ff..da16737d4d 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 d62c260d64..e462d4aabf 100644 --- a/Source/CTest/cmCTestBatchTestHandler.cxx +++ b/Source/CTest/cmCTestBatchTestHandler.cxx @@ -11,6 +11,7 @@ ============================================================================*/ #include "cmCTestBatchTestHandler.h" + #include "cmProcess.h" #include "cmStandardIncludes.h" #include "cmCTest.h" diff --git a/Source/CTest/cmCTestBatchTestHandler.h b/Source/CTest/cmCTestBatchTestHandler.h index e0c6e48d52..5ff0025831 100644 --- a/Source/CTest/cmCTestBatchTestHandler.h +++ b/Source/CTest/cmCTestBatchTestHandler.h @@ -14,6 +14,7 @@ #define cmCTestBatchTestHandler_h #include <cmStandardIncludes.h> + #include <cmCTestTestHandler.h> #include <cmCTestMultiProcessHandler.h> #include <cmCTestRunTest.h> diff --git a/Source/CTest/cmCTestBuildHandler.h b/Source/CTest/cmCTestBuildHandler.h index 2e9b92a70c..9231170211 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 d880bd7df6..4c1a96b02d 100644 --- a/Source/CTest/cmCTestConfigureHandler.h +++ b/Source/CTest/cmCTestConfigureHandler.h @@ -13,8 +13,8 @@ #ifndef cmCTestConfigureHandler_h #define cmCTestConfigureHandler_h - #include "cmCTestGenericHandler.h" + #include "cmListFileCache.h" /** \class cmCTestConfigureHandler diff --git a/Source/CTest/cmCTestCoverageHandler.cxx b/Source/CTest/cmCTestCoverageHandler.cxx index fd62696701..b05496add9 100644 --- a/Source/CTest/cmCTestCoverageHandler.cxx +++ b/Source/CTest/cmCTestCoverageHandler.cxx @@ -10,6 +10,7 @@ See the License for more information. ============================================================================*/ #include "cmCTestCoverageHandler.h" + #include "cmParsePHPCoverage.h" #include "cmParseCoberturaCoverage.h" #include "cmParseGTMCoverage.h" diff --git a/Source/CTest/cmCTestCoverageHandler.h b/Source/CTest/cmCTestCoverageHandler.h index 7102d1e671..c91a2d7dbc 100644 --- a/Source/CTest/cmCTestCoverageHandler.h +++ b/Source/CTest/cmCTestCoverageHandler.h @@ -13,8 +13,8 @@ #ifndef cmCTestCoverageHandler_h #define cmCTestCoverageHandler_h - #include "cmCTestGenericHandler.h" + #include "cmListFileCache.h" #include <cmsys/RegularExpression.hxx> diff --git a/Source/CTest/cmCTestGenericHandler.cxx b/Source/CTest/cmCTestGenericHandler.cxx index ad79ba2b17..7eccb9c436 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 4b7ae7901a..7a7e03431b 100644 --- a/Source/CTest/cmCTestGenericHandler.h +++ b/Source/CTest/cmCTestGenericHandler.h @@ -13,8 +13,8 @@ #ifndef cmCTestGenericHandler_h #define cmCTestGenericHandler_h - #include "cmObject.h" + #include "cmCTest.h" #include "cmSystemTools.h" //OutputOption diff --git a/Source/CTest/cmCTestLaunch.h b/Source/CTest/cmCTestLaunch.h index b13e4847b9..1a908a3fd4 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 acf527acdf..3d0f16add4 100644 --- a/Source/CTest/cmCTestMemCheckHandler.cxx +++ b/Source/CTest/cmCTestMemCheckHandler.cxx @@ -11,6 +11,7 @@ ============================================================================*/ #include "cmCTestMemCheckHandler.h" + #include "cmXMLParser.h" #include "cmCTest.h" #include "cmake.h" diff --git a/Source/CTest/cmCTestMemCheckHandler.h b/Source/CTest/cmCTestMemCheckHandler.h index f1ac794dc8..01311b6348 100644 --- a/Source/CTest/cmCTestMemCheckHandler.h +++ b/Source/CTest/cmCTestMemCheckHandler.h @@ -13,9 +13,8 @@ #ifndef cmCTestMemCheckHandler_h #define cmCTestMemCheckHandler_h - #include "cmCTestTestHandler.h" -#include "cmStandardIncludes.h" + #include "cmListFileCache.h" #include <vector> #include <string> diff --git a/Source/CTest/cmCTestMultiProcessHandler.cxx b/Source/CTest/cmCTestMultiProcessHandler.cxx index 7c7f5dfe2d..df6aff1c86 100644 --- a/Source/CTest/cmCTestMultiProcessHandler.cxx +++ b/Source/CTest/cmCTestMultiProcessHandler.cxx @@ -10,6 +10,7 @@ See the License for more information. ============================================================================*/ #include "cmCTestMultiProcessHandler.h" + #include "cmProcess.h" #include "cmStandardIncludes.h" #include "cmCTest.h" diff --git a/Source/CTest/cmCTestMultiProcessHandler.h b/Source/CTest/cmCTestMultiProcessHandler.h index ed3e155a08..64e56e605b 100644 --- a/Source/CTest/cmCTestMultiProcessHandler.h +++ b/Source/CTest/cmCTestMultiProcessHandler.h @@ -12,8 +12,8 @@ #ifndef cmCTestMultiProcessHandler_h #define cmCTestMultiProcessHandler_h -#include <cmStandardIncludes.h> #include <cmCTestTestHandler.h> + #include <cmCTestRunTest.h> /** \class cmCTestMultiProcessHandler diff --git a/Source/CTest/cmCTestP4.h b/Source/CTest/cmCTestP4.h index 7a53475fd8..6f907d10b7 100644 --- a/Source/CTest/cmCTestP4.h +++ b/Source/CTest/cmCTestP4.h @@ -13,6 +13,7 @@ #define cmCTestP4_h #include "cmCTestGlobalVC.h" + #include <vector> #include <map> diff --git a/Source/CTest/cmCTestReadCustomFilesCommand.cxx b/Source/CTest/cmCTestReadCustomFilesCommand.cxx index 3b9d5527a8..5db01f98d0 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 f329e7719e..34ad2d0230 100644 --- a/Source/CTest/cmCTestRunTest.cxx +++ b/Source/CTest/cmCTestRunTest.cxx @@ -11,6 +11,7 @@ ============================================================================*/ #include "cmCTestRunTest.h" + #include "cmCTestMemCheckHandler.h" #include "cmCTest.h" #include "cmSystemTools.h" diff --git a/Source/CTest/cmCTestRunTest.h b/Source/CTest/cmCTestRunTest.h index 3b5c83160a..5f3467a874 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 c9d0b6a3c7..2b66f7049a 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 19e8eafb56..ebc8c36417 100644 --- a/Source/CTest/cmCTestSubmitCommand.h +++ b/Source/CTest/cmCTestSubmitCommand.h @@ -13,6 +13,7 @@ #define cmCTestSubmitCommand_h #include "cmCTestHandlerCommand.h" + #include "cmCTest.h" /** \class cmCTestSubmit diff --git a/Source/CTest/cmCTestSubmitHandler.cxx b/Source/CTest/cmCTestSubmitHandler.cxx index 833cad6f0d..3b682e39ac 100644 --- a/Source/CTest/cmCTestSubmitHandler.cxx +++ b/Source/CTest/cmCTestSubmitHandler.cxx @@ -10,6 +10,7 @@ See the License for more information. ============================================================================*/ #include "cmCTestSubmitHandler.h" + #include "cmCTestScriptHandler.h" #include "cmake.h" #include "cmSystemTools.h" diff --git a/Source/CTest/cmCTestTestHandler.cxx b/Source/CTest/cmCTestTestHandler.cxx index 59ed98eb02..f91fa5fe1d 100644 --- a/Source/CTest/cmCTestTestHandler.cxx +++ b/Source/CTest/cmCTestTestHandler.cxx @@ -11,6 +11,7 @@ ============================================================================*/ #include "cmCTestTestHandler.h" + #include "cmCTestMultiProcessHandler.h" #include "cmCTestBatchTestHandler.h" #include "cmCTest.h" diff --git a/Source/CTest/cmCTestTestHandler.h b/Source/CTest/cmCTestTestHandler.h index d12c2b6437..28338dd63d 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 d2423c0d5f..463703c3d8 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 4a07608d25..18022543cd 100644 --- a/Source/CTest/cmCTestUploadCommand.h +++ b/Source/CTest/cmCTestUploadCommand.h @@ -13,6 +13,7 @@ #define cmCTestUploadCommand_h #include "cmCTestHandlerCommand.h" + #include "cmCTest.h" /** \class cmCTestUpload diff --git a/Source/CTest/cmParseBlanketJSCoverage.cxx b/Source/CTest/cmParseBlanketJSCoverage.cxx index 1edd01f486..26dd425f72 100644 --- a/Source/CTest/cmParseBlanketJSCoverage.cxx +++ b/Source/CTest/cmParseBlanketJSCoverage.cxx @@ -9,11 +9,11 @@ implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License for more information. ============================================================================*/ -#include "cmStandardIncludes.h" +#include "cmParseBlanketJSCoverage.h" + #include <stdio.h> #include <stdlib.h> #include "cmSystemTools.h" -#include "cmParseBlanketJSCoverage.h" #include <cmsys/Directory.hxx> #include <cmsys/Glob.hxx> #include <cmsys/FStream.hxx> diff --git a/Source/CTest/cmParseBlanketJSCoverage.h b/Source/CTest/cmParseBlanketJSCoverage.h index fc1d477474..d34492d84e 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 92bf88eafc..38e0ac226b 100644 --- a/Source/CTest/cmParseCacheCoverage.cxx +++ b/Source/CTest/cmParseCacheCoverage.cxx @@ -1,8 +1,8 @@ -#include "cmStandardIncludes.h" +#include "cmParseCacheCoverage.h" + #include <stdio.h> #include <stdlib.h> #include "cmSystemTools.h" -#include "cmParseCacheCoverage.h" #include <cmsys/Directory.hxx> #include <cmsys/Glob.hxx> #include <cmsys/FStream.hxx> diff --git a/Source/CTest/cmParseCoberturaCoverage.cxx b/Source/CTest/cmParseCoberturaCoverage.cxx index 515d041f02..5b4a37660c 100644 --- a/Source/CTest/cmParseCoberturaCoverage.cxx +++ b/Source/CTest/cmParseCoberturaCoverage.cxx @@ -1,7 +1,7 @@ -#include "cmStandardIncludes.h" +#include "cmParseCoberturaCoverage.h" + #include "cmSystemTools.h" #include "cmXMLParser.h" -#include "cmParseCoberturaCoverage.h" #include <cmsys/Directory.hxx> #include <cmsys/FStream.hxx> diff --git a/Source/CTest/cmParseCoberturaCoverage.h b/Source/CTest/cmParseCoberturaCoverage.h index ff5954dd1a..c3e3ec98e6 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 e453fe1670..ed526263a6 100644 --- a/Source/CTest/cmParseDelphiCoverage.cxx +++ b/Source/CTest/cmParseDelphiCoverage.cxx @@ -1,9 +1,9 @@ -#include "cmStandardIncludes.h" +#include "cmParseDelphiCoverage.h" + #include <stdio.h> #include <stdlib.h> #include "cmSystemTools.h" #include "cmXMLParser.h" -#include "cmParseDelphiCoverage.h" #include <cmsys/Directory.hxx> #include <cmsys/Glob.hxx> #include <cmsys/FStream.hxx> diff --git a/Source/CTest/cmParseDelphiCoverage.h b/Source/CTest/cmParseDelphiCoverage.h index 018340b2ed..2c3f3b31fb 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 f3f80084db..56922468f6 100644 --- a/Source/CTest/cmParseGTMCoverage.cxx +++ b/Source/CTest/cmParseGTMCoverage.cxx @@ -1,8 +1,8 @@ -#include "cmStandardIncludes.h" +#include "cmParseGTMCoverage.h" + #include <stdio.h> #include <stdlib.h> #include "cmSystemTools.h" -#include "cmParseGTMCoverage.h" #include <cmsys/Directory.hxx> #include <cmsys/Glob.hxx> #include <cmsys/FStream.hxx> diff --git a/Source/CTest/cmParseJacocoCoverage.cxx b/Source/CTest/cmParseJacocoCoverage.cxx index 47e3b3267c..f5386c952d 100644 --- a/Source/CTest/cmParseJacocoCoverage.cxx +++ b/Source/CTest/cmParseJacocoCoverage.cxx @@ -1,9 +1,9 @@ -#include "cmStandardIncludes.h" +#include "cmParseJacocoCoverage.h" + #include <stdio.h> #include <stdlib.h> #include "cmSystemTools.h" #include "cmXMLParser.h" -#include "cmParseJacocoCoverage.h" #include <cmsys/Directory.hxx> #include <cmsys/Glob.hxx> #include <cmsys/FStream.hxx> diff --git a/Source/CTest/cmParseJacocoCoverage.h b/Source/CTest/cmParseJacocoCoverage.h index dad05a32e4..cf86508fd8 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 225e704d90..65679064ac 100644 --- a/Source/CTest/cmParseMumpsCoverage.cxx +++ b/Source/CTest/cmParseMumpsCoverage.cxx @@ -1,8 +1,8 @@ -#include "cmStandardIncludes.h" +#include "cmParseGTMCoverage.h" + #include <stdio.h> #include <stdlib.h> #include "cmSystemTools.h" -#include "cmParseGTMCoverage.h" #include <cmsys/Directory.hxx> #include <cmsys/Glob.hxx> #include <cmsys/FStream.hxx> diff --git a/Source/CTest/cmParseMumpsCoverage.h b/Source/CTest/cmParseMumpsCoverage.h index bc71891688..ab957b88bf 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 c7f5a684d1..7c2901ed21 100644 --- a/Source/CTest/cmParsePHPCoverage.cxx +++ b/Source/CTest/cmParsePHPCoverage.cxx @@ -1,6 +1,6 @@ -#include "cmStandardIncludes.h" -#include "cmSystemTools.h" #include "cmParsePHPCoverage.h" + +#include "cmSystemTools.h" #include <cmsys/Directory.hxx> #include <cmsys/FStream.hxx> diff --git a/Source/CTest/cmParsePHPCoverage.h b/Source/CTest/cmParsePHPCoverage.h index 92a76347f1..706d0366fc 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 6441886486..c9a4618451 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 c9fd859996..326456e663 100644 --- a/Source/CTest/cmProcess.h +++ b/Source/CTest/cmProcess.h @@ -12,8 +12,8 @@ #ifndef cmProcess_h #define cmProcess_h - #include "cmStandardIncludes.h" + #include <cmsys/Process.h> diff --git a/Source/CursesDialog/ccmake.cxx b/Source/CursesDialog/ccmake.cxx index 5236e57d56..7bff0f0866 100644 --- a/Source/CursesDialog/ccmake.cxx +++ b/Source/CursesDialog/ccmake.cxx @@ -9,6 +9,8 @@ implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License for more information. ============================================================================*/ +#include "cmCursesStandardIncludes.h" + #include "../cmSystemTools.h" #include "../cmake.h" #include "../cmDocumentation.h" @@ -17,7 +19,6 @@ #include <sys/ioctl.h> #include "cmCursesMainForm.h" -#include "cmCursesStandardIncludes.h" #include <cmsys/Encoding.hxx> #include <form.h> diff --git a/Source/CursesDialog/cmCursesBoolWidget.cxx b/Source/CursesDialog/cmCursesBoolWidget.cxx index 29d9cb23bb..0529b7823d 100644 --- a/Source/CursesDialog/cmCursesBoolWidget.cxx +++ b/Source/CursesDialog/cmCursesBoolWidget.cxx @@ -10,6 +10,7 @@ See the License for more information. ============================================================================*/ #include "cmCursesBoolWidget.h" + #include "cmCursesMainForm.h" cmCursesBoolWidget::cmCursesBoolWidget(int width, int height, diff --git a/Source/CursesDialog/cmCursesBoolWidget.h b/Source/CursesDialog/cmCursesBoolWidget.h index 8a57c73daa..65a8ddb852 100644 --- a/Source/CursesDialog/cmCursesBoolWidget.h +++ b/Source/CursesDialog/cmCursesBoolWidget.h @@ -13,6 +13,7 @@ #define cmCursesBoolWidget_h #include "cmCursesWidget.h" + class cmCursesMainForm; class cmCursesBoolWidget : public cmCursesWidget diff --git a/Source/CursesDialog/cmCursesCacheEntryComposite.cxx b/Source/CursesDialog/cmCursesCacheEntryComposite.cxx index 7e09242124..ace5c435ce 100644 --- a/Source/CursesDialog/cmCursesCacheEntryComposite.cxx +++ b/Source/CursesDialog/cmCursesCacheEntryComposite.cxx @@ -10,6 +10,7 @@ See the License for more information. ============================================================================*/ #include "cmCursesCacheEntryComposite.h" + #include "cmCursesOptionsWidget.h" #include "cmCursesStringWidget.h" #include "cmCursesLabelWidget.h" diff --git a/Source/CursesDialog/cmCursesForm.h b/Source/CursesDialog/cmCursesForm.h index 9837f5aa34..2c4549451f 100644 --- a/Source/CursesDialog/cmCursesForm.h +++ b/Source/CursesDialog/cmCursesForm.h @@ -12,8 +12,8 @@ #ifndef cmCursesForm_h #define cmCursesForm_h -#include "../cmStandardIncludes.h" #include "cmCursesStandardIncludes.h" + #include <cmsys/FStream.hxx> class cmCursesForm diff --git a/Source/CursesDialog/cmCursesLabelWidget.h b/Source/CursesDialog/cmCursesLabelWidget.h index 98170f5818..c31a58cac0 100644 --- a/Source/CursesDialog/cmCursesLabelWidget.h +++ b/Source/CursesDialog/cmCursesLabelWidget.h @@ -13,7 +13,6 @@ #define cmCursesLabelWidget_h #include "cmCursesWidget.h" -#include "cmCursesStandardIncludes.h" class cmCursesMainForm; diff --git a/Source/CursesDialog/cmCursesLongMessageForm.cxx b/Source/CursesDialog/cmCursesLongMessageForm.cxx index 6144ddc2b8..cd8f3f1633 100644 --- a/Source/CursesDialog/cmCursesLongMessageForm.cxx +++ b/Source/CursesDialog/cmCursesLongMessageForm.cxx @@ -9,10 +9,11 @@ implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License for more information. ============================================================================*/ +#include "cmCursesLongMessageForm.h" + #include "../cmSystemTools.h" #include "../cmake.h" #include "../cmVersion.h" -#include "cmCursesLongMessageForm.h" #include "cmCursesMainForm.h" inline int ctrl(int z) diff --git a/Source/CursesDialog/cmCursesLongMessageForm.h b/Source/CursesDialog/cmCursesLongMessageForm.h index 6e37eeadea..e9bd542c49 100644 --- a/Source/CursesDialog/cmCursesLongMessageForm.h +++ b/Source/CursesDialog/cmCursesLongMessageForm.h @@ -12,10 +12,10 @@ #ifndef cmCursesLongMessageForm_h #define cmCursesLongMessageForm_h -#include "../cmStandardIncludes.h" -#include "cmCursesForm.h" #include "cmCursesStandardIncludes.h" +#include "cmCursesForm.h" + class cmCursesCacheEntryComposite; class cmCursesLongMessageForm : public cmCursesForm diff --git a/Source/CursesDialog/cmCursesMainForm.cxx b/Source/CursesDialog/cmCursesMainForm.cxx index a2fc2c0cad..8c2a8b46b4 100644 --- a/Source/CursesDialog/cmCursesMainForm.cxx +++ b/Source/CursesDialog/cmCursesMainForm.cxx @@ -9,10 +9,11 @@ implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License for more information. ============================================================================*/ +#include "cmCursesMainForm.h" + #include "../cmSystemTools.h" #include "../cmVersion.h" #include "../cmake.h" -#include "cmCursesMainForm.h" #include "cmCursesStringWidget.h" #include "cmCursesLabelWidget.h" #include "cmCursesBoolWidget.h" diff --git a/Source/CursesDialog/cmCursesMainForm.h b/Source/CursesDialog/cmCursesMainForm.h index d194168523..9a80ba20c6 100644 --- a/Source/CursesDialog/cmCursesMainForm.h +++ b/Source/CursesDialog/cmCursesMainForm.h @@ -12,10 +12,10 @@ #ifndef cmCursesMainForm_h #define cmCursesMainForm_h -#include "../cmStandardIncludes.h" +#include "cmCursesStandardIncludes.h" + #include "../cmState.h" #include "cmCursesForm.h" -#include "cmCursesStandardIncludes.h" class cmCursesCacheEntryComposite; class cmCursesWidget; diff --git a/Source/CursesDialog/cmCursesOptionsWidget.cxx b/Source/CursesDialog/cmCursesOptionsWidget.cxx index 30110a496a..05aeab1cd9 100644 --- a/Source/CursesDialog/cmCursesOptionsWidget.cxx +++ b/Source/CursesDialog/cmCursesOptionsWidget.cxx @@ -10,6 +10,7 @@ See the License for more information. ============================================================================*/ #include "cmCursesOptionsWidget.h" + #include "cmCursesMainForm.h" inline int ctrl(int z) diff --git a/Source/CursesDialog/cmCursesOptionsWidget.h b/Source/CursesDialog/cmCursesOptionsWidget.h index 324014eaee..ba359d3bb5 100644 --- a/Source/CursesDialog/cmCursesOptionsWidget.h +++ b/Source/CursesDialog/cmCursesOptionsWidget.h @@ -13,6 +13,7 @@ #define cmCursesOptionsWidget_h #include "cmCursesWidget.h" + class cmCursesMainForm; class cmCursesOptionsWidget : public cmCursesWidget diff --git a/Source/CursesDialog/cmCursesStandardIncludes.h b/Source/CursesDialog/cmCursesStandardIncludes.h index 6047ec579b..69a05b2ee7 100644 --- a/Source/CursesDialog/cmCursesStandardIncludes.h +++ b/Source/CursesDialog/cmCursesStandardIncludes.h @@ -11,6 +11,9 @@ ============================================================================*/ #ifndef cmCursesStandardIncludes_h #define cmCursesStandardIncludes_h + +#include "../cmStandardIncludes.h" + #if defined(__sun__) && defined(__GNUC__) #define _MSE_INT_H #endif diff --git a/Source/CursesDialog/cmCursesStringWidget.cxx b/Source/CursesDialog/cmCursesStringWidget.cxx index 1c832ddfd0..6bd7b4500e 100644 --- a/Source/CursesDialog/cmCursesStringWidget.cxx +++ b/Source/CursesDialog/cmCursesStringWidget.cxx @@ -10,6 +10,7 @@ See the License for more information. ============================================================================*/ #include "cmCursesStringWidget.h" + #include "cmCursesMainForm.h" inline int ctrl(int z) diff --git a/Source/CursesDialog/cmCursesWidget.h b/Source/CursesDialog/cmCursesWidget.h index 7bbdff109d..1f53786e0b 100644 --- a/Source/CursesDialog/cmCursesWidget.h +++ b/Source/CursesDialog/cmCursesWidget.h @@ -12,9 +12,10 @@ #ifndef cmCursesWidget_h #define cmCursesWidget_h -#include "../cmState.h" #include "cmCursesStandardIncludes.h" +#include "../cmState.h" + class cmCursesMainForm; class cmCursesWidget diff --git a/Source/QtDialog/AddCacheEntry.cxx b/Source/QtDialog/AddCacheEntry.cxx index 3881045bdd..b575f757ec 100644 --- a/Source/QtDialog/AddCacheEntry.cxx +++ b/Source/QtDialog/AddCacheEntry.cxx @@ -11,6 +11,7 @@ ============================================================================*/ #include "AddCacheEntry.h" + #include <QMetaProperty> #include <QCompleter> diff --git a/Source/QtDialog/AddCacheEntry.h b/Source/QtDialog/AddCacheEntry.h index 38c3a7444c..c327915b01 100644 --- a/Source/QtDialog/AddCacheEntry.h +++ b/Source/QtDialog/AddCacheEntry.h @@ -13,11 +13,12 @@ #ifndef AddCacheEntry_h #define AddCacheEntry_h +#include "QCMake.h" + #include <QWidget> #include <QCheckBox> #include <QStringList> -#include "QCMake.h" #include "ui_AddCacheEntry.h" class AddCacheEntry : public QWidget, public Ui::AddCacheEntry diff --git a/Source/QtDialog/CMakeSetup.cxx b/Source/QtDialog/CMakeSetup.cxx index cff4f6f531..72adb8d755 100644 --- a/Source/QtDialog/CMakeSetup.cxx +++ b/Source/QtDialog/CMakeSetup.cxx @@ -10,6 +10,7 @@ See the License for more information. ============================================================================*/ #include "QCMake.h" // include to disable MS warnings + #include <QApplication> #include <QDir> #include <QTranslator> diff --git a/Source/QtDialog/CMakeSetupDialog.cxx b/Source/QtDialog/CMakeSetupDialog.cxx index 2fc4fafdc4..f25f402324 100644 --- a/Source/QtDialog/CMakeSetupDialog.cxx +++ b/Source/QtDialog/CMakeSetupDialog.cxx @@ -11,6 +11,7 @@ ============================================================================*/ #include "CMakeSetupDialog.h" + #include <QFileDialog> #include <QProgressBar> #include <QMessageBox> diff --git a/Source/QtDialog/CMakeSetupDialog.h b/Source/QtDialog/CMakeSetupDialog.h index 4b53b1cbda..eaac61c6a2 100644 --- a/Source/QtDialog/CMakeSetupDialog.h +++ b/Source/QtDialog/CMakeSetupDialog.h @@ -14,6 +14,7 @@ #define CMakeSetupDialog_h #include "QCMake.h" + #include <QMainWindow> #include <QThread> #include <QEventLoop> diff --git a/Source/QtDialog/Compilers.h b/Source/QtDialog/Compilers.h index 3f7b83411a..ee898861bb 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 61aad72e02..64fe676054 100644 --- a/Source/QtDialog/FirstConfigure.cxx +++ b/Source/QtDialog/FirstConfigure.cxx @@ -1,5 +1,6 @@ #include "FirstConfigure.h" + #include "Compilers.h" #include <QSettings> diff --git a/Source/QtDialog/FirstConfigure.h b/Source/QtDialog/FirstConfigure.h index 09952b6509..3c574d4f09 100644 --- a/Source/QtDialog/FirstConfigure.h +++ b/Source/QtDialog/FirstConfigure.h @@ -4,7 +4,9 @@ #include <QWizard> #include <QWizardPage> + #include "cmake.h" + #include "ui_Compilers.h" #include "ui_CrossCompiler.h" diff --git a/Source/QtDialog/QCMake.h b/Source/QtDialog/QCMake.h index 8942e7c909..ca6f0f4a1c 100644 --- a/Source/QtDialog/QCMake.h +++ b/Source/QtDialog/QCMake.h @@ -12,6 +12,9 @@ #ifndef QCMake_h #define QCMake_h + +#include "cmake.h" + #ifdef _MSC_VER #pragma warning ( disable : 4127 ) #pragma warning ( disable : 4512 ) @@ -27,8 +30,6 @@ #include <QMetaType> #include <QAtomicInt> -#include "cmake.h" - /// struct to represent cmake properties in Qt /// Value is of type String or Bool struct QCMakeProperty diff --git a/Source/QtDialog/QCMakeCacheView.h b/Source/QtDialog/QCMakeCacheView.h index 41f0bd87cb..5ac09665ce 100644 --- a/Source/QtDialog/QCMakeCacheView.h +++ b/Source/QtDialog/QCMakeCacheView.h @@ -14,6 +14,7 @@ #define QCMakeCacheView_h #include "QCMake.h" + #include <QTreeView> #include <QSet> #include <QStandardItemModel> diff --git a/Source/QtDialog/QCMakeWidgets.h b/Source/QtDialog/QCMakeWidgets.h index 8f58df2bb5..22072827ea 100644 --- a/Source/QtDialog/QCMakeWidgets.h +++ b/Source/QtDialog/QCMakeWidgets.h @@ -16,6 +16,7 @@ #include <QLineEdit> #include <QComboBox> #include <QCompleter> + class QToolButton; // common widgets for Qt based CMake diff --git a/Source/cmAddDependenciesCommand.cxx b/Source/cmAddDependenciesCommand.cxx index 01e525311e..3b28359487 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 92ac07dfdc..07cb295b5c 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 fb78446dc0..b203a226d6 100644 --- a/Source/cmCPluginAPI.cxx +++ b/Source/cmCPluginAPI.cxx @@ -14,8 +14,9 @@ these routines just manipulate arguments and then call the associated methods on the CMake classes. */ -#include "cmMakefile.h" #include "cmCPluginAPI.h" + +#include "cmMakefile.h" #include "cmVersion.h" #include "cmSourceFile.h" diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx index f3e7121f7f..4ba15ac104 100644 --- a/Source/cmCTest.cxx +++ b/Source/cmCTest.cxx @@ -12,6 +12,7 @@ #include "cmCurl.h" // include before anything that includes windows.h #include "cmCTest.h" + #include "cmake.h" #include "cmMakefile.h" #include "cmGlobalGenerator.h" diff --git a/Source/cmCTest.h b/Source/cmCTest.h index 73c2807523..07081fc9c6 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 7466c299aa..2cda0184c3 100644 --- a/Source/cmCacheManager.cxx +++ b/Source/cmCacheManager.cxx @@ -9,8 +9,8 @@ implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License for more information. ============================================================================*/ - #include "cmCacheManager.h" + #include "cmSystemTools.h" #include "cmGeneratedFileStream.h" #include "cmake.h" diff --git a/Source/cmCacheManager.h b/Source/cmCacheManager.h index 6f063ebbcb..614ff69de5 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 0e0483892a..636a827373 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 59bc396f33..d7f5c99103 100644 --- a/Source/cmCommand.h +++ b/Source/cmCommand.h @@ -13,6 +13,7 @@ #define cmCommand_h #include "cmObject.h" + #include "cmListFileCache.h" #include "cmMakefile.h" #include "cmCommandArgumentsHelper.h" diff --git a/Source/cmCommands.h b/Source/cmCommands.h index 7a94423a49..0786a6427f 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 f10e4e435b..9b0bfaa8f0 100644 --- a/Source/cmComputeLinkDepends.h +++ b/Source/cmComputeLinkDepends.h @@ -13,8 +13,8 @@ #define cmComputeLinkDepends_h #include "cmStandardIncludes.h" -#include "cmLinkItem.h" +#include "cmLinkItem.h" #include "cmGraphAdjacencyList.h" #include <queue> diff --git a/Source/cmConditionEvaluator.cxx b/Source/cmConditionEvaluator.cxx index 07c9dd6205..c43ec47398 100644 --- a/Source/cmConditionEvaluator.cxx +++ b/Source/cmConditionEvaluator.cxx @@ -11,6 +11,7 @@ ============================================================================*/ #include "cmConditionEvaluator.h" + #include "cmOutputConverter.h" #include "cmAlgorithms.h" diff --git a/Source/cmCoreTryCompile.cxx b/Source/cmCoreTryCompile.cxx index cfd31b2612..c38429ff50 100644 --- a/Source/cmCoreTryCompile.cxx +++ b/Source/cmCoreTryCompile.cxx @@ -10,6 +10,7 @@ See the License for more information. ============================================================================*/ #include "cmCoreTryCompile.h" + #include "cmake.h" #include "cmOutputConverter.h" #include "cmGlobalGenerator.h" diff --git a/Source/cmCreateTestSourceList.cxx b/Source/cmCreateTestSourceList.cxx index e67099193a..65eee3474f 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 4f3d89083f..35a68c0d9d 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 0c5609ca77..2bc54cd60d 100644 --- a/Source/cmCurl.h +++ b/Source/cmCurl.h @@ -12,10 +12,10 @@ #ifndef cmCurl_h #define cmCurl_h -#include <cmsys/Configure.h> -#include "cm_curl.h" #include "cmStandardIncludes.h" +#include "cm_curl.h" + std::string cmCurlSetCAInfo(::CURL *curl, const char* cafile = 0); #endif diff --git a/Source/cmCustomCommand.h b/Source/cmCustomCommand.h index f9b38c3c4a..0370497344 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 0efc7fcf58..0334948b47 100644 --- a/Source/cmDefinePropertyCommand.cxx +++ b/Source/cmDefinePropertyCommand.cxx @@ -10,6 +10,7 @@ See the License for more information. ============================================================================*/ #include "cmDefinePropertyCommand.h" + #include "cmake.h" #include "cmState.h" diff --git a/Source/cmDependsC.h b/Source/cmDependsC.h index 07d3c21f34..cf0a4231a2 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 b6c5fde7e2..a1d73f5a64 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 d796da84b6..66b94c24b7 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 b480cd53b2..8d8e39662f 100644 --- a/Source/cmELF.cxx +++ b/Source/cmELF.cxx @@ -10,6 +10,7 @@ See the License for more information. ============================================================================*/ #include "cmStandardIncludes.h" // to get CMAKE_USE_ELF_PARSER first + #include "cmELF.h" #include <cmsys/auto_ptr.hxx> diff --git a/Source/cmEndIfCommand.cxx b/Source/cmEndIfCommand.cxx index 0ac09de727..05f23c4f1d 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 41785c2b0a..110973754c 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 a371390514..1731b910ee 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 4eec66a339..94e1d928b2 100644 --- a/Source/cmExportCommand.cxx +++ b/Source/cmExportCommand.cxx @@ -10,6 +10,7 @@ See the License for more information. ============================================================================*/ #include "cmExportCommand.h" + #include "cmGlobalGenerator.h" #include "cmGeneratedFileStream.h" #include "cmake.h" diff --git a/Source/cmExportLibraryDependenciesCommand.cxx b/Source/cmExportLibraryDependenciesCommand.cxx index 21d961fbc4..132df74d5f 100644 --- a/Source/cmExportLibraryDependenciesCommand.cxx +++ b/Source/cmExportLibraryDependenciesCommand.cxx @@ -10,6 +10,7 @@ See the License for more information. ============================================================================*/ #include "cmExportLibraryDependenciesCommand.h" + #include "cmGlobalGenerator.h" #include "cmGeneratedFileStream.h" #include "cmake.h" diff --git a/Source/cmExportSet.cxx b/Source/cmExportSet.cxx index 0059b64007..e7739fb94d 100644 --- a/Source/cmExportSet.cxx +++ b/Source/cmExportSet.cxx @@ -11,6 +11,7 @@ ============================================================================*/ #include "cmExportSet.h" + #include "cmTargetExport.h" #include "cmAlgorithms.h" #include "cmLocalGenerator.h" diff --git a/Source/cmExportSet.h b/Source/cmExportSet.h index d780a228c1..a3359ace0c 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 cf431c60c2..b0021e7702 100644 --- a/Source/cmExportSetMap.cxx +++ b/Source/cmExportSetMap.cxx @@ -11,6 +11,7 @@ ============================================================================*/ #include "cmExportSetMap.h" + #include "cmExportSet.h" #include "cmAlgorithms.h" diff --git a/Source/cmExportSetMap.h b/Source/cmExportSetMap.h index 965046ceff..87f2060847 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 9264671a36..cdf02927f8 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 52512a811c..2d26cc3b51 100644 --- a/Source/cmExtraCodeBlocksGenerator.cxx +++ b/Source/cmExtraCodeBlocksGenerator.cxx @@ -11,6 +11,7 @@ See the License for more information. ============================================================================*/ #include "cmExtraCodeBlocksGenerator.h" + #include "cmGlobalUnixMakefileGenerator3.h" #include "cmLocalUnixMakefileGenerator3.h" #include "cmMakefile.h" diff --git a/Source/cmExtraCodeLiteGenerator.cxx b/Source/cmExtraCodeLiteGenerator.cxx index 9fc7b1eec5..e2b84c6f4a 100644 --- a/Source/cmExtraCodeLiteGenerator.cxx +++ b/Source/cmExtraCodeLiteGenerator.cxx @@ -12,6 +12,7 @@ See the License for more information. ============================================================================*/ #include "cmExtraCodeLiteGenerator.h" + #include "cmGlobalUnixMakefileGenerator3.h" #include "cmLocalUnixMakefileGenerator3.h" #include "cmMakefile.h" diff --git a/Source/cmExtraEclipseCDT4Generator.cxx b/Source/cmExtraEclipseCDT4Generator.cxx index 9e67301fd8..22b2f91fb7 100644 --- a/Source/cmExtraEclipseCDT4Generator.cxx +++ b/Source/cmExtraEclipseCDT4Generator.cxx @@ -12,6 +12,7 @@ See the License for more information. ============================================================================*/ #include "cmExtraEclipseCDT4Generator.h" + #include "cmGlobalUnixMakefileGenerator3.h" #include "cmLocalUnixMakefileGenerator3.h" #include "cmMakefile.h" diff --git a/Source/cmExtraKateGenerator.cxx b/Source/cmExtraKateGenerator.cxx index ff5d3ab5fb..8e60d5053e 100644 --- a/Source/cmExtraKateGenerator.cxx +++ b/Source/cmExtraKateGenerator.cxx @@ -11,6 +11,7 @@ See the License for more information. ============================================================================*/ #include "cmExtraKateGenerator.h" + #include "cmGlobalUnixMakefileGenerator3.h" #include "cmLocalUnixMakefileGenerator3.h" #include "cmMakefile.h" diff --git a/Source/cmExtraSublimeTextGenerator.cxx b/Source/cmExtraSublimeTextGenerator.cxx index 92d38b95c7..f84eeb0189 100644 --- a/Source/cmExtraSublimeTextGenerator.cxx +++ b/Source/cmExtraSublimeTextGenerator.cxx @@ -11,6 +11,7 @@ See the License for more information. ============================================================================*/ #include "cmExtraSublimeTextGenerator.h" + #include "cmake.h" #include "cmGeneratedFileStream.h" #include "cmGeneratorTarget.h" diff --git a/Source/cmFileCommand.cxx b/Source/cmFileCommand.cxx index b0a61b2c3d..42922e1920 100644 --- a/Source/cmFileCommand.cxx +++ b/Source/cmFileCommand.cxx @@ -10,6 +10,7 @@ See the License for more information. ============================================================================*/ #include "cmFileCommand.h" + #include "cmCryptoHash.h" #include "cmake.h" #include "cmHexFileConverter.h" diff --git a/Source/cmFindCommon.cxx b/Source/cmFindCommon.cxx index 913985fdb5..1286a00b0e 100644 --- a/Source/cmFindCommon.cxx +++ b/Source/cmFindCommon.cxx @@ -10,6 +10,7 @@ See the License for more information. ============================================================================*/ #include "cmFindCommon.h" + #include <functional> #include <algorithm> diff --git a/Source/cmFindFileCommand.cxx b/Source/cmFindFileCommand.cxx index 615e7c1d29..a6666ba85b 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 e7696af402..91c7b5cdf1 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 219ad48b5c..1734c01300 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 36e88088f3..027b8cb9c1 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 a3b80781d9..d0d52cedaf 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 2df435e711..1a5ce59037 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 8df3e1a985..cb397c1461 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 efd381b530..001f2dfb3b 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 5c9462f0ca..b3bcb50c85 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 ad41274cad..f34dadc669 100644 --- a/Source/cmGeneratorExpressionEvaluationFile.h +++ b/Source/cmGeneratorExpressionEvaluationFile.h @@ -12,12 +12,11 @@ #ifndef cmGeneratorExpressionEvaluationFile_h #define cmGeneratorExpressionEvaluationFile_h -#include "cmStandardIncludes.h" +#include "cmGeneratorExpression.h" + #include <sys/types.h> #include <cmsys/auto_ptr.hxx> -#include "cmGeneratorExpression.h" - class cmLocalGenerator; //---------------------------------------------------------------------------- diff --git a/Source/cmGeneratorExpressionEvaluator.cxx b/Source/cmGeneratorExpressionEvaluator.cxx index af94bcc695..0fe864c722 100644 --- a/Source/cmGeneratorExpressionEvaluator.cxx +++ b/Source/cmGeneratorExpressionEvaluator.cxx @@ -9,9 +9,9 @@ implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License for more information. ============================================================================*/ -#include "cmMakefile.h" - #include "cmGeneratorExpressionEvaluator.h" + +#include "cmMakefile.h" #include "cmGeneratorExpressionParser.h" #include "cmGeneratorExpressionDAGChecker.h" #include "cmGeneratorExpression.h" diff --git a/Source/cmGeneratorExpressionEvaluator.h b/Source/cmGeneratorExpressionEvaluator.h index 407f83f195..ba27e5a039 100644 --- a/Source/cmGeneratorExpressionEvaluator.h +++ b/Source/cmGeneratorExpressionEvaluator.h @@ -12,9 +12,10 @@ #ifndef cmGeneratorExpressionEvaluator_h #define cmGeneratorExpressionEvaluator_h -#include "cmListFileCache.h" #include "cmGeneratorExpressionContext.h" +#include "cmListFileCache.h" + #include <vector> #include <string> diff --git a/Source/cmGeneratorExpressionNode.cxx b/Source/cmGeneratorExpressionNode.cxx index 32b2f82518..7f3d7d6893 100644 --- a/Source/cmGeneratorExpressionNode.cxx +++ b/Source/cmGeneratorExpressionNode.cxx @@ -11,6 +11,7 @@ ============================================================================*/ #include "cmGeneratorExpressionNode.h" + #include "cmGlobalGenerator.h" #include "cmAlgorithms.h" #include "cmOutputConverter.h" diff --git a/Source/cmGeneratorExpressionNode.h b/Source/cmGeneratorExpressionNode.h index 854811b99e..b803d1237d 100644 --- a/Source/cmGeneratorExpressionNode.h +++ b/Source/cmGeneratorExpressionNode.h @@ -12,10 +12,11 @@ #ifndef cmGeneratorExpressionNode_h #define cmGeneratorExpressionNode_h +#include "cmGeneratorExpression.h" + #include "cmGeneratorExpressionEvaluator.h" #include "cmGeneratorExpressionParser.h" #include "cmGeneratorExpressionDAGChecker.h" -#include "cmGeneratorExpression.h" #include "cmLocalGenerator.h" #include "cmSourceFile.h" diff --git a/Source/cmGetFilenameComponentCommand.cxx b/Source/cmGetFilenameComponentCommand.cxx index 0f56c8e8fc..2026a45475 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 91ff0f4a50..862b63c820 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 12e2eee01f..b7b122ca1c 100644 --- a/Source/cmGhsMultiTargetGenerator.cxx +++ b/Source/cmGhsMultiTargetGenerator.cxx @@ -10,6 +10,7 @@ See the License for more information. ============================================================================*/ #include "cmGhsMultiTargetGenerator.h" + #include "cmGlobalGhsMultiGenerator.h" #include "cmLocalGhsMultiGenerator.h" #include "cmMakefile.h" diff --git a/Source/cmGhsMultiTargetGenerator.h b/Source/cmGhsMultiTargetGenerator.h index 3a13600514..93761f2d96 100644 --- a/Source/cmGhsMultiTargetGenerator.h +++ b/Source/cmGhsMultiTargetGenerator.h @@ -12,10 +12,10 @@ #ifndef cmGhsMultiTargetGenerator_h #define cmGhsMultiTargetGenerator_h -#include "cmStandardIncludes.h" -#include "cmTarget.h" #include "cmGhsMultiGpj.h" +#include "cmTarget.h" + class cmGeneratedFileStream; class cmGlobalGhsMultiGenerator; class cmLocalGhsMultiGenerator; diff --git a/Source/cmGlobalBorlandMakefileGenerator.cxx b/Source/cmGlobalBorlandMakefileGenerator.cxx index 40e8d2901a..374cc88247 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 1d0ade47b1..5040cfd8a1 100644 --- a/Source/cmGlobalGenerator.cxx +++ b/Source/cmGlobalGenerator.cxx @@ -17,6 +17,7 @@ #endif #include "cmGlobalGenerator.h" + #include "cmLocalGenerator.h" #include "cmExternalMakefileProjectGenerator.h" #include "cmake.h" diff --git a/Source/cmGlobalGhsMultiGenerator.cxx b/Source/cmGlobalGhsMultiGenerator.cxx index 1bcbd26adc..e9a48c8922 100644 --- a/Source/cmGlobalGhsMultiGenerator.cxx +++ b/Source/cmGlobalGhsMultiGenerator.cxx @@ -10,6 +10,7 @@ See the License for more information. ============================================================================*/ #include "cmGlobalGhsMultiGenerator.h" + #include "cmLocalGhsMultiGenerator.h" #include "cmMakefile.h" #include "cmVersion.h" diff --git a/Source/cmGlobalGhsMultiGenerator.h b/Source/cmGlobalGhsMultiGenerator.h index 6f86c5d4e3..b8d6ade8d0 100644 --- a/Source/cmGlobalGhsMultiGenerator.h +++ b/Source/cmGlobalGhsMultiGenerator.h @@ -12,8 +12,9 @@ #ifndef cmGhsMultiGenerator_h #define cmGhsMultiGenerator_h -#include "cmGlobalGeneratorFactory.h" #include "cmGlobalGenerator.h" + +#include "cmGlobalGeneratorFactory.h" #include "cmGhsMultiGpj.h" class cmGeneratedFileStream; diff --git a/Source/cmGlobalJOMMakefileGenerator.cxx b/Source/cmGlobalJOMMakefileGenerator.cxx index 3f33f91fca..31cd2d356a 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 b4f7670848..758caaedf0 100644 --- a/Source/cmGlobalKdevelopGenerator.cxx +++ b/Source/cmGlobalKdevelopGenerator.cxx @@ -11,6 +11,7 @@ See the License for more information. ============================================================================*/ #include "cmGlobalKdevelopGenerator.h" + #include "cmGlobalUnixMakefileGenerator3.h" #include "cmLocalUnixMakefileGenerator3.h" #include "cmMakefile.h" diff --git a/Source/cmGlobalMSYSMakefileGenerator.cxx b/Source/cmGlobalMSYSMakefileGenerator.cxx index 9a6f3ba451..a2b0bd10a2 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 b6e52d7bc8..c965f57dc8 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 7c570a6273..0a9f64424b 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 fadb0cf827..88766fe62d 100644 --- a/Source/cmGlobalNinjaGenerator.cxx +++ b/Source/cmGlobalNinjaGenerator.cxx @@ -10,10 +10,11 @@ implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License for more information. ============================================================================*/ +#include "cmGlobalNinjaGenerator.h" + #include "cmGeneratedFileStream.h" #include "cmGeneratorExpressionEvaluationFile.h" #include "cmGeneratorTarget.h" -#include "cmGlobalNinjaGenerator.h" #include "cmLocalNinjaGenerator.h" #include "cmMakefile.h" #include "cmVersion.h" diff --git a/Source/cmGlobalNinjaGenerator.h b/Source/cmGlobalNinjaGenerator.h index 3093a11137..56e2bdbd52 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 ce7815d7d9..e35aa2e73e 100644 --- a/Source/cmGlobalUnixMakefileGenerator3.cxx +++ b/Source/cmGlobalUnixMakefileGenerator3.cxx @@ -10,6 +10,7 @@ See the License for more information. ============================================================================*/ #include "cmGlobalUnixMakefileGenerator3.h" + #include "cmLocalUnixMakefileGenerator3.h" #include "cmMakefileTargetGenerator.h" #include "cmMakefile.h" diff --git a/Source/cmGlobalUnixMakefileGenerator3.h b/Source/cmGlobalUnixMakefileGenerator3.h index 0591a5a593..b035df4429 100644 --- a/Source/cmGlobalUnixMakefileGenerator3.h +++ b/Source/cmGlobalUnixMakefileGenerator3.h @@ -13,6 +13,7 @@ #define cmGlobalUnixMakefileGenerator3_h #include "cmGlobalCommonGenerator.h" + #include "cmGlobalGeneratorFactory.h" class cmGeneratedFileStream; diff --git a/Source/cmGlobalVisualStudio10Generator.cxx b/Source/cmGlobalVisualStudio10Generator.cxx index c24e7f510c..ee5e60592c 100644 --- a/Source/cmGlobalVisualStudio10Generator.cxx +++ b/Source/cmGlobalVisualStudio10Generator.cxx @@ -10,7 +10,9 @@ See the License for more information. ============================================================================*/ #include "windows.h" // this must be first to define GetCurrentDirectory + #include "cmGlobalVisualStudio10Generator.h" + #include "cmLocalVisualStudio10Generator.h" #include "cmMakefile.h" #include "cmSourceFile.h" diff --git a/Source/cmGlobalVisualStudio11Generator.cxx b/Source/cmGlobalVisualStudio11Generator.cxx index 9b00357753..5eafe8ad9b 100644 --- a/Source/cmGlobalVisualStudio11Generator.cxx +++ b/Source/cmGlobalVisualStudio11Generator.cxx @@ -10,6 +10,7 @@ See the License for more information. ============================================================================*/ #include "cmGlobalVisualStudio11Generator.h" + #include "cmLocalVisualStudio10Generator.h" #include "cmMakefile.h" #include "cmAlgorithms.h" diff --git a/Source/cmGlobalVisualStudio12Generator.cxx b/Source/cmGlobalVisualStudio12Generator.cxx index 568d4d7ff6..e92ab5b9e1 100644 --- a/Source/cmGlobalVisualStudio12Generator.cxx +++ b/Source/cmGlobalVisualStudio12Generator.cxx @@ -10,6 +10,7 @@ See the License for more information. ============================================================================*/ #include "cmGlobalVisualStudio12Generator.h" + #include "cmLocalVisualStudio10Generator.h" #include "cmMakefile.h" #include "cmAlgorithms.h" diff --git a/Source/cmGlobalVisualStudio14Generator.cxx b/Source/cmGlobalVisualStudio14Generator.cxx index c058f8ce42..df61503c53 100644 --- a/Source/cmGlobalVisualStudio14Generator.cxx +++ b/Source/cmGlobalVisualStudio14Generator.cxx @@ -10,6 +10,7 @@ See the License for more information. ============================================================================*/ #include "cmGlobalVisualStudio14Generator.h" + #include "cmLocalVisualStudio10Generator.h" #include "cmMakefile.h" #include "cmAlgorithms.h" diff --git a/Source/cmGlobalVisualStudio71Generator.cxx b/Source/cmGlobalVisualStudio71Generator.cxx index 7b51fdf49c..bf59925207 100644 --- a/Source/cmGlobalVisualStudio71Generator.cxx +++ b/Source/cmGlobalVisualStudio71Generator.cxx @@ -10,7 +10,9 @@ See the License for more information. ============================================================================*/ #include "windows.h" // this must be first to define GetCurrentDirectory + #include "cmGlobalVisualStudio71Generator.h" + #include "cmLocalVisualStudio7Generator.h" #include "cmMakefile.h" #include "cmake.h" diff --git a/Source/cmGlobalVisualStudio7Generator.cxx b/Source/cmGlobalVisualStudio7Generator.cxx index c1c8c77e54..f8fe0747d3 100644 --- a/Source/cmGlobalVisualStudio7Generator.cxx +++ b/Source/cmGlobalVisualStudio7Generator.cxx @@ -10,8 +10,9 @@ See the License for more information. ============================================================================*/ #include "windows.h" // this must be first to define GetCurrentDirectory -#include <assert.h> + #include "cmGlobalVisualStudio7Generator.h" + #include "cmGeneratedFileStream.h" #include "cmLocalVisualStudio7Generator.h" #include "cmMakefile.h" @@ -19,6 +20,8 @@ #include "cmake.h" #include <cmsys/Encoding.hxx> +#include <assert.h> + //---------------------------------------------------------------------------- static cmVS7FlagTable cmVS7ExtraFlagTable[] = { diff --git a/Source/cmGlobalVisualStudio7Generator.h b/Source/cmGlobalVisualStudio7Generator.h index 02f9809d7f..a360bd96cd 100644 --- a/Source/cmGlobalVisualStudio7Generator.h +++ b/Source/cmGlobalVisualStudio7Generator.h @@ -13,6 +13,7 @@ #define cmGlobalVisualStudio7Generator_h #include "cmGlobalVisualStudioGenerator.h" + #include "cmGlobalGeneratorFactory.h" class cmTarget; diff --git a/Source/cmGlobalVisualStudio8Generator.cxx b/Source/cmGlobalVisualStudio8Generator.cxx index 5c50530451..506d1a9d6f 100644 --- a/Source/cmGlobalVisualStudio8Generator.cxx +++ b/Source/cmGlobalVisualStudio8Generator.cxx @@ -10,7 +10,9 @@ See the License for more information. ============================================================================*/ #include "windows.h" // this must be first to define GetCurrentDirectory + #include "cmGlobalVisualStudio8Generator.h" + #include "cmLocalVisualStudio7Generator.h" #include "cmMakefile.h" #include "cmVisualStudioWCEPlatformParser.h" diff --git a/Source/cmGlobalVisualStudio9Generator.cxx b/Source/cmGlobalVisualStudio9Generator.cxx index da6ffaebab..c2ef332b49 100644 --- a/Source/cmGlobalVisualStudio9Generator.cxx +++ b/Source/cmGlobalVisualStudio9Generator.cxx @@ -10,7 +10,9 @@ See the License for more information. ============================================================================*/ #include "windows.h" // this must be first to define GetCurrentDirectory + #include "cmGlobalVisualStudio9Generator.h" + #include "cmLocalVisualStudio7Generator.h" #include "cmMakefile.h" #include "cmVisualStudioWCEPlatformParser.h" diff --git a/Source/cmGlobalWatcomWMakeGenerator.cxx b/Source/cmGlobalWatcomWMakeGenerator.cxx index 153773fcb2..63f82bbb24 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 755c8a68c1..62583410d8 100644 --- a/Source/cmGlobalXCodeGenerator.cxx +++ b/Source/cmGlobalXCodeGenerator.cxx @@ -10,6 +10,7 @@ See the License for more information. ============================================================================*/ #include "cmGlobalXCodeGenerator.h" + #include "cmLocalXCodeGenerator.h" #include "cmMakefile.h" #include "cmXCodeObject.h" diff --git a/Source/cmGlobalXCodeGenerator.h b/Source/cmGlobalXCodeGenerator.h index f7bfb26c42..2a48ac8b6e 100644 --- a/Source/cmGlobalXCodeGenerator.h +++ b/Source/cmGlobalXCodeGenerator.h @@ -13,6 +13,7 @@ #define cmGlobalXCodeGenerator_h #include "cmGlobalGenerator.h" + #include "cmXCodeObject.h" #include "cmCustomCommand.h" class cmGlobalGeneratorFactory; diff --git a/Source/cmGraphVizWriter.cxx b/Source/cmGraphVizWriter.cxx index 448306fe4f..5b7d229b6f 100644 --- a/Source/cmGraphVizWriter.cxx +++ b/Source/cmGraphVizWriter.cxx @@ -10,6 +10,7 @@ See the License for more information. ============================================================================*/ #include "cmGraphVizWriter.h" + #include "cmMakefile.h" #include "cmLocalGenerator.h" #include "cmGlobalGenerator.h" diff --git a/Source/cmGraphVizWriter.h b/Source/cmGraphVizWriter.h index 90d31d3bee..8b1438e9f7 100644 --- a/Source/cmGraphVizWriter.h +++ b/Source/cmGraphVizWriter.h @@ -1,5 +1,3 @@ -#ifndef CMGRAPHVIZWRITER_H -#define CMGRAPHVIZWRITER_H /*============================================================================ CMake - Cross Platform Makefile Generator Copyright 2000-2009 Kitware, Inc., Insight Software Consortium @@ -11,7 +9,11 @@ implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License for more information. ============================================================================*/ +#ifndef CMGRAPHVIZWRITER_H +#define CMGRAPHVIZWRITER_H + #include "cmStandardIncludes.h" + #include "cmLocalGenerator.h" #include "cmGeneratedFileStream.h" #include <cmsys/RegularExpression.hxx> diff --git a/Source/cmHexFileConverter.h b/Source/cmHexFileConverter.h index e11d74a2fe..89b8533758 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 73860164d6..8c985c78b1 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 fc54ca5aa5..1b8ba0bd33 100644 --- a/Source/cmIfCommand.cxx +++ b/Source/cmIfCommand.cxx @@ -10,6 +10,7 @@ See the License for more information. ============================================================================*/ #include "cmIfCommand.h" + #include "cmStringCommand.h" #include "cmOutputConverter.h" diff --git a/Source/cmIfCommand.h b/Source/cmIfCommand.h index 689efce656..9054a0bf3b 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 6ded365ace..57f5f31581 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 694f1ed52a..e83a39753a 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 b6d0c453c6..790215dc38 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 fa5e81528e..7025d0f430 100644 --- a/Source/cmInstalledFile.cxx +++ b/Source/cmInstalledFile.cxx @@ -10,6 +10,7 @@ See the License for more information. ============================================================================*/ #include "cmInstalledFile.h" + #include "cmSystemTools.h" #include "cmMakefile.h" #include "cmAlgorithms.h" diff --git a/Source/cmListCommand.cxx b/Source/cmListCommand.cxx index 15a1af560d..514bc05c5a 100644 --- a/Source/cmListCommand.cxx +++ b/Source/cmListCommand.cxx @@ -10,6 +10,7 @@ See the License for more information. ============================================================================*/ #include "cmListCommand.h" + #include <cmsys/RegularExpression.hxx> #include <cmsys/SystemTools.hxx> #include "cmAlgorithms.h" diff --git a/Source/cmLoadCommandCommand.cxx b/Source/cmLoadCommandCommand.cxx index 403f7fcc84..ed1adc0b63 100644 --- a/Source/cmLoadCommandCommand.cxx +++ b/Source/cmLoadCommandCommand.cxx @@ -10,6 +10,7 @@ See the License for more information. ============================================================================*/ #include "cmLoadCommandCommand.h" + #include "cmCPluginAPI.h" #include "cmCPluginAPI.cxx" #include "cmDynamicLoader.h" diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h index b673a85cc0..d9c68f9cee 100644 --- a/Source/cmLocalGenerator.h +++ b/Source/cmLocalGenerator.h @@ -13,6 +13,7 @@ #define cmLocalGenerator_h #include "cmStandardIncludes.h" + #include "cmState.h" #include "cmake.h" #include "cmOutputConverter.h" diff --git a/Source/cmLocalGhsMultiGenerator.cxx b/Source/cmLocalGhsMultiGenerator.cxx index a77a75e022..91e75d326d 100644 --- a/Source/cmLocalGhsMultiGenerator.cxx +++ b/Source/cmLocalGhsMultiGenerator.cxx @@ -10,6 +10,7 @@ See the License for more information. ============================================================================*/ #include "cmLocalGhsMultiGenerator.h" + #include "cmGlobalGhsMultiGenerator.h" #include "cmGeneratorTarget.h" #include "cmMakefile.h" diff --git a/Source/cmLocalNinjaGenerator.cxx b/Source/cmLocalNinjaGenerator.cxx index 030b094e1a..143c14e281 100644 --- a/Source/cmLocalNinjaGenerator.cxx +++ b/Source/cmLocalNinjaGenerator.cxx @@ -11,6 +11,7 @@ See the License for more information. ============================================================================*/ #include "cmLocalNinjaGenerator.h" + #include "cmCustomCommandGenerator.h" #include "cmMakefile.h" #include "cmGlobalNinjaGenerator.h" diff --git a/Source/cmLocalNinjaGenerator.h b/Source/cmLocalNinjaGenerator.h index 5e1d6f20d4..9746a3c7a7 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 d0784add2e..ce20c97cba 100644 --- a/Source/cmLocalVisualStudio10Generator.cxx +++ b/Source/cmLocalVisualStudio10Generator.cxx @@ -10,11 +10,13 @@ See the License for more information. ============================================================================*/ #include "cmLocalVisualStudio10Generator.h" + #include "cmMakefile.h" #include "cmVisualStudio10TargetGenerator.h" #include "cmGlobalVisualStudio10Generator.h" #include <cm_expat.h> #include "cmXMLParser.h" + class cmVS10XMLParser : public cmXMLParser { public: diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx index 2f66517ead..de974c2131 100644 --- a/Source/cmLocalVisualStudio7Generator.cxx +++ b/Source/cmLocalVisualStudio7Generator.cxx @@ -9,8 +9,9 @@ implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License for more information. ============================================================================*/ -#include "cmGlobalVisualStudio7Generator.h" #include "cmLocalVisualStudio7Generator.h" + +#include "cmGlobalVisualStudio7Generator.h" #include "cmXMLParser.h" #include <cm_expat.h> #include "cmMakefile.h" diff --git a/Source/cmLocalVisualStudio7Generator.h b/Source/cmLocalVisualStudio7Generator.h index 562f4852b7..5d9a6340cb 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 561f9a136f..a5b8f99b02 100644 --- a/Source/cmLocalVisualStudioGenerator.cxx +++ b/Source/cmLocalVisualStudioGenerator.cxx @@ -10,6 +10,7 @@ See the License for more information. ============================================================================*/ #include "cmLocalVisualStudioGenerator.h" + #include "cmGlobalGenerator.h" #include "cmMakefile.h" #include "cmSourceFile.h" diff --git a/Source/cmLocalVisualStudioGenerator.h b/Source/cmLocalVisualStudioGenerator.h index f95eefaed4..caffff704a 100644 --- a/Source/cmLocalVisualStudioGenerator.h +++ b/Source/cmLocalVisualStudioGenerator.h @@ -13,6 +13,7 @@ #define cmLocalVisualStudioGenerator_h #include "cmLocalGenerator.h" + #include "cmGlobalVisualStudioGenerator.h" #include <cmsys/auto_ptr.hxx> diff --git a/Source/cmLocalXCodeGenerator.cxx b/Source/cmLocalXCodeGenerator.cxx index aec2603660..c837445c1e 100644 --- a/Source/cmLocalXCodeGenerator.cxx +++ b/Source/cmLocalXCodeGenerator.cxx @@ -10,6 +10,7 @@ See the License for more information. ============================================================================*/ #include "cmLocalXCodeGenerator.h" + #include "cmGlobalXCodeGenerator.h" #include "cmSourceFile.h" #include "cmMakefile.h" diff --git a/Source/cmLocale.h b/Source/cmLocale.h index 727f0f5d40..69640f6c56 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 1607845d75..6210da35ea 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 5c1cc000af..6f1ae9e4b0 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 f01ff74bc9..29b947c30e 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -10,6 +10,7 @@ See the License for more information. ============================================================================*/ #include "cmMakefile.h" + #include "cmVersion.h" #include "cmCommand.h" #include "cmSourceFile.h" diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h index 089a83d128..0300d3f019 100644 --- a/Source/cmMakefile.h +++ b/Source/cmMakefile.h @@ -12,6 +12,8 @@ #ifndef cmMakefile_h #define cmMakefile_h +#include "cmStandardIncludes.h" + #include "cmExecutionStatus.h" #include "cmListFileCache.h" #include "cmSystemTools.h" diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx index 322f37d2f1..351940019b 100644 --- a/Source/cmNinjaNormalTargetGenerator.cxx +++ b/Source/cmNinjaNormalTargetGenerator.cxx @@ -11,6 +11,7 @@ See the License for more information. ============================================================================*/ #include "cmNinjaNormalTargetGenerator.h" + #include "cmLocalNinjaGenerator.h" #include "cmGlobalNinjaGenerator.h" #include "cmSourceFile.h" diff --git a/Source/cmNinjaNormalTargetGenerator.h b/Source/cmNinjaNormalTargetGenerator.h index 556ed5e136..300618ce3d 100644 --- a/Source/cmNinjaNormalTargetGenerator.h +++ b/Source/cmNinjaNormalTargetGenerator.h @@ -11,13 +11,13 @@ See the License for more information. ============================================================================*/ #ifndef cmNinjaNormalTargetGenerator_h -# define cmNinjaNormalTargetGenerator_h +#define cmNinjaNormalTargetGenerator_h -# include "cmNinjaTargetGenerator.h" -# include "cmNinjaTypes.h" -# include "cmStandardIncludes.h" +#include "cmNinjaTargetGenerator.h" -# include <set> +#include "cmNinjaTypes.h" + +#include <set> class cmSourceFile; class cmOSXBundleGenerator; diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx index fd1d16dc5b..97ef00d1b9 100644 --- a/Source/cmNinjaTargetGenerator.cxx +++ b/Source/cmNinjaTargetGenerator.cxx @@ -11,6 +11,7 @@ See the License for more information. ============================================================================*/ #include "cmNinjaTargetGenerator.h" + #include "cmGlobalNinjaGenerator.h" #include "cmLocalNinjaGenerator.h" #include "cmGeneratedFileStream.h" diff --git a/Source/cmNinjaTargetGenerator.h b/Source/cmNinjaTargetGenerator.h index 371bc3cc68..40f96b47a7 100644 --- a/Source/cmNinjaTargetGenerator.h +++ b/Source/cmNinjaTargetGenerator.h @@ -15,7 +15,6 @@ #include "cmCommonTargetGenerator.h" -#include "cmStandardIncludes.h" #include "cmNinjaTypes.h" #include "cmGlobalNinjaGenerator.h" #include "cmLocalNinjaGenerator.h" diff --git a/Source/cmNinjaTypes.h b/Source/cmNinjaTypes.h index 498f6b6398..82a52202f9 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 ac66fcd008..c2162ce09c 100644 --- a/Source/cmNinjaUtilityTargetGenerator.cxx +++ b/Source/cmNinjaUtilityTargetGenerator.cxx @@ -11,6 +11,7 @@ See the License for more information. ============================================================================*/ #include "cmNinjaUtilityTargetGenerator.h" + #include "cmCustomCommand.h" #include "cmGeneratedFileStream.h" #include "cmGlobalNinjaGenerator.h" diff --git a/Source/cmNinjaUtilityTargetGenerator.h b/Source/cmNinjaUtilityTargetGenerator.h index add0291a53..fec2946967 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 934e1986a6..6991d7b655 100644 --- a/Source/cmOSXBundleGenerator.cxx +++ b/Source/cmOSXBundleGenerator.cxx @@ -10,6 +10,7 @@ See the License for more information. ============================================================================*/ #include "cmOSXBundleGenerator.h" + #include "cmMakefile.h" #include "cmTarget.h" #include "cmLocalGenerator.h" diff --git a/Source/cmOSXBundleGenerator.h b/Source/cmOSXBundleGenerator.h index f945c15a8c..240026237d 100644 --- a/Source/cmOSXBundleGenerator.h +++ b/Source/cmOSXBundleGenerator.h @@ -13,6 +13,7 @@ #define cmOSXBundleGenerator_h #include "cmStandardIncludes.h" + #include "cmSourceFile.h" #include <string> diff --git a/Source/cmOutputRequiredFilesCommand.cxx b/Source/cmOutputRequiredFilesCommand.cxx index 54208acbe6..3b98c87726 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 ca76c889dd..7fc8ae4173 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 bce69c56b6..68a908507d 100644 --- a/Source/cmPolicies.cxx +++ b/Source/cmPolicies.cxx @@ -1,4 +1,5 @@ #include "cmPolicies.h" + #include "cmake.h" #include "cmMakefile.h" #include "cmVersion.h" diff --git a/Source/cmProperty.cxx b/Source/cmProperty.cxx index ef57068ad5..4cdf650f19 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 1af967c944..9bb812e99d 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 776fad1dca..cfc4bc390e 100644 --- a/Source/cmPropertyDefinitionMap.cxx +++ b/Source/cmPropertyDefinitionMap.cxx @@ -10,6 +10,7 @@ See the License for more information. ============================================================================*/ #include "cmPropertyDefinitionMap.h" + #include "cmSystemTools.h" #include "cmDocumentationSection.h" diff --git a/Source/cmPropertyMap.cxx b/Source/cmPropertyMap.cxx index ef09dbcf08..e6b1529cbb 100644 --- a/Source/cmPropertyMap.cxx +++ b/Source/cmPropertyMap.cxx @@ -10,6 +10,7 @@ See the License for more information. ============================================================================*/ #include "cmPropertyMap.h" + #include "cmSystemTools.h" #include "cmake.h" #include "cmState.h" diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx index 07fc239cf2..f376caa776 100644 --- a/Source/cmQtAutoGenerators.cxx +++ b/Source/cmQtAutoGenerators.cxx @@ -11,6 +11,8 @@ See the License for more information. ============================================================================*/ +#include "cmQtAutoGenerators.h" + #include "cmGlobalGenerator.h" #include "cmOutputConverter.h" #include "cmMakefile.h" @@ -29,8 +31,6 @@ #include <unistd.h> #endif -#include "cmQtAutoGenerators.h" - static bool requiresMocing(const std::string& text, std::string ¯oName) { // this simple check is much much faster than the regexp diff --git a/Source/cmQtAutoGenerators.h b/Source/cmQtAutoGenerators.h index e46e0fc36b..04d2860080 100644 --- a/Source/cmQtAutoGenerators.h +++ b/Source/cmQtAutoGenerators.h @@ -14,6 +14,8 @@ #ifndef cmQtAutoGenerators_h #define cmQtAutoGenerators_h +#include "cmStandardIncludes.h" + #include <list> #include <vector> #include <string> diff --git a/Source/cmSearchPath.cxx b/Source/cmSearchPath.cxx index c9cc81737a..01781b29ef 100644 --- a/Source/cmSearchPath.cxx +++ b/Source/cmSearchPath.cxx @@ -9,8 +9,8 @@ implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License for more information. ============================================================================*/ - #include "cmSearchPath.h" + #include "cmFindCommon.h" #include "cmAlgorithms.h" diff --git a/Source/cmSetPropertyCommand.cxx b/Source/cmSetPropertyCommand.cxx index 17ad475bf1..fc5c95aab5 100644 --- a/Source/cmSetPropertyCommand.cxx +++ b/Source/cmSetPropertyCommand.cxx @@ -10,6 +10,7 @@ See the License for more information. ============================================================================*/ #include "cmSetPropertyCommand.h" + #include "cmSetTargetPropertiesCommand.h" #include "cmSetTestsPropertiesCommand.h" #include "cmSetSourceFilesPropertiesCommand.h" diff --git a/Source/cmSetTargetPropertiesCommand.cxx b/Source/cmSetTargetPropertiesCommand.cxx index b1c13ac966..b4c58d45df 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 1433b54f00..e5e2ab935e 100644 --- a/Source/cmSourceFile.h +++ b/Source/cmSourceFile.h @@ -13,6 +13,7 @@ #define cmSourceFile_h #include "cmSourceFileLocation.h" + #include "cmCustomCommand.h" #include "cmPropertyMap.h" diff --git a/Source/cmSourceGroup.h b/Source/cmSourceGroup.h index e8cf519d4f..316d725336 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 272c1361dc..83cbf677fb 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 7ead7e02e3..7b110347de 100644 --- a/Source/cmState.h +++ b/Source/cmState.h @@ -13,6 +13,7 @@ #define cmState_h #include "cmStandardIncludes.h" + #include "cmPropertyDefinitionMap.h" #include "cmPropertyMap.h" #include "cmLinkedTree.h" diff --git a/Source/cmStringCommand.cxx b/Source/cmStringCommand.cxx index 3c027a0f4d..82c530ce63 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 9af54bffca..2cf2546300 100644 --- a/Source/cmSystemTools.cxx +++ b/Source/cmSystemTools.cxx @@ -9,8 +9,8 @@ implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License for more information. ============================================================================*/ - #include "cmSystemTools.h" + #include "cmAlgorithms.h" #include <ctype.h> #include <errno.h> @@ -39,6 +39,7 @@ #if defined(_WIN32) # include <windows.h> + // include wincrypt.h after windows.h # include <wincrypt.h> #else # include <sys/time.h> diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx index e118356835..275dd6f99d 100644 --- a/Source/cmTarget.cxx +++ b/Source/cmTarget.cxx @@ -10,6 +10,7 @@ See the License for more information. ============================================================================*/ #include "cmTarget.h" + #include "cmake.h" #include "cmMakefile.h" #include "cmSourceFile.h" diff --git a/Source/cmTarget.h b/Source/cmTarget.h index 4e97c2c0eb..b39804347f 100644 --- a/Source/cmTarget.h +++ b/Source/cmTarget.h @@ -12,6 +12,8 @@ #ifndef cmTarget_h #define cmTarget_h +#include "cmStandardIncludes.h" + #include "cmCustomCommand.h" #include "cmPropertyMap.h" #include "cmPolicies.h" diff --git a/Source/cmTest.cxx b/Source/cmTest.cxx index 6fcd0dc95b..812e4d395d 100644 --- a/Source/cmTest.cxx +++ b/Source/cmTest.cxx @@ -10,6 +10,7 @@ See the License for more information. ============================================================================*/ #include "cmTest.h" + #include "cmSystemTools.h" #include "cmake.h" diff --git a/Source/cmTest.h b/Source/cmTest.h index ca88afecd2..44a2d00d09 100644 --- a/Source/cmTest.h +++ b/Source/cmTest.h @@ -12,6 +12,8 @@ #ifndef cmTest_h #define cmTest_h +#include "cmStandardIncludes.h" + #include "cmCustomCommand.h" #include "cmPropertyMap.h" #include "cmListFileCache.h" diff --git a/Source/cmTimestamp.h b/Source/cmTimestamp.h index 7c4b2166e8..72d5cc2ee9 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 d4a36c9820..fdc914201d 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 2ee664fd1d..057b67e5d0 100644 --- a/Source/cmUseMangledMesaCommand.cxx +++ b/Source/cmUseMangledMesaCommand.cxx @@ -10,6 +10,7 @@ See the License for more information. ============================================================================*/ #include "cmUseMangledMesaCommand.h" + #include "cmSystemTools.h" #include <cmsys/RegularExpression.hxx> diff --git a/Source/cmVariableRequiresCommand.cxx b/Source/cmVariableRequiresCommand.cxx index 1d33db13c3..a830842aa6 100644 --- a/Source/cmVariableRequiresCommand.cxx +++ b/Source/cmVariableRequiresCommand.cxx @@ -10,6 +10,7 @@ See the License for more information. ============================================================================*/ #include "cmVariableRequiresCommand.h" + #include "cmState.h" // cmLibraryCommand diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx index 31873b5ccc..7ff9f04f14 100644 --- a/Source/cmVisualStudio10TargetGenerator.cxx +++ b/Source/cmVisualStudio10TargetGenerator.cxx @@ -9,8 +9,9 @@ implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License for more information. ============================================================================*/ -#include "windows.h" #include "cmVisualStudio10TargetGenerator.h" + +#include "windows.h" #include "cmGlobalVisualStudio10Generator.h" #include "cmGeneratorTarget.h" #include "cmComputeLinkInformation.h" diff --git a/Source/cmVisualStudio10TargetGenerator.h b/Source/cmVisualStudio10TargetGenerator.h index 044e0ddee0..6c946c9e86 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 bd4eb69862..142e36f9d4 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 ca226fb50c..b6ee7546ac 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 042df01422..14f8df8ebc 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 7bb78bf8a9..5fdccaa1c2 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 85a0bd327b..902c55ac03 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 cc9f220034..d52d6b5d6a 100644 --- a/Source/cmWriteFileCommand.cxx +++ b/Source/cmWriteFileCommand.cxx @@ -10,6 +10,7 @@ See the License for more information. ============================================================================*/ #include "cmWriteFileCommand.h" + #include <cmsys/FStream.hxx> #include <sys/types.h> diff --git a/Source/cmXCode21Object.cxx b/Source/cmXCode21Object.cxx index 3973540bf5..bd055e58e5 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 911e154993..87b2e8942b 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 2d876da8ff..d00cf0fbd2 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 1d3e0e9379..6a24faa33a 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 ead2e014c5..981359acfd 100644 --- a/Source/cmXMLSafe.h +++ b/Source/cmXMLSafe.h @@ -13,6 +13,7 @@ #define cmXMLSafe_h #include <cmsys/Configure.hxx> + #include <string> #include <iosfwd> diff --git a/Source/cmXMLWriter.cxx b/Source/cmXMLWriter.cxx index 6a9172ac71..ec2646759b 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 308305960f..8fedcd4326 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 8e3380f56b..f3363840ca 100644 --- a/Source/cmake.cxx +++ b/Source/cmake.cxx @@ -10,6 +10,7 @@ See the License for more information. ============================================================================*/ #include "cmake.h" + #include "cmMakefile.h" #include "cmLocalGenerator.h" #include "cmExternalMakefileProjectGenerator.h" diff --git a/Source/cmake.h b/Source/cmake.h index 8644dda1c3..8fb41957a1 100644 --- a/Source/cmake.h +++ b/Source/cmake.h @@ -13,6 +13,8 @@ #ifndef cmake_h #define cmake_h +#include "cmStandardIncludes.h" + #include "cmListFileCache.h" #include "cmSystemTools.h" #include "cmInstalledFile.h" diff --git a/Source/cmakexbuild.cxx b/Source/cmakexbuild.cxx index 9aaeeaa4d7..03059f5b98 100644 --- a/Source/cmakexbuild.cxx +++ b/Source/cmakexbuild.cxx @@ -9,8 +9,9 @@ implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License for more information. ============================================================================*/ -#include <cmsys/Process.h> #include "cmStandardIncludes.h" + +#include <cmsys/Process.h> #include "cmSystemTools.h" // This is a wrapper program for xcodebuild diff --git a/Source/cmcldeps.cxx b/Source/cmcldeps.cxx index f3c6059b1c..3f3ec4de89 100644 --- a/Source/cmcldeps.cxx +++ b/Source/cmcldeps.cxx @@ -19,11 +19,11 @@ // /showIncludes is equivalent to -MD, not -MMD, that is, system headers are // included. +#include <cmSystemTools.h> +#include <cmsys/Encoding.hxx> #include <windows.h> #include <sstream> -#include <cmSystemTools.h> -#include <cmsys/Encoding.hxx> // We don't want any wildcard expansion. // See http://msdn.microsoft.com/en-us/library/zay8tzh6(v=vs.85).aspx diff --git a/Source/cmcmd.cxx b/Source/cmcmd.cxx index 0b9518c93f..2b153bd697 100644 --- a/Source/cmcmd.cxx +++ b/Source/cmcmd.cxx @@ -10,6 +10,7 @@ See the License for more information. ============================================================================*/ #include "cmcmd.h" + #include "cmMakefile.h" #include "cmLocalGenerator.h" #include "cmGlobalGenerator.h" |