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

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;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment