diff options
Diffstat (limited to 'Source/CPack')
24 files changed, 29 insertions, 19 deletions
diff --git a/Source/CPack/WiX/cmCPackWIXGenerator.h b/Source/CPack/WiX/cmCPackWIXGenerator.h index 3f66b2c..8372cd6 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 20902f7..54c2c19 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 7670417..ff12e6c 100644 --- a/Source/CPack/WiX/cmWIXFeaturesSourceWriter.h +++ b/Source/CPack/WiX/cmWIXFeaturesSourceWriter.h @@ -14,6 +14,7 @@ #define cmWIXFeaturesSourceWriter_h #include "cmWIXSourceWriter.h" + #include <CPack/cmCPackGenerator.h> /** \class cmWIXFeaturesSourceWriter diff --git a/Source/CPack/WiX/cmWIXFilesSourceWriter.cxx b/Source/CPack/WiX/cmWIXFilesSourceWriter.cxx index d4698a7..446ce96 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 c48bc15..9df955b 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 acaeae3..42c0787 100644 --- a/Source/CPack/WiX/cmWIXPatchParser.h +++ b/Source/CPack/WiX/cmWIXPatchParser.h @@ -13,10 +13,10 @@ #ifndef cmCPackWIXPatchParser_h #define cmCPackWIXPatchParser_h -#include <cmXMLParser.h> - #include <CPack/cmCPackLog.h> +#include <cmXMLParser.h> + #include <map> #include <list> diff --git a/Source/CPack/WiX/cmWIXRichTextFormatWriter.h b/Source/CPack/WiX/cmWIXRichTextFormatWriter.h index f6327fb..acf1fa6 100644 --- a/Source/CPack/WiX/cmWIXRichTextFormatWriter.h +++ b/Source/CPack/WiX/cmWIXRichTextFormatWriter.h @@ -13,6 +13,8 @@ #ifndef cmWIXRichTextFormatWriter_h #define cmWIXRichTextFormatWriter_h +#include "cmStandardIncludes.h" + #include <cmsys/FStream.hxx> /** \class cmWIXRichtTextFormatWriter diff --git a/Source/CPack/WiX/cmWIXShortcut.h b/Source/CPack/WiX/cmWIXShortcut.h index 5945e43..2a72394 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 63acb27..2e5194c 100644 --- a/Source/CPack/WiX/cmWIXSourceWriter.cxx +++ b/Source/CPack/WiX/cmWIXSourceWriter.cxx @@ -10,8 +10,6 @@ See the License for more information. ============================================================================*/ -#include "cmStandardIncludes.h" - #include "cmWIXSourceWriter.h" #include <CPack/cmCPackGenerator.h> diff --git a/Source/CPack/WiX/cmWIXSourceWriter.h b/Source/CPack/WiX/cmWIXSourceWriter.h index 9e303f0..be0c169 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 16e7632..8b07339 100644 --- a/Source/CPack/cmCPackArchiveGenerator.h +++ b/Source/CPack/cmCPackArchiveGenerator.h @@ -13,9 +13,10 @@ #ifndef cmCPackArchiveGenerator_h #define cmCPackArchiveGenerator_h -#include "cmArchiveWrite.h" #include "cmCPackGenerator.h" +#include "cmArchiveWrite.h" + /** \class cmCPackArchiveGenerator * \brief A generator base for libarchive generation. diff --git a/Source/CPack/cmCPackBundleGenerator.cxx b/Source/CPack/cmCPackBundleGenerator.cxx index b2d7019..e86667d 100644 --- a/Source/CPack/cmCPackBundleGenerator.cxx +++ b/Source/CPack/cmCPackBundleGenerator.cxx @@ -11,6 +11,7 @@ ============================================================================*/ #include "cmCPackBundleGenerator.h" + #include "cmCPackLog.h" #include "cmSystemTools.h" diff --git a/Source/CPack/cmCPackComponentGroup.cxx b/Source/CPack/cmCPackComponentGroup.cxx index fd20e9b..2d41e59 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 13c8d8f..9673942 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 d678cfa..3d945dd 100644 --- a/Source/CPack/cmCPackDebGenerator.h +++ b/Source/CPack/cmCPackDebGenerator.h @@ -13,7 +13,6 @@ #ifndef cmCPackDebGenerator_h #define cmCPackDebGenerator_h - #include "cmCPackGenerator.h" /** \class cmCPackDebGenerator diff --git a/Source/CPack/cmCPackDragNDropGenerator.cxx b/Source/CPack/cmCPackDragNDropGenerator.cxx index d6de77d..eccc5cf 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 907bb1e..3a53d05 100644 --- a/Source/CPack/cmCPackGenerator.h +++ b/Source/CPack/cmCPackGenerator.h @@ -14,6 +14,7 @@ #define cmCPackGenerator_h #include "cmObject.h" + #include "cmSystemTools.h" #include <map> #include <vector> diff --git a/Source/CPack/cmCPackNSISGenerator.h b/Source/CPack/cmCPackNSISGenerator.h index c7b2ce1..ab8ece4 100644 --- a/Source/CPack/cmCPackNSISGenerator.h +++ b/Source/CPack/cmCPackNSISGenerator.h @@ -13,8 +13,8 @@ #ifndef cmCPackNSISGenerator_h #define cmCPackNSISGenerator_h - #include "cmCPackGenerator.h" + #include <set> /** \class cmCPackNSISGenerator diff --git a/Source/CPack/cmCPackOSXX11Generator.cxx b/Source/CPack/cmCPackOSXX11Generator.cxx index 8940f54..cde08b1 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 7d349c6..4e8ff03 100644 --- a/Source/CPack/cmCPackPackageMakerGenerator.h +++ b/Source/CPack/cmCPackPackageMakerGenerator.h @@ -13,7 +13,6 @@ #ifndef cmCPackPackageMakerGenerator_h #define cmCPackPackageMakerGenerator_h - #include "cmCPackGenerator.h" class cmCPackComponent; diff --git a/Source/CPack/cmCPackRPMGenerator.cxx b/Source/CPack/cmCPackRPMGenerator.cxx index 71ab3a0..706f43a 100644 --- a/Source/CPack/cmCPackRPMGenerator.cxx +++ b/Source/CPack/cmCPackRPMGenerator.cxx @@ -10,6 +10,7 @@ See the License for more information. ============================================================================*/ #include "cmCPackRPMGenerator.h" + #include "cmCPackLog.h" #include "cmSystemTools.h" diff --git a/Source/CPack/cmCPackRPMGenerator.h b/Source/CPack/cmCPackRPMGenerator.h index a7722bc..a4a1ba8 100644 --- a/Source/CPack/cmCPackRPMGenerator.h +++ b/Source/CPack/cmCPackRPMGenerator.h @@ -13,7 +13,6 @@ #ifndef cmCPackRPMGenerator_h #define cmCPackRPMGenerator_h - #include "cmCPackGenerator.h" /** \class cmCPackRPMGenerator diff --git a/Source/CPack/cmCPackSTGZGenerator.h b/Source/CPack/cmCPackSTGZGenerator.h index ccceec8..08152b5 100644 --- a/Source/CPack/cmCPackSTGZGenerator.h +++ b/Source/CPack/cmCPackSTGZGenerator.h @@ -13,7 +13,6 @@ #ifndef cmCPackSTGZGenerator_h #define cmCPackSTGZGenerator_h - #include "cmCPackTGZGenerator.h" /** \class cmCPackSTGZGenerator diff --git a/Source/CPack/cmCPackTarBZip2Generator.cxx b/Source/CPack/cmCPackTarBZip2Generator.cxx index 9ff588b..da16737 100644 --- a/Source/CPack/cmCPackTarBZip2Generator.cxx +++ b/Source/CPack/cmCPackTarBZip2Generator.cxx @@ -11,6 +11,7 @@ ============================================================================*/ #include "cmCPackTarBZip2Generator.h" + //---------------------------------------------------------------------- cmCPackTarBZip2Generator::cmCPackTarBZip2Generator() :cmCPackArchiveGenerator(cmArchiveWrite::CompressBZip2, |