Commit 180538c7 authored by Brad King's avatar Brad King

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.
parent 0e7bca92
......@@ -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>
......
......@@ -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:
......
......@@ -14,6 +14,7 @@
#define cmWIXFeaturesSourceWriter_h
#include "cmWIXSourceWriter.h"
#include <CPack/cmCPackGenerator.h>
/** \class cmWIXFeaturesSourceWriter
......
......@@ -11,6 +11,7 @@
============================================================================*/
#include "cmWIXFilesSourceWriter.h"
#include "cmWIXAccessControlList.h"
#include <cmInstalledFile.h>
......
......@@ -14,6 +14,7 @@
#define cmWIXFilesSourceWriter_h
#include "cmWIXSourceWriter.h"
#include "cmWIXShortcut.h"
#include "cmWIXPatch.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>
......
......@@ -13,6 +13,8 @@
#ifndef cmWIXRichTextFormatWriter_h
#define cmWIXRichTextFormatWriter_h
#include "cmStandardIncludes.h"
#include <cmsys/FStream.hxx>
/** \class cmWIXRichtTextFormatWriter
......
......@@ -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
......
......@@ -10,8 +10,6 @@
See the License for more information.
============================================================================*/
#include "cmStandardIncludes.h"
#include "cmWIXSourceWriter.h"
#include <CPack/cmCPackGenerator.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
......
......@@ -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.
......
......@@ -11,6 +11,7 @@
============================================================================*/
#include "cmCPackBundleGenerator.h"
#include "cmCPackLog.h"
#include "cmSystemTools.h"
......
......@@ -11,7 +11,9 @@
============================================================================*/
#include "cmCPackComponentGroup.h"
#include "cmSystemTools.h"
#include <vector>
#include <string>
......
......@@ -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"
......
......@@ -13,7 +13,6 @@
#ifndef cmCPackDebGenerator_h
#define cmCPackDebGenerator_h
#include "cmCPackGenerator.h"
/** \class cmCPackDebGenerator
......
......@@ -11,6 +11,7 @@
============================================================================*/
#include "cmCPackDragNDropGenerator.h"
#include "cmCPackLog.h"
#include "cmSystemTools.h"
#include "cmGeneratedFileStream.h"
......
......@@ -14,6 +14,7 @@
#define cmCPackGenerator_h
#include "cmObject.h"
#include "cmSystemTools.h"
#include <map>
#include <vector>
......
......@@ -13,8 +13,8 @@
#ifndef cmCPackNSISGenerator_h
#define cmCPackNSISGenerator_h
#include "cmCPackGenerator.h"
#include <set>
/** \class cmCPackNSISGenerator
......
......@@ -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"
......
......@@ -13,7 +13,6 @@
#ifndef cmCPackPackageMakerGenerator_h
#define cmCPackPackageMakerGenerator_h
#include "cmCPackGenerator.h"
class cmCPackComponent;
......
......@@ -10,6 +10,7 @@
See the License for more information.
============================================================================*/
#include "cmCPackRPMGenerator.h"
#include "cmCPackLog.h"
#include "cmSystemTools.h"
......
......@@ -13,7 +13,6 @@
#ifndef cmCPackRPMGenerator_h
#define cmCPackRPMGenerator_h
#include "cmCPackGenerator.h"
/** \class cmCPackRPMGenerator
......
......@@ -13,7 +13,6 @@
#ifndef cmCPackSTGZGenerator_h
#define cmCPackSTGZGenerator_h
#include "cmCPackTGZGenerator.h"
/** \class cmCPackSTGZGenerator
......
......@@ -11,6 +11,7 @@
============================================================================*/
#include "cmCPackTarBZip2Generator.h"
//----------------------------------------------------------------------
cmCPackTarBZip2Generator::cmCPackTarBZip2Generator()
:cmCPackArchiveGenerator(cmArchiveWrite::CompressBZip2,
......
......@@ -11,6 +11,7 @@
============================================================================*/
#include "cmCTestBatchTestHandler.h"
#include "cmProcess.h"
#include "cmStandardIncludes.h"
#include "cmCTest.h"
......
......@@ -14,6 +14,7 @@
#define cmCTestBatchTestHandler_h
#include <cmStandardIncludes.h>
#include <cmCTestTestHandler.h>
#include <cmCTestMultiProcessHandler.h>
#include <cmCTestRunTest.h>
......
......@@ -13,8 +13,8 @@
#ifndef cmCTestBuildHandler_h
#define cmCTestBuildHandler_h
#include "cmCTestGenericHandler.h"
#include "cmListFileCache.h"
#include <cmsys/RegularExpression.hxx>
......
......@@ -13,8 +13,8 @@
#ifndef cmCTestConfigureHandler_h
#define cmCTestConfigureHandler_h
#include "cmCTestGenericHandler.h"
#include "cmListFileCache.h"
/** \class cmCTestConfigureHandler
......
......@@ -10,6 +10,7 @@
See the License for more information.
============================================================================*/
#include "cmCTestCoverageHandler.h"
#include "cmParsePHPCoverage.h"
#include "cmParseCoberturaCoverage.h"
#include "cmParseGTMCoverage.h"
......
......@@ -13,8 +13,8 @@
#ifndef cmCTestCoverageHandler_h
#define cmCTestCoverageHandler_h
#include "cmCTestGenericHandler.h"
#include "cmListFileCache.h"
#include <cmsys/RegularExpression.hxx>
......
......@@ -11,6 +11,7 @@
============================================================================*/
#include "cmCTestGenericHandler.h"
#include "cmSystemTools.h"
#include "cmCTest.h"
......
......@@ -13,8 +13,8 @@
#ifndef cmCTestGenericHandler_h
#define cmCTestGenericHandler_h
#include "cmObject.h"
#include "cmCTest.h"
#include "cmSystemTools.h" //OutputOption
......
......@@ -13,6 +13,7 @@
#define cmCTestLaunch_h
#include "cmStandardIncludes.h"
#include <cmsys/RegularExpression.hxx>
class cmXMLWriter;
......
......@@ -11,6 +11,7 @@
============================================================================*/
#include "cmCTestMemCheckHandler.h"
#include "cmXMLParser.h"
#include "cmCTest.h"
#include "cmake.h"
......
......@@ -13,9 +13,8 @@
#ifndef cmCTestMemCheckHandler_h
#define cmCTestMemCheckHandler_h
#include "cmCTestTestHandler.h"
#include "cmStandardIncludes.h"
#include "cmListFileCache.h"
#include <vector>
#include <string>
......
......@@ -10,6 +10,7 @@
See the License for more information.
============================================================================*/
#include "cmCTestMultiProcessHandler.h"
#include "cmProcess.h"
#include "cmStandardIncludes.h"
#include "cmCTest.h"
......
......@@ -12,8 +12,8 @@
#ifndef cmCTestMultiProcessHandler_h
#define cmCTestMultiProcessHandler_h
#include <cmStandardIncludes.h>
#include <cmCTestTestHandler.h>
#include <cmCTestRunTest.h>
/** \class cmCTestMultiProcessHandler
......
......@@ -13,6 +13,7 @@
#define cmCTestP4_h
#include "cmCTestGlobalVC.h"
#include <vector>
#include <map>
......
......@@ -10,6 +10,7 @@
See the License for more information.
============================================================================*/
#include "cmCTestReadCustomFilesCommand.h"
#include "cmCTest.h"
bool cmCTestReadCustomFilesCommand
......
......@@ -11,6 +11,7 @@
============================================================================*/
#include "cmCTestRunTest.h"
#include "cmCTestMemCheckHandler.h"
#include "cmCTest.h"
#include "cmSystemTools.h"
......
......@@ -12,8 +12,8 @@
#ifndef cmCTestRunTest_h
#define cmCTestRunTest_h
#include <cmStandardIncludes.h>
#include <cmCTestTestHandler.h>
#include <cmProcess.h>
/** \class cmRunTest
......
......@@ -13,8 +13,8 @@
#ifndef cmCTestScriptHandler_h
#define cmCTestScriptHandler_h
#include "cmCTestGenericHandler.h"
#include "cmListFileCache.h"
class cmMakefile;
......
......@@ -13,6 +13,7 @@
#define cmCTestSubmitCommand_h
#include "cmCTestHandlerCommand.h"
#include "cmCTest.h"
/** \class cmCTestSubmit
......
......@@ -10,6 +10,7 @@
See the License for more information.
============================================================================*/
#include "cmCTestSubmitHandler.h"
#include "cmCTestScriptHandler.h"
#include "cmake.h"
#include "cmSystemTools.h"
......
......@@ -11,6 +11,7 @@
============================================================================*/
#include "cmCTestTestHandler.h"
#include "cmCTestMultiProcessHandler.h"
#include "cmCTestBatchTestHandler.h"
#include "cmCTest.h"
......
......@@ -13,8 +13,8 @@
#ifndef cmCTestTestHandler_h
#define cmCTestTestHandler_h
#include "cmCTestGenericHandler.h"
#include <cmsys/RegularExpression.hxx>
class cmMakefile;
......
......@@ -13,8 +13,8 @@
#ifndef cmCTestUpdateHandler_h
#define cmCTestUpdateHandler_h
#include "cmCTestGenericHandler.h"
#include "cmListFileCache.h"
/** \class cmCTestUpdateHandler
......
......@@ -13,6 +13,7 @@
#define cmCTestUploadCommand_h
#include "cmCTestHandlerCommand.h"
#include "cmCTest.h"
/** \class cmCTestUpload
......
......@@ -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>
......
......@@ -13,7 +13,6 @@
#ifndef cmParseBlanketJSCoverage_h
#define cmParseBlanketJSCoverage_h
#include "cmStandardIncludes.h"
#include "cmCTestCoverageHandler.h"
......
#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>
......
#include "cmStandardIncludes.h"
#include "cmParseCoberturaCoverage.h"
#include "cmSystemTools.h"
#include "cmXMLParser.h"
#include "cmParseCoberturaCoverage.h"
#include <cmsys/Directory.hxx>
#include <cmsys/FStream.hxx>
......
......@@ -13,7 +13,6 @@
#ifndef cmParseCoberturaCoverage_h
#define cmParseCoberturaCoverage_h
#include "cmStandardIncludes.h"
#include "cmCTestCoverageHandler.h"
/** \class cmParsePythonCoverage
......
#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>
......
......@@ -13,7 +13,6 @@
#ifndef cmParseDelphiCoverage_h
#define cmParseDelphiCoverage_h
#include "cmStandardIncludes.h"
#include "cmCTestCoverageHandler.h"
......
#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>
......
#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>
......
......@@ -13,7 +13,6 @@
#ifndef cmParseJacocoCoverage_h
#define cmParseJacocoCoverage_h
#include "cmStandardIncludes.h"
#include "cmCTestCoverageHandler.h"
......
#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>
......
......@@ -13,7 +13,6 @@
#ifndef cmParseMumpsCoverage_h
#define cmParseMumpsCoverage_h
#include "cmStandardIncludes.h"
#include "cmCTestCoverageHandler.h"
/** \class cmParseMumpsCoverage
......
#include "cmStandardIncludes.h"
#include "cmSystemTools.h"
#include "cmParsePHPCoverage.h"
#include "cmSystemTools.h"
#include <cmsys/Directory.hxx>
#include <cmsys/FStream.hxx>
......
......@@ -13,7 +13,6 @@
#ifndef cmParsePHPCoverage_h
#define cmParsePHPCoverage_h
#include "cmStandardIncludes.h"
#include "cmCTestCoverageHandler.h"
/** \class cmParsePHPCoverage
......
......@@ -11,6 +11,7 @@
============================================================================*/
#include <cmProcess.h>