diff options
author | Brad King <brad.king@kitware.com> | 2016-04-29 13:40:20 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2016-04-29 17:58:31 (GMT) |
commit | 180538c70634dd6dc7fc68b4afbc1cd288c5b5c6 (patch) | |
tree | 5467b11d2718a4f0b7f32248466a38403df84d6c /Source/CTest | |
parent | 0e7bca923e65df8fda37dd50ca68c7207eb3acbe (diff) | |
download | CMake-180538c70634dd6dc7fc68b4afbc1cd288c5b5c6.zip CMake-180538c70634dd6dc7fc68b4afbc1cd288c5b5c6.tar.gz CMake-180538c70634dd6dc7fc68b4afbc1cd288c5b5c6.tar.bz2 |
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.
Diffstat (limited to 'Source/CTest')
40 files changed, 42 insertions, 34 deletions
diff --git a/Source/CTest/cmCTestBatchTestHandler.cxx b/Source/CTest/cmCTestBatchTestHandler.cxx index d62c260..e462d4a 100644 --- a/Source/CTest/cmCTestBatchTestHandler.cxx +++ b/Source/CTest/cmCTestBatchTestHandler.cxx @@ -11,6 +11,7 @@ ============================================================================*/ #include "cmCTestBatchTestHandler.h" + #include "cmProcess.h" #include "cmStandardIncludes.h" #include "cmCTest.h" diff --git a/Source/CTest/cmCTestBatchTestHandler.h b/Source/CTest/cmCTestBatchTestHandler.h index e0c6e48..5ff0025 100644 --- a/Source/CTest/cmCTestBatchTestHandler.h +++ b/Source/CTest/cmCTestBatchTestHandler.h @@ -14,6 +14,7 @@ #define cmCTestBatchTestHandler_h #include <cmStandardIncludes.h> + #include <cmCTestTestHandler.h> #include <cmCTestMultiProcessHandler.h> #include <cmCTestRunTest.h> diff --git a/Source/CTest/cmCTestBuildHandler.h b/Source/CTest/cmCTestBuildHandler.h index 2e9b92a..9231170 100644 --- a/Source/CTest/cmCTestBuildHandler.h +++ b/Source/CTest/cmCTestBuildHandler.h @@ -13,8 +13,8 @@ #ifndef cmCTestBuildHandler_h #define cmCTestBuildHandler_h - #include "cmCTestGenericHandler.h" + #include "cmListFileCache.h" #include <cmsys/RegularExpression.hxx> diff --git a/Source/CTest/cmCTestConfigureHandler.h b/Source/CTest/cmCTestConfigureHandler.h index d880bd7..4c1a96b 100644 --- a/Source/CTest/cmCTestConfigureHandler.h +++ b/Source/CTest/cmCTestConfigureHandler.h @@ -13,8 +13,8 @@ #ifndef cmCTestConfigureHandler_h #define cmCTestConfigureHandler_h - #include "cmCTestGenericHandler.h" + #include "cmListFileCache.h" /** \class cmCTestConfigureHandler diff --git a/Source/CTest/cmCTestCoverageHandler.cxx b/Source/CTest/cmCTestCoverageHandler.cxx index fd62696..b05496a 100644 --- a/Source/CTest/cmCTestCoverageHandler.cxx +++ b/Source/CTest/cmCTestCoverageHandler.cxx @@ -10,6 +10,7 @@ See the License for more information. ============================================================================*/ #include "cmCTestCoverageHandler.h" + #include "cmParsePHPCoverage.h" #include "cmParseCoberturaCoverage.h" #include "cmParseGTMCoverage.h" diff --git a/Source/CTest/cmCTestCoverageHandler.h b/Source/CTest/cmCTestCoverageHandler.h index 7102d1e..c91a2d7 100644 --- a/Source/CTest/cmCTestCoverageHandler.h +++ b/Source/CTest/cmCTestCoverageHandler.h @@ -13,8 +13,8 @@ #ifndef cmCTestCoverageHandler_h #define cmCTestCoverageHandler_h - #include "cmCTestGenericHandler.h" + #include "cmListFileCache.h" #include <cmsys/RegularExpression.hxx> diff --git a/Source/CTest/cmCTestGenericHandler.cxx b/Source/CTest/cmCTestGenericHandler.cxx index ad79ba2..7eccb9c 100644 --- a/Source/CTest/cmCTestGenericHandler.cxx +++ b/Source/CTest/cmCTestGenericHandler.cxx @@ -11,6 +11,7 @@ ============================================================================*/ #include "cmCTestGenericHandler.h" + #include "cmSystemTools.h" #include "cmCTest.h" diff --git a/Source/CTest/cmCTestGenericHandler.h b/Source/CTest/cmCTestGenericHandler.h index 4b7ae79..7a7e034 100644 --- a/Source/CTest/cmCTestGenericHandler.h +++ b/Source/CTest/cmCTestGenericHandler.h @@ -13,8 +13,8 @@ #ifndef cmCTestGenericHandler_h #define cmCTestGenericHandler_h - #include "cmObject.h" + #include "cmCTest.h" #include "cmSystemTools.h" //OutputOption diff --git a/Source/CTest/cmCTestLaunch.h b/Source/CTest/cmCTestLaunch.h index b13e484..1a908a3 100644 --- a/Source/CTest/cmCTestLaunch.h +++ b/Source/CTest/cmCTestLaunch.h @@ -13,6 +13,7 @@ #define cmCTestLaunch_h #include "cmStandardIncludes.h" + #include <cmsys/RegularExpression.hxx> class cmXMLWriter; diff --git a/Source/CTest/cmCTestMemCheckHandler.cxx b/Source/CTest/cmCTestMemCheckHandler.cxx index acf527a..3d0f16a 100644 --- a/Source/CTest/cmCTestMemCheckHandler.cxx +++ b/Source/CTest/cmCTestMemCheckHandler.cxx @@ -11,6 +11,7 @@ ============================================================================*/ #include "cmCTestMemCheckHandler.h" + #include "cmXMLParser.h" #include "cmCTest.h" #include "cmake.h" diff --git a/Source/CTest/cmCTestMemCheckHandler.h b/Source/CTest/cmCTestMemCheckHandler.h index f1ac794..01311b6 100644 --- a/Source/CTest/cmCTestMemCheckHandler.h +++ b/Source/CTest/cmCTestMemCheckHandler.h @@ -13,9 +13,8 @@ #ifndef cmCTestMemCheckHandler_h #define cmCTestMemCheckHandler_h - #include "cmCTestTestHandler.h" -#include "cmStandardIncludes.h" + #include "cmListFileCache.h" #include <vector> #include <string> diff --git a/Source/CTest/cmCTestMultiProcessHandler.cxx b/Source/CTest/cmCTestMultiProcessHandler.cxx index 7c7f5df..df6aff1 100644 --- a/Source/CTest/cmCTestMultiProcessHandler.cxx +++ b/Source/CTest/cmCTestMultiProcessHandler.cxx @@ -10,6 +10,7 @@ See the License for more information. ============================================================================*/ #include "cmCTestMultiProcessHandler.h" + #include "cmProcess.h" #include "cmStandardIncludes.h" #include "cmCTest.h" diff --git a/Source/CTest/cmCTestMultiProcessHandler.h b/Source/CTest/cmCTestMultiProcessHandler.h index ed3e155..64e56e6 100644 --- a/Source/CTest/cmCTestMultiProcessHandler.h +++ b/Source/CTest/cmCTestMultiProcessHandler.h @@ -12,8 +12,8 @@ #ifndef cmCTestMultiProcessHandler_h #define cmCTestMultiProcessHandler_h -#include <cmStandardIncludes.h> #include <cmCTestTestHandler.h> + #include <cmCTestRunTest.h> /** \class cmCTestMultiProcessHandler diff --git a/Source/CTest/cmCTestP4.h b/Source/CTest/cmCTestP4.h index 7a53475..6f907d1 100644 --- a/Source/CTest/cmCTestP4.h +++ b/Source/CTest/cmCTestP4.h @@ -13,6 +13,7 @@ #define cmCTestP4_h #include "cmCTestGlobalVC.h" + #include <vector> #include <map> diff --git a/Source/CTest/cmCTestReadCustomFilesCommand.cxx b/Source/CTest/cmCTestReadCustomFilesCommand.cxx index 3b9d552..5db01f9 100644 --- a/Source/CTest/cmCTestReadCustomFilesCommand.cxx +++ b/Source/CTest/cmCTestReadCustomFilesCommand.cxx @@ -10,6 +10,7 @@ See the License for more information. ============================================================================*/ #include "cmCTestReadCustomFilesCommand.h" + #include "cmCTest.h" bool cmCTestReadCustomFilesCommand diff --git a/Source/CTest/cmCTestRunTest.cxx b/Source/CTest/cmCTestRunTest.cxx index f329e77..34ad2d0 100644 --- a/Source/CTest/cmCTestRunTest.cxx +++ b/Source/CTest/cmCTestRunTest.cxx @@ -11,6 +11,7 @@ ============================================================================*/ #include "cmCTestRunTest.h" + #include "cmCTestMemCheckHandler.h" #include "cmCTest.h" #include "cmSystemTools.h" diff --git a/Source/CTest/cmCTestRunTest.h b/Source/CTest/cmCTestRunTest.h index 3b5c831..5f3467a 100644 --- a/Source/CTest/cmCTestRunTest.h +++ b/Source/CTest/cmCTestRunTest.h @@ -12,8 +12,8 @@ #ifndef cmCTestRunTest_h #define cmCTestRunTest_h -#include <cmStandardIncludes.h> #include <cmCTestTestHandler.h> + #include <cmProcess.h> /** \class cmRunTest diff --git a/Source/CTest/cmCTestScriptHandler.h b/Source/CTest/cmCTestScriptHandler.h index c9d0b6a..2b66f70 100644 --- a/Source/CTest/cmCTestScriptHandler.h +++ b/Source/CTest/cmCTestScriptHandler.h @@ -13,8 +13,8 @@ #ifndef cmCTestScriptHandler_h #define cmCTestScriptHandler_h - #include "cmCTestGenericHandler.h" + #include "cmListFileCache.h" class cmMakefile; diff --git a/Source/CTest/cmCTestSubmitCommand.h b/Source/CTest/cmCTestSubmitCommand.h index 19e8eaf..ebc8c36 100644 --- a/Source/CTest/cmCTestSubmitCommand.h +++ b/Source/CTest/cmCTestSubmitCommand.h @@ -13,6 +13,7 @@ #define cmCTestSubmitCommand_h #include "cmCTestHandlerCommand.h" + #include "cmCTest.h" /** \class cmCTestSubmit diff --git a/Source/CTest/cmCTestSubmitHandler.cxx b/Source/CTest/cmCTestSubmitHandler.cxx index 833cad6..3b682e3 100644 --- a/Source/CTest/cmCTestSubmitHandler.cxx +++ b/Source/CTest/cmCTestSubmitHandler.cxx @@ -10,6 +10,7 @@ See the License for more information. ============================================================================*/ #include "cmCTestSubmitHandler.h" + #include "cmCTestScriptHandler.h" #include "cmake.h" #include "cmSystemTools.h" diff --git a/Source/CTest/cmCTestTestHandler.cxx b/Source/CTest/cmCTestTestHandler.cxx index 59ed98e..f91fa5f 100644 --- a/Source/CTest/cmCTestTestHandler.cxx +++ b/Source/CTest/cmCTestTestHandler.cxx @@ -11,6 +11,7 @@ ============================================================================*/ #include "cmCTestTestHandler.h" + #include "cmCTestMultiProcessHandler.h" #include "cmCTestBatchTestHandler.h" #include "cmCTest.h" diff --git a/Source/CTest/cmCTestTestHandler.h b/Source/CTest/cmCTestTestHandler.h index d12c2b6..28338dd 100644 --- a/Source/CTest/cmCTestTestHandler.h +++ b/Source/CTest/cmCTestTestHandler.h @@ -13,8 +13,8 @@ #ifndef cmCTestTestHandler_h #define cmCTestTestHandler_h - #include "cmCTestGenericHandler.h" + #include <cmsys/RegularExpression.hxx> class cmMakefile; diff --git a/Source/CTest/cmCTestUpdateHandler.h b/Source/CTest/cmCTestUpdateHandler.h index d2423c0..463703c 100644 --- a/Source/CTest/cmCTestUpdateHandler.h +++ b/Source/CTest/cmCTestUpdateHandler.h @@ -13,8 +13,8 @@ #ifndef cmCTestUpdateHandler_h #define cmCTestUpdateHandler_h - #include "cmCTestGenericHandler.h" + #include "cmListFileCache.h" /** \class cmCTestUpdateHandler diff --git a/Source/CTest/cmCTestUploadCommand.h b/Source/CTest/cmCTestUploadCommand.h index 4a07608..1802254 100644 --- a/Source/CTest/cmCTestUploadCommand.h +++ b/Source/CTest/cmCTestUploadCommand.h @@ -13,6 +13,7 @@ #define cmCTestUploadCommand_h #include "cmCTestHandlerCommand.h" + #include "cmCTest.h" /** \class cmCTestUpload diff --git a/Source/CTest/cmParseBlanketJSCoverage.cxx b/Source/CTest/cmParseBlanketJSCoverage.cxx index 1edd01f..26dd425 100644 --- a/Source/CTest/cmParseBlanketJSCoverage.cxx +++ b/Source/CTest/cmParseBlanketJSCoverage.cxx @@ -9,11 +9,11 @@ implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License for more information. ============================================================================*/ -#include "cmStandardIncludes.h" +#include "cmParseBlanketJSCoverage.h" + #include <stdio.h> #include <stdlib.h> #include "cmSystemTools.h" -#include "cmParseBlanketJSCoverage.h" #include <cmsys/Directory.hxx> #include <cmsys/Glob.hxx> #include <cmsys/FStream.hxx> diff --git a/Source/CTest/cmParseBlanketJSCoverage.h b/Source/CTest/cmParseBlanketJSCoverage.h index fc1d477..d34492d 100644 --- a/Source/CTest/cmParseBlanketJSCoverage.h +++ b/Source/CTest/cmParseBlanketJSCoverage.h @@ -13,7 +13,6 @@ #ifndef cmParseBlanketJSCoverage_h #define cmParseBlanketJSCoverage_h -#include "cmStandardIncludes.h" #include "cmCTestCoverageHandler.h" diff --git a/Source/CTest/cmParseCacheCoverage.cxx b/Source/CTest/cmParseCacheCoverage.cxx index 92bf88e..38e0ac2 100644 --- a/Source/CTest/cmParseCacheCoverage.cxx +++ b/Source/CTest/cmParseCacheCoverage.cxx @@ -1,8 +1,8 @@ -#include "cmStandardIncludes.h" +#include "cmParseCacheCoverage.h" + #include <stdio.h> #include <stdlib.h> #include "cmSystemTools.h" -#include "cmParseCacheCoverage.h" #include <cmsys/Directory.hxx> #include <cmsys/Glob.hxx> #include <cmsys/FStream.hxx> diff --git a/Source/CTest/cmParseCoberturaCoverage.cxx b/Source/CTest/cmParseCoberturaCoverage.cxx index 515d041..5b4a376 100644 --- a/Source/CTest/cmParseCoberturaCoverage.cxx +++ b/Source/CTest/cmParseCoberturaCoverage.cxx @@ -1,7 +1,7 @@ -#include "cmStandardIncludes.h" +#include "cmParseCoberturaCoverage.h" + #include "cmSystemTools.h" #include "cmXMLParser.h" -#include "cmParseCoberturaCoverage.h" #include <cmsys/Directory.hxx> #include <cmsys/FStream.hxx> diff --git a/Source/CTest/cmParseCoberturaCoverage.h b/Source/CTest/cmParseCoberturaCoverage.h index ff5954d..c3e3ec9 100644 --- a/Source/CTest/cmParseCoberturaCoverage.h +++ b/Source/CTest/cmParseCoberturaCoverage.h @@ -13,7 +13,6 @@ #ifndef cmParseCoberturaCoverage_h #define cmParseCoberturaCoverage_h -#include "cmStandardIncludes.h" #include "cmCTestCoverageHandler.h" /** \class cmParsePythonCoverage diff --git a/Source/CTest/cmParseDelphiCoverage.cxx b/Source/CTest/cmParseDelphiCoverage.cxx index e453fe1..ed52626 100644 --- a/Source/CTest/cmParseDelphiCoverage.cxx +++ b/Source/CTest/cmParseDelphiCoverage.cxx @@ -1,9 +1,9 @@ -#include "cmStandardIncludes.h" +#include "cmParseDelphiCoverage.h" + #include <stdio.h> #include <stdlib.h> #include "cmSystemTools.h" #include "cmXMLParser.h" -#include "cmParseDelphiCoverage.h" #include <cmsys/Directory.hxx> #include <cmsys/Glob.hxx> #include <cmsys/FStream.hxx> diff --git a/Source/CTest/cmParseDelphiCoverage.h b/Source/CTest/cmParseDelphiCoverage.h index 018340b..2c3f3b3 100644 --- a/Source/CTest/cmParseDelphiCoverage.h +++ b/Source/CTest/cmParseDelphiCoverage.h @@ -13,7 +13,6 @@ #ifndef cmParseDelphiCoverage_h #define cmParseDelphiCoverage_h -#include "cmStandardIncludes.h" #include "cmCTestCoverageHandler.h" diff --git a/Source/CTest/cmParseGTMCoverage.cxx b/Source/CTest/cmParseGTMCoverage.cxx index f3f8008..5692246 100644 --- a/Source/CTest/cmParseGTMCoverage.cxx +++ b/Source/CTest/cmParseGTMCoverage.cxx @@ -1,8 +1,8 @@ -#include "cmStandardIncludes.h" +#include "cmParseGTMCoverage.h" + #include <stdio.h> #include <stdlib.h> #include "cmSystemTools.h" -#include "cmParseGTMCoverage.h" #include <cmsys/Directory.hxx> #include <cmsys/Glob.hxx> #include <cmsys/FStream.hxx> diff --git a/Source/CTest/cmParseJacocoCoverage.cxx b/Source/CTest/cmParseJacocoCoverage.cxx index 47e3b32..f5386c9 100644 --- a/Source/CTest/cmParseJacocoCoverage.cxx +++ b/Source/CTest/cmParseJacocoCoverage.cxx @@ -1,9 +1,9 @@ -#include "cmStandardIncludes.h" +#include "cmParseJacocoCoverage.h" + #include <stdio.h> #include <stdlib.h> #include "cmSystemTools.h" #include "cmXMLParser.h" -#include "cmParseJacocoCoverage.h" #include <cmsys/Directory.hxx> #include <cmsys/Glob.hxx> #include <cmsys/FStream.hxx> diff --git a/Source/CTest/cmParseJacocoCoverage.h b/Source/CTest/cmParseJacocoCoverage.h index dad05a3..cf86508 100644 --- a/Source/CTest/cmParseJacocoCoverage.h +++ b/Source/CTest/cmParseJacocoCoverage.h @@ -13,7 +13,6 @@ #ifndef cmParseJacocoCoverage_h #define cmParseJacocoCoverage_h -#include "cmStandardIncludes.h" #include "cmCTestCoverageHandler.h" diff --git a/Source/CTest/cmParseMumpsCoverage.cxx b/Source/CTest/cmParseMumpsCoverage.cxx index 225e704..6567906 100644 --- a/Source/CTest/cmParseMumpsCoverage.cxx +++ b/Source/CTest/cmParseMumpsCoverage.cxx @@ -1,8 +1,8 @@ -#include "cmStandardIncludes.h" +#include "cmParseGTMCoverage.h" + #include <stdio.h> #include <stdlib.h> #include "cmSystemTools.h" -#include "cmParseGTMCoverage.h" #include <cmsys/Directory.hxx> #include <cmsys/Glob.hxx> #include <cmsys/FStream.hxx> diff --git a/Source/CTest/cmParseMumpsCoverage.h b/Source/CTest/cmParseMumpsCoverage.h index bc71891..ab957b8 100644 --- a/Source/CTest/cmParseMumpsCoverage.h +++ b/Source/CTest/cmParseMumpsCoverage.h @@ -13,7 +13,6 @@ #ifndef cmParseMumpsCoverage_h #define cmParseMumpsCoverage_h -#include "cmStandardIncludes.h" #include "cmCTestCoverageHandler.h" /** \class cmParseMumpsCoverage diff --git a/Source/CTest/cmParsePHPCoverage.cxx b/Source/CTest/cmParsePHPCoverage.cxx index c7f5a68..7c2901e 100644 --- a/Source/CTest/cmParsePHPCoverage.cxx +++ b/Source/CTest/cmParsePHPCoverage.cxx @@ -1,6 +1,6 @@ -#include "cmStandardIncludes.h" -#include "cmSystemTools.h" #include "cmParsePHPCoverage.h" + +#include "cmSystemTools.h" #include <cmsys/Directory.hxx> #include <cmsys/FStream.hxx> diff --git a/Source/CTest/cmParsePHPCoverage.h b/Source/CTest/cmParsePHPCoverage.h index 92a7634..706d036 100644 --- a/Source/CTest/cmParsePHPCoverage.h +++ b/Source/CTest/cmParsePHPCoverage.h @@ -13,7 +13,6 @@ #ifndef cmParsePHPCoverage_h #define cmParsePHPCoverage_h -#include "cmStandardIncludes.h" #include "cmCTestCoverageHandler.h" /** \class cmParsePHPCoverage diff --git a/Source/CTest/cmProcess.cxx b/Source/CTest/cmProcess.cxx index 6441886..c9a4618 100644 --- a/Source/CTest/cmProcess.cxx +++ b/Source/CTest/cmProcess.cxx @@ -11,6 +11,7 @@ ============================================================================*/ #include <cmProcess.h> + #include <cmSystemTools.h> cmProcess::cmProcess() diff --git a/Source/CTest/cmProcess.h b/Source/CTest/cmProcess.h index c9fd859..326456e 100644 --- a/Source/CTest/cmProcess.h +++ b/Source/CTest/cmProcess.h @@ -12,8 +12,8 @@ #ifndef cmProcess_h #define cmProcess_h - #include "cmStandardIncludes.h" + #include <cmsys/Process.h> |