diff options
426 files changed, 1099 insertions, 878 deletions
diff --git a/Modules/CMakeTestWatcomVersion.c b/Modules/CMakeTestWatcomVersion.c deleted file mode 100644 index 0343fb1279..0000000000 --- a/Modules/CMakeTestWatcomVersion.c +++ /dev/null @@ -1 +0,0 @@ -VERSION=__WATCOMC__ diff --git a/Modules/CheckForPthreads.c b/Modules/CheckForPthreads.c index 344c81beeb..9629a66f03 100644 --- a/Modules/CheckForPthreads.c +++ b/Modules/CheckForPthreads.c @@ -1,5 +1,5 @@ -#include <stdio.h> #include <pthread.h> +#include <stdio.h> #include <unistd.h> void* runner(void*); diff --git a/Source/CPack/IFW/cmCPackIFWGenerator.cxx b/Source/CPack/IFW/cmCPackIFWGenerator.cxx index 50ac971d13..c10803cc5e 100644 --- a/Source/CPack/IFW/cmCPackIFWGenerator.cxx +++ b/Source/CPack/IFW/cmCPackIFWGenerator.cxx @@ -12,24 +12,24 @@ #include "cmCPackIFWGenerator.h" -#include "cmCPackIFWPackage.h" #include "cmCPackIFWInstaller.h" +#include "cmCPackIFWPackage.h" -#include <CPack/cmCPackLog.h> #include <CPack/cmCPackComponentGroup.h> +#include <CPack/cmCPackLog.h> -#include <cmsys/SystemTools.hxx> -#include <cmsys/Glob.hxx> #include <cmsys/Directory.hxx> +#include <cmsys/Glob.hxx> #include <cmsys/RegularExpression.hxx> +#include <cmsys/SystemTools.hxx> +#include <cmGeneratedFileStream.h> #include <cmGlobalGenerator.h> -#include <cmSystemTools.h> #include <cmMakefile.h> -#include <cmGeneratedFileStream.h> -#include <cmXMLWriter.h> -#include <cmVersionConfig.h> +#include <cmSystemTools.h> #include <cmTimestamp.h> +#include <cmVersionConfig.h> +#include <cmXMLWriter.h> //---------------------------------------------------------------------------- cmCPackIFWGenerator::cmCPackIFWGenerator() diff --git a/Source/CPack/IFW/cmCPackIFWGenerator.h b/Source/CPack/IFW/cmCPackIFWGenerator.h index 5770451eee..001c8c7821 100644 --- a/Source/CPack/IFW/cmCPackIFWGenerator.h +++ b/Source/CPack/IFW/cmCPackIFWGenerator.h @@ -15,8 +15,8 @@ #include <CPack/cmCPackGenerator.h> -#include "cmCPackIFWPackage.h" #include "cmCPackIFWInstaller.h" +#include "cmCPackIFWPackage.h" class cmXMLWriter; diff --git a/Source/CPack/OSXScriptLauncher.cxx b/Source/CPack/OSXScriptLauncher.cxx index c271517f13..b3ddeee356 100644 --- a/Source/CPack/OSXScriptLauncher.cxx +++ b/Source/CPack/OSXScriptLauncher.cxx @@ -9,9 +9,9 @@ implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License for more information. ============================================================================*/ -#include <cmsys/SystemTools.hxx> -#include <cmsys/Process.h> #include <cmsys/FStream.hxx> +#include <cmsys/Process.h> +#include <cmsys/SystemTools.hxx> #include <iostream> diff --git a/Source/CPack/WiX/cmCPackWIXGenerator.cxx b/Source/CPack/WiX/cmCPackWIXGenerator.cxx index ece327a41f..a98c684068 100644 --- a/Source/CPack/WiX/cmCPackWIXGenerator.cxx +++ b/Source/CPack/WiX/cmCPackWIXGenerator.cxx @@ -12,23 +12,23 @@ #include "cmCPackWIXGenerator.h" -#include <cmSystemTools.h> -#include <cmGeneratedFileStream.h> +#include <CPack/cmCPackComponentGroup.h> +#include <CPack/cmCPackLog.h> #include <cmCryptoHash.h> +#include <cmGeneratedFileStream.h> #include <cmInstalledFile.h> -#include <CPack/cmCPackLog.h> -#include <CPack/cmCPackComponentGroup.h> +#include <cmSystemTools.h> -#include "cmWIXSourceWriter.h" #include "cmWIXDirectoriesSourceWriter.h" #include "cmWIXFeaturesSourceWriter.h" #include "cmWIXFilesSourceWriter.h" #include "cmWIXRichTextFormatWriter.h" +#include "cmWIXSourceWriter.h" -#include <cmsys/SystemTools.hxx> #include <cmsys/Directory.hxx> #include <cmsys/Encoding.hxx> #include <cmsys/FStream.hxx> +#include <cmsys/SystemTools.hxx> #include <rpc.h> // for GUID generation diff --git a/Source/CPack/WiX/cmCPackWIXGenerator.h b/Source/CPack/WiX/cmCPackWIXGenerator.h index 3f66b2c023..871527b83f 100644 --- a/Source/CPack/WiX/cmCPackWIXGenerator.h +++ b/Source/CPack/WiX/cmCPackWIXGenerator.h @@ -13,13 +13,13 @@ #ifndef cmCPackWIXGenerator_h #define cmCPackWIXGenerator_h +#include <CPack/cmCPackGenerator.h> + #include "cmWIXPatch.h" #include "cmWIXShortcut.h" -#include <CPack/cmCPackGenerator.h> - -#include <string> #include <map> +#include <string> class cmWIXSourceWriter; class cmWIXDirectoriesSourceWriter; diff --git a/Source/CPack/WiX/cmWIXAccessControlList.h b/Source/CPack/WiX/cmWIXAccessControlList.h index 20902f768a..72939958bd 100644 --- a/Source/CPack/WiX/cmWIXAccessControlList.h +++ b/Source/CPack/WiX/cmWIXAccessControlList.h @@ -13,11 +13,11 @@ #ifndef cmWIXAccessControlList_h #define cmWIXAccessControlList_h -#include <cmInstalledFile.h> -#include <CPack/cmCPackLog.h> - #include "cmWIXSourceWriter.h" +#include <CPack/cmCPackLog.h> +#include <cmInstalledFile.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..734f9011ee 100644 --- a/Source/CPack/WiX/cmWIXFilesSourceWriter.h +++ b/Source/CPack/WiX/cmWIXFilesSourceWriter.h @@ -14,8 +14,9 @@ #define cmWIXFilesSourceWriter_h #include "cmWIXSourceWriter.h" -#include "cmWIXShortcut.h" + #include "cmWIXPatch.h" +#include "cmWIXShortcut.h" #include <CPack/cmCPackGenerator.h> diff --git a/Source/CPack/WiX/cmWIXPatch.h b/Source/CPack/WiX/cmWIXPatch.h index 2f31a013ea..5b0eb3b7c1 100644 --- a/Source/CPack/WiX/cmWIXPatch.h +++ b/Source/CPack/WiX/cmWIXPatch.h @@ -13,8 +13,8 @@ #ifndef cmWIXPatch_h #define cmWIXPatch_h -#include "cmWIXSourceWriter.h" #include "cmWIXPatchParser.h" +#include "cmWIXSourceWriter.h" #include <string> 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..598aa0d320 100644 --- a/Source/CPack/WiX/cmWIXShortcut.h +++ b/Source/CPack/WiX/cmWIXShortcut.h @@ -13,13 +13,13 @@ #ifndef cmWIXShortcut_h #define cmWIXShortcut_h -#include <string> +#include <cmInstalledFile.h> + #include <map> #include <set> +#include <string> #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..2bf96746b3 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 <string> +#include <vector> /** \class cmWIXSourceWriter * \brief Helper class to generate XML WiX source files diff --git a/Source/CPack/cmCPackArchiveGenerator.cxx b/Source/CPack/cmCPackArchiveGenerator.cxx index db985db813..37e8bf02e4 100644 --- a/Source/CPack/cmCPackArchiveGenerator.cxx +++ b/Source/CPack/cmCPackArchiveGenerator.cxx @@ -12,17 +12,17 @@ #include "cmCPackArchiveGenerator.h" -#include "cmake.h" +#include "cmCPackLog.h" +#include "cmGeneratedFileStream.h" #include "cmGlobalGenerator.h" -#include "cmSystemTools.h" #include "cmMakefile.h" -#include "cmGeneratedFileStream.h" -#include "cmCPackLog.h" +#include "cmSystemTools.h" +#include "cmake.h" #include <errno.h> -#include <cmsys/SystemTools.hxx> -#include <cmsys/Directory.hxx> #include <cm_libarchive.h> +#include <cmsys/Directory.hxx> +#include <cmsys/SystemTools.hxx> //---------------------------------------------------------------------- cmCPackArchiveGenerator::cmCPackArchiveGenerator(cmArchiveWrite::Compress t, 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..b84758956f 100644 --- a/Source/CPack/cmCPackComponentGroup.cxx +++ b/Source/CPack/cmCPackComponentGroup.cxx @@ -11,9 +11,11 @@ ============================================================================*/ #include "cmCPackComponentGroup.h" + #include "cmSystemTools.h" -#include <vector> + #include <string> +#include <vector> //---------------------------------------------------------------------- unsigned long cmCPackComponent::GetInstalledSize( diff --git a/Source/CPack/cmCPackCygwinBinaryGenerator.cxx b/Source/CPack/cmCPackCygwinBinaryGenerator.cxx index 1f905c0302..687689c202 100644 --- a/Source/CPack/cmCPackCygwinBinaryGenerator.cxx +++ b/Source/CPack/cmCPackCygwinBinaryGenerator.cxx @@ -12,12 +12,12 @@ #include "cmCPackCygwinBinaryGenerator.h" -#include "cmake.h" +#include "cmCPackLog.h" +#include "cmGeneratedFileStream.h" #include "cmGlobalGenerator.h" -#include "cmSystemTools.h" #include "cmMakefile.h" -#include "cmGeneratedFileStream.h" -#include "cmCPackLog.h" +#include "cmSystemTools.h" +#include "cmake.h" #include <cmsys/SystemTools.hxx> diff --git a/Source/CPack/cmCPackCygwinSourceGenerator.cxx b/Source/CPack/cmCPackCygwinSourceGenerator.cxx index f5cb53cc99..d84b1eede8 100644 --- a/Source/CPack/cmCPackCygwinSourceGenerator.cxx +++ b/Source/CPack/cmCPackCygwinSourceGenerator.cxx @@ -12,12 +12,12 @@ #include "cmCPackCygwinSourceGenerator.h" -#include "cmake.h" +#include "cmCPackLog.h" +#include "cmGeneratedFileStream.h" #include "cmGlobalGenerator.h" -#include "cmSystemTools.h" #include "cmMakefile.h" -#include "cmGeneratedFileStream.h" -#include "cmCPackLog.h" +#include "cmSystemTools.h" +#include "cmake.h" #include <cmsys/SystemTools.hxx> @@ -25,8 +25,8 @@ // system tools because it is not implemented robustly enough to move // files across directories. #ifdef _WIN32 -# include <windows.h> # include <sys/stat.h> +# include <windows.h> #endif //---------------------------------------------------------------------- diff --git a/Source/CPack/cmCPackDebGenerator.cxx b/Source/CPack/cmCPackDebGenerator.cxx index 13c8d8f6cb..9e17bc836c 100644 --- a/Source/CPack/cmCPackDebGenerator.cxx +++ b/Source/CPack/cmCPackDebGenerator.cxx @@ -9,16 +9,17 @@ implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License for more information. ============================================================================*/ + #include "cmCPackDebGenerator.h" -#include "cmSystemTools.h" -#include "cmMakefile.h" -#include "cmGeneratedFileStream.h" -#include "cmCPackLog.h" #include "cmArchiveWrite.h" +#include "cmCPackLog.h" +#include "cmGeneratedFileStream.h" +#include "cmMakefile.h" +#include "cmSystemTools.h" -#include <cmsys/SystemTools.hxx> #include <cmsys/Glob.hxx> +#include <cmsys/SystemTools.hxx> #include <limits.h> // USHRT_MAX #include <sys/stat.h> @@ -763,8 +764,8 @@ std::string cmCPackDebGenerator::GetComponentInstallDirNameSuffix( #include <sys/stat.h> #include <stdio.h> -#include <string.h> #include <stdlib.h> +#include <string.h> #define ARMAG "!<arch>\n" /* ar "magic number" */ #define SARMAG 8 /* strlen(ARMAG); */ 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..b9c9c85bed 100644 --- a/Source/CPack/cmCPackDragNDropGenerator.cxx +++ b/Source/CPack/cmCPackDragNDropGenerator.cxx @@ -11,12 +11,13 @@ ============================================================================*/ #include "cmCPackDragNDropGenerator.h" + #include "cmCPackLog.h" -#include "cmSystemTools.h" #include "cmGeneratedFileStream.h" +#include "cmSystemTools.h" -#include <cmsys/RegularExpression.hxx> #include <cmsys/FStream.hxx> +#include <cmsys/RegularExpression.hxx> #include <iomanip> diff --git a/Source/CPack/cmCPackGenerator.cxx b/Source/CPack/cmCPackGenerator.cxx index 3eca280cce..6cc67e7fe4 100644 --- a/Source/CPack/cmCPackGenerator.cxx +++ b/Source/CPack/cmCPackGenerator.cxx @@ -12,18 +12,18 @@ #include "cmCPackGenerator.h" -#include "cmMakefile.h" +#include "cmCPackComponentGroup.h" #include "cmCPackLog.h" -#include "cmake.h" -#include "cmGlobalGenerator.h" #include "cmGeneratedFileStream.h" -#include "cmCPackComponentGroup.h" +#include "cmGlobalGenerator.h" +#include "cmMakefile.h" #include "cmXMLSafe.h" +#include "cmake.h" -#include <cmsys/SystemTools.hxx> -#include <cmsys/Glob.hxx> -#include <cmsys/FStream.hxx> #include <algorithm> +#include <cmsys/FStream.hxx> +#include <cmsys/Glob.hxx> +#include <cmsys/SystemTools.hxx> #include <list> #if defined(__HAIKU__) 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/cmCPackGeneratorFactory.cxx b/Source/CPack/cmCPackGeneratorFactory.cxx index 46261427d1..669964da90 100644 --- a/Source/CPack/cmCPackGeneratorFactory.cxx +++ b/Source/CPack/cmCPackGeneratorFactory.cxx @@ -12,22 +12,22 @@ #include "cmCPackGeneratorFactory.h" +#include "IFW/cmCPackIFWGenerator.h" +#include "cmCPack7zGenerator.h" #include "cmCPackGenerator.h" +#include "cmCPackNSISGenerator.h" +#include "cmCPackSTGZGenerator.h" #include "cmCPackTGZGenerator.h" #include "cmCPackTXZGenerator.h" #include "cmCPackTarBZip2Generator.h" #include "cmCPackTarCompressGenerator.h" #include "cmCPackZIPGenerator.h" -#include "cmCPack7zGenerator.h" -#include "cmCPackSTGZGenerator.h" -#include "cmCPackNSISGenerator.h" -#include "IFW/cmCPackIFWGenerator.h" #ifdef __APPLE__ -# include "cmCPackDragNDropGenerator.h" -# include "cmCPackBundleGenerator.h" -# include "cmCPackPackageMakerGenerator.h" -# include "cmCPackOSXX11Generator.h" +# include "cmCPackBundleGenerator.h" +# include "cmCPackDragNDropGenerator.h" +# include "cmCPackOSXX11Generator.h" +# include "cmCPackPackageMakerGenerator.h" #endif #ifdef __CYGWIN__ @@ -45,8 +45,8 @@ # include "WiX/cmCPackWIXGenerator.h" #endif -#include "cmCPackLog.h" #include "cmAlgorithms.h" +#include "cmCPackLog.h" //---------------------------------------------------------------------- diff --git a/Source/CPack/cmCPackNSISGenerator.cxx b/Source/CPack/cmCPackNSISGenerator.cxx index 5ba639fee9..eeb46fdff9 100644 --- a/Source/CPack/cmCPackNSISGenerator.cxx +++ b/Source/CPack/cmCPackNSISGenerator.cxx @@ -12,17 +12,17 @@ #include "cmCPackNSISGenerator.h" +#include "cmCPackComponentGroup.h" +#include "cmCPackLog.h" +#include "cmGeneratedFileStream.h" #include "cmGlobalGenerator.h" -#include "cmSystemTools.h" #include "cmMakefile.h" -#include "cmGeneratedFileStream.h" -#include "cmCPackLog.h" -#include "cmCPackComponentGroup.h" +#include "cmSystemTools.h" -#include <cmsys/SystemTools.hxx> -#include <cmsys/Glob.hxx> #include <cmsys/Directory.hxx> +#include <cmsys/Glob.hxx> #include <cmsys/RegularExpression.hxx> +#include <cmsys/SystemTools.hxx> /* NSIS uses different command line syntax on Windows and others */ #ifdef _WIN32 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..1d7ef69b5e 100644 --- a/Source/CPack/cmCPackOSXX11Generator.cxx +++ b/Source/CPack/cmCPackOSXX11Generator.cxx @@ -9,17 +9,18 @@ implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License for more information. ============================================================================*/ + #include "cmCPackOSXX11Generator.h" -#include "cmake.h" +#include "cmCPackLog.h" +#include "cmGeneratedFileStream.h" #include "cmGlobalGenerator.h" -#include "cmSystemTools.h" #include "cmMakefile.h" -#include "cmGeneratedFileStream.h" -#include "cmCPackLog.h" +#include "cmSystemTools.h" +#include "cmake.h" -#include <cmsys/SystemTools.hxx> #include <cmsys/Glob.hxx> +#include <cmsys/SystemTools.hxx> #include <sys/stat.h> //---------------------------------------------------------------------- diff --git a/Source/CPack/cmCPackPackageMakerGenerator.cxx b/Source/CPack/cmCPackPackageMakerGenerator.cxx index 8fdc03660e..4f6238e364 100644 --- a/Source/CPack/cmCPackPackageMakerGenerator.cxx +++ b/Source/CPack/cmCPackPackageMakerGenerator.cxx @@ -11,17 +11,17 @@ ============================================================================*/ #include "cmCPackPackageMakerGenerator.h" -#include "cmake.h" -#include "cmGlobalGenerator.h" -#include "cmSystemTools.h" -#include "cmMakefile.h" -#include "cmGeneratedFileStream.h" #include "cmCPackComponentGroup.h" #include "cmCPackLog.h" +#include "cmGeneratedFileStream.h" +#include "cmGlobalGenerator.h" +#include "cmMakefile.h" +#include "cmSystemTools.h" +#include "cmake.h" -#include <cmsys/SystemTools.hxx> -#include <cmsys/Glob.hxx> #include <cmsys/FStream.hxx> +#include <cmsys/Glob.hxx> +#include <cmsys/SystemTools.hxx> #include <assert.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.cxx b/Source/CPack/cmCPackSTGZGenerator.cxx index 68b893f6fb..8a83666fa4 100644 --- a/Source/CPack/cmCPackSTGZGenerator.cxx +++ b/Source/CPack/cmCPackSTGZGenerator.cxx @@ -12,14 +12,14 @@ #include "cmCPackSTGZGenerator.h" -#include "cmake.h" +#include "cmCPackLog.h" #include "cmGlobalGenerator.h" -#include "cmSystemTools.h" #include "cmMakefile.h" -#include "cmCPackLog.h" +#include "cmSystemTools.h" +#include "cmake.h" -#include <cmsys/FStream.hxx> #include <sys/types.h> +#include <cmsys/FStream.hxx> #include <sys/stat.h> //---------------------------------------------------------------------- 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/CPack/cpack.cxx b/Source/CPack/cpack.cxx index c08897fa42..813fb0159b 100644 --- a/Source/CPack/cpack.cxx +++ b/Source/CPack/cpack.cxx @@ -12,19 +12,19 @@ #include "cmSystemTools.h" // Need these for documentation support. -#include "cmake.h" -#include "cmDocumentation.h" -#include "cmCPackGeneratorFactory.h" #include "cmCPackGenerator.h" -#include "cmake.h" +#include "cmCPackGeneratorFactory.h" +#include "cmDocumentation.h" #include "cmGlobalGenerator.h" #include "cmMakefile.h" +#include "cmake.h" +#include "cmake.h" #include "cmCPackLog.h" #include <cmsys/CommandLineArguments.hxx> -#include <cmsys/SystemTools.hxx> #include <cmsys/Encoding.hxx> +#include <cmsys/SystemTools.hxx> //---------------------------------------------------------------------------- static const char * cmDocumentationName[][2] = diff --git a/Source/CTest/cmCTestBatchTestHandler.cxx b/Source/CTest/cmCTestBatchTestHandler.cxx index d62c260d64..41f4f1254e 100644 --- a/Source/CTest/cmCTestBatchTestHandler.cxx +++ b/Source/CTest/cmCTestBatchTestHandler.cxx @@ -11,9 +11,10 @@ ============================================================================*/ #include "cmCTestBatchTestHandler.h" + +#include "cmCTest.h" #include "cmProcess.h" #include "cmStandardIncludes.h" -#include "cmCTest.h" #include "cmSystemTools.h" #include <stdlib.h> diff --git a/Source/CTest/cmCTestBatchTestHandler.h b/Source/CTest/cmCTestBatchTestHandler.h index e0c6e48d52..b0fc8d56ae 100644 --- a/Source/CTest/cmCTestBatchTestHandler.h +++ b/Source/CTest/cmCTestBatchTestHandler.h @@ -14,9 +14,10 @@ #define cmCTestBatchTestHandler_h #include <cmStandardIncludes.h> -#include <cmCTestTestHandler.h> + #include <cmCTestMultiProcessHandler.h> #include <cmCTestRunTest.h> +#include <cmCTestTestHandler.h> #include <cmsys/FStream.hxx> /** \class cmCTestBatchTestHandler diff --git a/Source/CTest/cmCTestBuildAndTestHandler.cxx b/Source/CTest/cmCTestBuildAndTestHandler.cxx index 20d303d827..52433da6ea 100644 --- a/Source/CTest/cmCTestBuildAndTestHandler.cxx +++ b/Source/CTest/cmCTestBuildAndTestHandler.cxx @@ -12,12 +12,12 @@ #include "cmCTestBuildAndTestHandler.h" -#include "cmSystemTools.h" #include "cmCTest.h" -#include "cmake.h" +#include "cmCTestTestHandler.h" #include "cmGlobalGenerator.h" +#include "cmSystemTools.h" +#include "cmake.h" #include <cmsys/Process.h> -#include "cmCTestTestHandler.h" //---------------------------------------------------------------------- cmCTestBuildAndTestHandler::cmCTestBuildAndTestHandler() diff --git a/Source/CTest/cmCTestBuildCommand.cxx b/Source/CTest/cmCTestBuildCommand.cxx index 27e22c4c72..0cfcc64b2a 100644 --- a/Source/CTest/cmCTestBuildCommand.cxx +++ b/Source/CTest/cmCTestBuildCommand.cxx @@ -12,10 +12,10 @@ #include "cmCTestBuildCommand.h" #include "cmCTest.h" -#include "cmCTestGenericHandler.h" #include "cmCTestBuildHandler.h" -#include "cmake.h" +#include "cmCTestGenericHandler.h" #include "cmGlobalGenerator.h" +#include "cmake.h" //---------------------------------------------------------------------------- diff --git a/Source/CTest/cmCTestBuildHandler.cxx b/Source/CTest/cmCTestBuildHandler.cxx index 0d74f48f22..1b31533d8b 100644 --- a/Source/CTest/cmCTestBuildHandler.cxx +++ b/Source/CTest/cmCTestBuildHandler.cxx @@ -12,29 +12,29 @@ #include "cmCTestBuildHandler.h" +#include "cmAlgorithms.h" #include "cmCTest.h" -#include "cmake.h" -#include "cmMakefile.h" -#include "cmGlobalGenerator.h" +#include "cmFileTimeComparison.h" #include "cmGeneratedFileStream.h" +#include "cmGlobalGenerator.h" +#include "cmMakefile.h" #include "cmXMLWriter.h" -#include "cmFileTimeComparison.h" -#include "cmAlgorithms.h" +#include "cmake.h" //#include <cmsys/RegularExpression.hxx> -#include <cmsys/Process.h> #include <cmsys/Directory.hxx> #include <cmsys/FStream.hxx> +#include <cmsys/Process.h> // used for sleep #ifdef _WIN32 #include "windows.h" #endif +#include <float.h> +#include <math.h> #include <stdlib.h> #include <time.h> -#include <math.h> -#include <float.h> static const char* cmCTestErrorMatches[] = { 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/cmCTestCVS.cxx b/Source/CTest/cmCTestCVS.cxx index 0fb3fec577..58d86891e2 100644 --- a/Source/CTest/cmCTestCVS.cxx +++ b/Source/CTest/cmCTestCVS.cxx @@ -15,8 +15,8 @@ #include "cmSystemTools.h" #include "cmXMLWriter.h" -#include <cmsys/RegularExpression.hxx> #include <cmsys/FStream.hxx> +#include <cmsys/RegularExpression.hxx> //---------------------------------------------------------------------------- cmCTestCVS::cmCTestCVS(cmCTest* ct, std::ostream& log): cmCTestVC(ct, log) diff --git a/Source/CTest/cmCTestConfigureCommand.cxx b/Source/CTest/cmCTestConfigureCommand.cxx index ba4dab235d..8f15c6d2e5 100644 --- a/Source/CTest/cmCTestConfigureCommand.cxx +++ b/Source/CTest/cmCTestConfigureCommand.cxx @@ -11,9 +11,9 @@ ============================================================================*/ #include "cmCTestConfigureCommand.h" -#include "cmGlobalGenerator.h" #include "cmCTest.h" #include "cmCTestGenericHandler.h" +#include "cmGlobalGenerator.h" cmCTestConfigureCommand::cmCTestConfigureCommand() { diff --git a/Source/CTest/cmCTestConfigureHandler.cxx b/Source/CTest/cmCTestConfigureHandler.cxx index 2e8aeb9563..e9f8f3928f 100644 --- a/Source/CTest/cmCTestConfigureHandler.cxx +++ b/Source/CTest/cmCTestConfigureHandler.cxx @@ -14,8 +14,8 @@ #include "cmCTest.h" #include "cmGeneratedFileStream.h" -#include "cmake.h" #include "cmXMLWriter.h" +#include "cmake.h" #include <cmsys/Process.h> 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..79eb3460a2 100644 --- a/Source/CTest/cmCTestCoverageHandler.cxx +++ b/Source/CTest/cmCTestCoverageHandler.cxx @@ -10,28 +10,29 @@ See the License for more information. ============================================================================*/ #include "cmCTestCoverageHandler.h" -#include "cmParsePHPCoverage.h" + +#include "cmCTest.h" +#include "cmGeneratedFileStream.h" +#include "cmMakefile.h" +#include "cmParseBlanketJSCoverage.h" +#include "cmParseCacheCoverage.h" #include "cmParseCoberturaCoverage.h" +#include "cmParseDelphiCoverage.h" #include "cmParseGTMCoverage.h" -#include "cmParseCacheCoverage.h" #include "cmParseJacocoCoverage.h" -#include "cmParseDelphiCoverage.h" -#include "cmParseBlanketJSCoverage.h" -#include "cmCTest.h" -#include "cmake.h" -#include "cmMakefile.h" +#include "cmParsePHPCoverage.h" #include "cmSystemTools.h" -#include "cmGeneratedFileStream.h" #include "cmXMLWriter.h" +#include "cmake.h" +#include <cmsys/FStream.hxx> +#include <cmsys/Glob.hxx> #include <cmsys/Process.h> #include <cmsys/RegularExpression.hxx> -#include <cmsys/Glob.hxx> -#include <cmsys/FStream.hxx> -#include <stdlib.h> -#include <math.h> #include <float.h> +#include <math.h> +#include <stdlib.h> #define SAFEDIV(x,y) (((y)!=0)?((x)/(y)):(0)) 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/cmCTestCurl.cxx b/Source/CTest/cmCTestCurl.cxx index fb6cc007f8..0367d7d956 100644 --- a/Source/CTest/cmCTestCurl.cxx +++ b/Source/CTest/cmCTestCurl.cxx @@ -11,8 +11,8 @@ ============================================================================*/ #include "cmCTestCurl.h" -#include "cmSystemTools.h" #include "cmCTest.h" +#include "cmSystemTools.h" cmCTestCurl::cmCTestCurl(cmCTest* ctest) { diff --git a/Source/CTest/cmCTestGIT.cxx b/Source/CTest/cmCTestGIT.cxx index 1d6bdcea11..3ff12c18f8 100644 --- a/Source/CTest/cmCTestGIT.cxx +++ b/Source/CTest/cmCTestGIT.cxx @@ -11,17 +11,17 @@ ============================================================================*/ #include "cmCTestGIT.h" +#include "cmAlgorithms.h" #include "cmCTest.h" #include "cmSystemTools.h" -#include "cmAlgorithms.h" -#include <cmsys/RegularExpression.hxx> -#include <cmsys/Process.h> #include <cmsys/FStream.hxx> +#include <cmsys/Process.h> +#include <cmsys/RegularExpression.hxx> #include <sys/types.h> -#include <time.h> #include <ctype.h> +#include <time.h> //---------------------------------------------------------------------------- static unsigned int cmCTestGITVersion(unsigned int epic, unsigned int major, 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.cxx b/Source/CTest/cmCTestLaunch.cxx index 749a5beec2..03b06f87ce 100644 --- a/Source/CTest/cmCTestLaunch.cxx +++ b/Source/CTest/cmCTestLaunch.cxx @@ -16,14 +16,14 @@ #include "cmXMLWriter.h" #include "cmake.h" +#include <cmsys/FStream.hxx> #include <cmsys/MD5.h> #include <cmsys/Process.h> #include <cmsys/RegularExpression.hxx> -#include <cmsys/FStream.hxx> #ifdef _WIN32 -#include <io.h> // for _setmode #include <fcntl.h> // for _O_BINARY +#include <io.h> // for _setmode #include <stdio.h> // for std{out,err} and fileno #endif 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..9e3ba576ba 100644 --- a/Source/CTest/cmCTestMemCheckHandler.cxx +++ b/Source/CTest/cmCTestMemCheckHandler.cxx @@ -11,21 +11,22 @@ ============================================================================*/ #include "cmCTestMemCheckHandler.h" -#include "cmXMLParser.h" + #include "cmCTest.h" -#include "cmake.h" #include "cmGeneratedFileStream.h" -#include <cmsys/Process.h> -#include <cmsys/RegularExpression.hxx> -#include <cmsys/Base64.h> -#include <cmsys/Glob.hxx> -#include <cmsys/FStream.hxx> #include "cmMakefile.h" +#include "cmXMLParser.h" #include "cmXMLWriter.h" +#include "cmake.h" +#include <cmsys/Base64.h> +#include <cmsys/FStream.hxx> +#include <cmsys/Glob.hxx> +#include <cmsys/Process.h> +#include <cmsys/RegularExpression.hxx> -#include <stdlib.h> -#include <math.h> #include <float.h> +#include <math.h> +#include <stdlib.h> struct CatToErrorType { diff --git a/Source/CTest/cmCTestMemCheckHandler.h b/Source/CTest/cmCTestMemCheckHandler.h index f1ac794dc8..62329245c5 100644 --- a/Source/CTest/cmCTestMemCheckHandler.h +++ b/Source/CTest/cmCTestMemCheckHandler.h @@ -13,12 +13,11 @@ #ifndef cmCTestMemCheckHandler_h #define cmCTestMemCheckHandler_h - #include "cmCTestTestHandler.h" -#include "cmStandardIncludes.h" + #include "cmListFileCache.h" -#include <vector> #include <string> +#include <vector> class cmMakefile; class cmXMLWriter; diff --git a/Source/CTest/cmCTestMultiProcessHandler.cxx b/Source/CTest/cmCTestMultiProcessHandler.cxx index 7c7f5dfe2d..1434518422 100644 --- a/Source/CTest/cmCTestMultiProcessHandler.cxx +++ b/Source/CTest/cmCTestMultiProcessHandler.cxx @@ -10,18 +10,19 @@ See the License for more information. ============================================================================*/ #include "cmCTestMultiProcessHandler.h" -#include "cmProcess.h" -#include "cmStandardIncludes.h" + #include "cmCTest.h" #include "cmCTestScriptHandler.h" +#include "cmProcess.h" +#include "cmStandardIncludes.h" #include "cmSystemTools.h" -#include <stdlib.h> -#include <stack> -#include <list> -#include <float.h> -#include <math.h> #include <cmsys/FStream.hxx> #include <cmsys/SystemInformation.hxx> +#include <float.h> +#include <list> +#include <math.h> +#include <stack> +#include <stdlib.h> class TestComparator { 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.cxx b/Source/CTest/cmCTestP4.cxx index 5e0c54a3f3..f7c960c53b 100644 --- a/Source/CTest/cmCTestP4.cxx +++ b/Source/CTest/cmCTestP4.cxx @@ -14,12 +14,12 @@ #include "cmCTest.h" #include "cmSystemTools.h" -#include <cmsys/RegularExpression.hxx> #include <cmsys/Process.h> +#include <cmsys/RegularExpression.hxx> #include <sys/types.h> -#include <time.h> #include <ctype.h> +#include <time.h> //---------------------------------------------------------------------------- cmCTestP4::cmCTestP4(cmCTest* ct, std::ostream& log): diff --git a/Source/CTest/cmCTestP4.h b/Source/CTest/cmCTestP4.h index 7a53475fd8..d666bd8134 100644 --- a/Source/CTest/cmCTestP4.h +++ b/Source/CTest/cmCTestP4.h @@ -13,8 +13,9 @@ #define cmCTestP4_h #include "cmCTestGlobalVC.h" -#include <vector> + #include <map> +#include <vector> /** \class cmCTestP4 * \brief Interaction with the Perforce command-line tool 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..5d159c19ff 100644 --- a/Source/CTest/cmCTestRunTest.cxx +++ b/Source/CTest/cmCTestRunTest.cxx @@ -11,8 +11,9 @@ ============================================================================*/ #include "cmCTestRunTest.h" -#include "cmCTestMemCheckHandler.h" + #include "cmCTest.h" +#include "cmCTestMemCheckHandler.h" #include "cmSystemTools.h" #include "cm_curl.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.cxx b/Source/CTest/cmCTestScriptHandler.cxx index ee15271a05..4485d34b92 100644 --- a/Source/CTest/cmCTestScriptHandler.cxx +++ b/Source/CTest/cmCTestScriptHandler.cxx @@ -13,25 +13,25 @@ #include "cmCTestScriptHandler.h" #include "cmCTest.h" -#include "cmake.h" #include "cmFunctionBlocker.h" -#include "cmMakefile.h" -#include "cmGlobalGenerator.h" #include "cmGeneratedFileStream.h" +#include "cmGlobalGenerator.h" +#include "cmMakefile.h" +#include "cmake.h" //#include <cmsys/RegularExpression.hxx> -#include <cmsys/Process.h> #include <cmsys/Directory.hxx> +#include <cmsys/Process.h> // used for sleep #ifdef _WIN32 #include "windows.h" #endif +#include <float.h> +#include <math.h> #include <stdlib.h> #include <time.h> -#include <math.h> -#include <float.h> // needed for sleep #if !defined(_WIN32) 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/cmCTestStartCommand.cxx b/Source/CTest/cmCTestStartCommand.cxx index 36576c540a..4a38dc67cc 100644 --- a/Source/CTest/cmCTestStartCommand.cxx +++ b/Source/CTest/cmCTestStartCommand.cxx @@ -12,9 +12,9 @@ #include "cmCTestStartCommand.h" #include "cmCTest.h" -#include "cmGlobalGenerator.h" #include "cmCTestVC.h" #include "cmGeneratedFileStream.h" +#include "cmGlobalGenerator.h" cmCTestStartCommand::cmCTestStartCommand() { 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..6a65839f83 100644 --- a/Source/CTest/cmCTestSubmitHandler.cxx +++ b/Source/CTest/cmCTestSubmitHandler.cxx @@ -10,25 +10,26 @@ See the License for more information. ============================================================================*/ #include "cmCTestSubmitHandler.h" + +#include "cmCTest.h" #include "cmCTestScriptHandler.h" -#include "cmake.h" +#include "cmGeneratedFileStream.h" +#include "cmState.h" #include "cmSystemTools.h" #include "cmVersion.h" -#include "cmGeneratedFileStream.h" -#include "cmCTest.h" #include "cmXMLParser.h" -#include "cmState.h" +#include "cmake.h" -#include <cmsys/Process.h> #include <cmsys/Base64.h> +#include <cmsys/Process.h> // For XML-RPC submission #include "cm_xmlrpc.h" #include <cm_jsoncpp_reader.h> // For curl submission -#include "cmCurl.h" #include "cmCTestCurl.h" +#include "cmCurl.h" #include <sys/stat.h> diff --git a/Source/CTest/cmCTestTestHandler.cxx b/Source/CTest/cmCTestTestHandler.cxx index 59ed98eb02..d8229da76c 100644 --- a/Source/CTest/cmCTestTestHandler.cxx +++ b/Source/CTest/cmCTestTestHandler.cxx @@ -11,27 +11,28 @@ ============================================================================*/ #include "cmCTestTestHandler.h" -#include "cmCTestMultiProcessHandler.h" -#include "cmCTestBatchTestHandler.h" + #include "cmCTest.h" +#include "cmCTestBatchTestHandler.h" +#include "cmCTestMultiProcessHandler.h" #include "cmCTestRunTest.h" -#include "cmake.h" +#include "cmCommand.h" #include "cmGeneratedFileStream.h" -#include <cmsys/Process.h> -#include <cmsys/RegularExpression.hxx> -#include <cmsys/Base64.h> -#include <cmsys/Directory.hxx> -#include <cmsys/FStream.hxx> -#include "cmMakefile.h" #include "cmGlobalGenerator.h" -#include "cmCommand.h" +#include "cmMakefile.h" #include "cmSystemTools.h" #include "cmXMLWriter.h" #include "cm_utf8.h" +#include "cmake.h" +#include <cmsys/Base64.h> +#include <cmsys/Directory.hxx> +#include <cmsys/FStream.hxx> +#include <cmsys/Process.h> +#include <cmsys/RegularExpression.hxx> -#include <stdlib.h> -#include <math.h> #include <float.h> +#include <math.h> +#include <stdlib.h> #include <set> 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.cxx b/Source/CTest/cmCTestUpdateHandler.cxx index bf2f34ac74..b1b0a21f9b 100644 --- a/Source/CTest/cmCTestUpdateHandler.cxx +++ b/Source/CTest/cmCTestUpdateHandler.cxx @@ -12,23 +12,23 @@ #include "cmCTestUpdateHandler.h" +#include "cmCLocaleEnvironmentScope.h" #include "cmCTest.h" -#include "cmake.h" -#include "cmMakefile.h" +#include "cmGeneratedFileStream.h" #include "cmGlobalGenerator.h" +#include "cmMakefile.h" #include "cmVersion.h" -#include "cmGeneratedFileStream.h" #include "cmXMLParser.h" #include "cmXMLWriter.h" -#include "cmCLocaleEnvironmentScope.h" +#include "cmake.h" -#include "cmCTestVC.h" -#include "cmCTestCVS.h" -#include "cmCTestSVN.h" #include "cmCTestBZR.h" +#include "cmCTestCVS.h" #include "cmCTestGIT.h" #include "cmCTestHG.h" #include "cmCTestP4.h" +#include "cmCTestSVN.h" +#include "cmCTestVC.h" #include <cmsys/auto_ptr.hxx> @@ -40,9 +40,9 @@ #include "windows.h" #endif -#include <stdlib.h> -#include <math.h> #include <float.h> +#include <math.h> +#include <stdlib.h> //---------------------------------------------------------------------- static const char* cmCTestUpdateHandlerUpdateStrings[] = 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..1f1db3eafc 100644 --- a/Source/CTest/cmParseBlanketJSCoverage.cxx +++ b/Source/CTest/cmParseBlanketJSCoverage.cxx @@ -9,14 +9,14 @@ implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License for more information. ============================================================================*/ -#include "cmStandardIncludes.h" -#include <stdio.h> -#include <stdlib.h> -#include "cmSystemTools.h" #include "cmParseBlanketJSCoverage.h" + +#include "cmSystemTools.h" #include <cmsys/Directory.hxx> -#include <cmsys/Glob.hxx> #include <cmsys/FStream.hxx> +#include <cmsys/Glob.hxx> +#include <stdio.h> +#include <stdlib.h> class cmParseBlanketJSCoverage::JSONParser 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..f8380871f0 100644 --- a/Source/CTest/cmParseCacheCoverage.cxx +++ b/Source/CTest/cmParseCacheCoverage.cxx @@ -1,11 +1,11 @@ -#include "cmStandardIncludes.h" -#include <stdio.h> -#include <stdlib.h> -#include "cmSystemTools.h" #include "cmParseCacheCoverage.h" + +#include "cmSystemTools.h" #include <cmsys/Directory.hxx> -#include <cmsys/Glob.hxx> #include <cmsys/FStream.hxx> +#include <cmsys/Glob.hxx> +#include <stdio.h> +#include <stdlib.h> cmParseCacheCoverage::cmParseCacheCoverage( 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..09c4f02b01 100644 --- a/Source/CTest/cmParseDelphiCoverage.cxx +++ b/Source/CTest/cmParseDelphiCoverage.cxx @@ -1,12 +1,12 @@ -#include "cmStandardIncludes.h" -#include <stdio.h> -#include <stdlib.h> +#include "cmParseDelphiCoverage.h" + #include "cmSystemTools.h" #include "cmXMLParser.h" -#include "cmParseDelphiCoverage.h" #include <cmsys/Directory.hxx> -#include <cmsys/Glob.hxx> #include <cmsys/FStream.hxx> +#include <cmsys/Glob.hxx> +#include <stdio.h> +#include <stdlib.h> class cmParseDelphiCoverage::HTMLParser 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..ae7dedbfa4 100644 --- a/Source/CTest/cmParseGTMCoverage.cxx +++ b/Source/CTest/cmParseGTMCoverage.cxx @@ -1,11 +1,11 @@ -#include "cmStandardIncludes.h" -#include <stdio.h> -#include <stdlib.h> -#include "cmSystemTools.h" #include "cmParseGTMCoverage.h" + +#include "cmSystemTools.h" #include <cmsys/Directory.hxx> -#include <cmsys/Glob.hxx> #include <cmsys/FStream.hxx> +#include <cmsys/Glob.hxx> +#include <stdio.h> +#include <stdlib.h> cmParseGTMCoverage::cmParseGTMCoverage(cmCTestCoverageHandlerContainer& cont, diff --git a/Source/CTest/cmParseJacocoCoverage.cxx b/Source/CTest/cmParseJacocoCoverage.cxx index 47e3b3267c..d9c4ffb411 100644 --- a/Source/CTest/cmParseJacocoCoverage.cxx +++ b/Source/CTest/cmParseJacocoCoverage.cxx @@ -1,12 +1,12 @@ -#include "cmStandardIncludes.h" -#include <stdio.h> -#include <stdlib.h> +#include "cmParseJacocoCoverage.h" + #include "cmSystemTools.h" #include "cmXMLParser.h" -#include "cmParseJacocoCoverage.h" #include <cmsys/Directory.hxx> -#include <cmsys/Glob.hxx> #include <cmsys/FStream.hxx> +#include <cmsys/Glob.hxx> +#include <stdio.h> +#include <stdlib.h> class cmParseJacocoCoverage::XMLParser: public cmXMLParser 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..d0c7599d25 100644 --- a/Source/CTest/cmParseMumpsCoverage.cxx +++ b/Source/CTest/cmParseMumpsCoverage.cxx @@ -1,11 +1,11 @@ -#include "cmStandardIncludes.h" -#include <stdio.h> -#include <stdlib.h> -#include "cmSystemTools.h" #include "cmParseGTMCoverage.h" + +#include "cmSystemTools.h" #include <cmsys/Directory.hxx> -#include <cmsys/Glob.hxx> #include <cmsys/FStream.hxx> +#include <cmsys/Glob.hxx> +#include <stdio.h> +#include <stdlib.h> cmParseMumpsCoverage::cmParseMumpsCoverage( 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..b7c22b1095 100644 --- a/Source/CursesDialog/ccmake.cxx +++ b/Source/CursesDialog/ccmake.cxx @@ -9,15 +9,16 @@ implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License for more information. ============================================================================*/ +#include "cmCursesStandardIncludes.h" + +#include "../cmDocumentation.h" #include "../cmSystemTools.h" #include "../cmake.h" -#include "../cmDocumentation.h" #include <signal.h> #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..40c0eb6ef2 100644 --- a/Source/CursesDialog/cmCursesCacheEntryComposite.cxx +++ b/Source/CursesDialog/cmCursesCacheEntryComposite.cxx @@ -10,16 +10,17 @@ See the License for more information. ============================================================================*/ #include "cmCursesCacheEntryComposite.h" -#include "cmCursesOptionsWidget.h" -#include "cmCursesStringWidget.h" -#include "cmCursesLabelWidget.h" -#include "cmCursesBoolWidget.h" -#include "cmCursesPathWidget.h" -#include "cmCursesFilePathWidget.h" -#include "cmCursesDummyWidget.h" + +#include "../cmState.h" #include "../cmSystemTools.h" #include "../cmake.h" -#include "../cmState.h" +#include "cmCursesBoolWidget.h" +#include "cmCursesDummyWidget.h" +#include "cmCursesFilePathWidget.h" +#include "cmCursesLabelWidget.h" +#include "cmCursesOptionsWidget.h" +#include "cmCursesPathWidget.h" +#include "cmCursesStringWidget.h" #include <assert.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..776d828a9a 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 "../cmake.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..2aafc8b34c 100644 --- a/Source/CursesDialog/cmCursesMainForm.cxx +++ b/Source/CursesDialog/cmCursesMainForm.cxx @@ -9,19 +9,20 @@ 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 "cmAlgorithms.h" #include "cmCursesBoolWidget.h" -#include "cmCursesPathWidget.h" -#include "cmCursesFilePathWidget.h" -#include "cmCursesDummyWidget.h" #include "cmCursesCacheEntryComposite.h" +#include "cmCursesDummyWidget.h" +#include "cmCursesFilePathWidget.h" +#include "cmCursesLabelWidget.h" #include "cmCursesLongMessageForm.h" -#include "cmAlgorithms.h" +#include "cmCursesPathWidget.h" +#include "cmCursesStringWidget.h" #include "cmState.h" diff --git a/Source/CursesDialog/cmCursesMainForm.h b/Source/CursesDialog/cmCursesMainForm.h index 255c823be6..9a80ba20c6 100644 --- a/Source/CursesDialog/cmCursesMainForm.h +++ b/Source/CursesDialog/cmCursesMainForm.h @@ -12,10 +12,11 @@ #ifndef cmCursesMainForm_h #define cmCursesMainForm_h -#include "../cmStandardIncludes.h" -#include "cmCursesForm.h" #include "cmCursesStandardIncludes.h" +#include "../cmState.h" +#include "cmCursesForm.h" + class cmCursesCacheEntryComposite; class cmCursesWidget; class cmake; 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..efb2b6555b 100644 --- a/Source/QtDialog/AddCacheEntry.cxx +++ b/Source/QtDialog/AddCacheEntry.cxx @@ -11,8 +11,9 @@ ============================================================================*/ #include "AddCacheEntry.h" -#include <QMetaProperty> + #include <QCompleter> +#include <QMetaProperty> static const int NumTypes = 4; static const int DefaultTypeIndex = 0; diff --git a/Source/QtDialog/AddCacheEntry.h b/Source/QtDialog/AddCacheEntry.h index 38c3a7444c..7c08af6a84 100644 --- a/Source/QtDialog/AddCacheEntry.h +++ b/Source/QtDialog/AddCacheEntry.h @@ -13,11 +13,12 @@ #ifndef AddCacheEntry_h #define AddCacheEntry_h -#include <QWidget> +#include "QCMake.h" + #include <QCheckBox> #include <QStringList> +#include <QWidget> -#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..b44219fdd0 100644 --- a/Source/QtDialog/CMakeSetup.cxx +++ b/Source/QtDialog/CMakeSetup.cxx @@ -10,19 +10,20 @@ See the License for more information. ============================================================================*/ #include "QCMake.h" // include to disable MS warnings + +#include "CMakeSetupDialog.h" +#include "cmAlgorithms.h" +#include "cmDocumentation.h" +#include "cmVersion.h" +#include "cmake.h" #include <QApplication> #include <QDir> -#include <QTranslator> #include <QLocale> #include <QTextCodec> -#include "CMakeSetupDialog.h" -#include "cmDocumentation.h" -#include "cmake.h" -#include "cmVersion.h" -#include "cmAlgorithms.h" +#include <QTranslator> #include <cmsys/CommandLineArguments.hxx> -#include <cmsys/SystemTools.hxx> #include <cmsys/Encoding.hxx> +#include <cmsys/SystemTools.hxx> //---------------------------------------------------------------------------- static const char * cmDocumentationName[][2] = diff --git a/Source/QtDialog/CMakeSetupDialog.cxx b/Source/QtDialog/CMakeSetupDialog.cxx index 2fc4fafdc4..945739d8f6 100644 --- a/Source/QtDialog/CMakeSetupDialog.cxx +++ b/Source/QtDialog/CMakeSetupDialog.cxx @@ -11,28 +11,29 @@ ============================================================================*/ #include "CMakeSetupDialog.h" -#include <QFileDialog> -#include <QProgressBar> -#include <QMessageBox> -#include <QStatusBar> -#include <QToolButton> -#include <QDialogButtonBox> + #include <QCloseEvent> #include <QCoreApplication> -#include <QSettings> +#include <QDialogButtonBox> +#include <QDragEnterEvent> +#include <QFileDialog> +#include <QInputDialog> +#include <QKeySequence> #include <QMenu> #include <QMenuBar> -#include <QDragEnterEvent> +#include <QMessageBox> #include <QMimeData> -#include <QUrl> +#include <QProgressBar> +#include <QSettings> #include <QShortcut> -#include <QKeySequence> -#include <QInputDialog> +#include <QStatusBar> +#include <QToolButton> +#include <QUrl> -#include "QCMake.h" -#include "QCMakeCacheView.h" #include "AddCacheEntry.h" #include "FirstConfigure.h" +#include "QCMake.h" +#include "QCMakeCacheView.h" #include "RegexExplorer.h" #include "WarningMessagesDialog.h" #include "cmSystemTools.h" diff --git a/Source/QtDialog/CMakeSetupDialog.h b/Source/QtDialog/CMakeSetupDialog.h index 4b53b1cbda..f9624d1d9f 100644 --- a/Source/QtDialog/CMakeSetupDialog.h +++ b/Source/QtDialog/CMakeSetupDialog.h @@ -14,10 +14,11 @@ #define CMakeSetupDialog_h #include "QCMake.h" + +#include "ui_CMakeSetupDialog.h" +#include <QEventLoop> #include <QMainWindow> #include <QThread> -#include <QEventLoop> -#include "ui_CMakeSetupDialog.h" class QCMakeThread; class CMakeCacheModel; 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..5c0af2b36d 100644 --- a/Source/QtDialog/FirstConfigure.cxx +++ b/Source/QtDialog/FirstConfigure.cxx @@ -1,10 +1,11 @@ #include "FirstConfigure.h" + #include "Compilers.h" -#include <QSettings> -#include <QRadioButton> #include <QComboBox> +#include <QRadioButton> +#include <QSettings> #include <QVBoxLayout> 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.cxx b/Source/QtDialog/QCMake.cxx index dd7c1387a0..28be341665 100644 --- a/Source/QtDialog/QCMake.cxx +++ b/Source/QtDialog/QCMake.cxx @@ -12,12 +12,12 @@ #include "QCMake.h" -#include <QDir> #include <QCoreApplication> +#include <QDir> +#include "cmExternalMakefileProjectGenerator.h" #include "cmState.h" #include "cmSystemTools.h" -#include "cmExternalMakefileProjectGenerator.h" #ifdef Q_OS_WIN #include "qt_windows.h" // For SetErrorMode diff --git a/Source/QtDialog/QCMake.h b/Source/QtDialog/QCMake.h index 8942e7c909..5cae06d4aa 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 ) @@ -19,15 +22,13 @@ #include <vector> +#include <QAtomicInt> +#include <QList> +#include <QMetaType> #include <QObject> #include <QString> -#include <QVariant> -#include <QList> #include <QStringList> -#include <QMetaType> -#include <QAtomicInt> - -#include "cmake.h" +#include <QVariant> /// struct to represent cmake properties in Qt /// Value is of type String or Bool diff --git a/Source/QtDialog/QCMakeCacheView.cxx b/Source/QtDialog/QCMakeCacheView.cxx index bae6a30a74..f64a78a295 100644 --- a/Source/QtDialog/QCMakeCacheView.cxx +++ b/Source/QtDialog/QCMakeCacheView.cxx @@ -12,14 +12,14 @@ #include "QCMakeCacheView.h" +#include <QApplication> +#include <QEvent> #include <QHBoxLayout> #include <QHeaderView> -#include <QEvent> -#include <QStyle> #include <QKeyEvent> -#include <QSortFilterProxyModel> #include <QMetaProperty> -#include <QApplication> +#include <QSortFilterProxyModel> +#include <QStyle> #include "QCMakeWidgets.h" diff --git a/Source/QtDialog/QCMakeCacheView.h b/Source/QtDialog/QCMakeCacheView.h index 41f0bd87cb..5631b8615d 100644 --- a/Source/QtDialog/QCMakeCacheView.h +++ b/Source/QtDialog/QCMakeCacheView.h @@ -14,10 +14,11 @@ #define QCMakeCacheView_h #include "QCMake.h" -#include <QTreeView> + +#include <QItemDelegate> #include <QSet> #include <QStandardItemModel> -#include <QItemDelegate> +#include <QTreeView> class QSortFilterProxyModel; class QCMakeCacheModel; diff --git a/Source/QtDialog/QCMakeWidgets.cxx b/Source/QtDialog/QCMakeWidgets.cxx index 41f98b5d24..7803ef3078 100644 --- a/Source/QtDialog/QCMakeWidgets.cxx +++ b/Source/QtDialog/QCMakeWidgets.cxx @@ -13,10 +13,10 @@ #include "QCMakeWidgets.h" #include <QDirModel> -#include <QFileInfo> #include <QFileDialog> -#include <QToolButton> +#include <QFileInfo> #include <QResizeEvent> +#include <QToolButton> QCMakeFileEditor::QCMakeFileEditor(QWidget* p, const QString& var) : QLineEdit(p), Variable(var) diff --git a/Source/QtDialog/QCMakeWidgets.h b/Source/QtDialog/QCMakeWidgets.h index 8f58df2bb5..759b635bee 100644 --- a/Source/QtDialog/QCMakeWidgets.h +++ b/Source/QtDialog/QCMakeWidgets.h @@ -13,9 +13,10 @@ #ifndef QCMakeWidgets_h #define QCMakeWidgets_h -#include <QLineEdit> #include <QComboBox> #include <QCompleter> +#include <QLineEdit> + class QToolButton; // common widgets for Qt based CMake diff --git a/Source/QtDialog/RegexExplorer.h b/Source/QtDialog/RegexExplorer.h index 2ac9c3e2ee..3ac8a24950 100644 --- a/Source/QtDialog/RegexExplorer.h +++ b/Source/QtDialog/RegexExplorer.h @@ -13,9 +13,9 @@ #ifndef RegexExplorer_h #define RegexExplorer_h -#include <string> -#include <cmsys/RegularExpression.hxx> #include <QDialog> +#include <cmsys/RegularExpression.hxx> +#include <string> #include "ui_RegexExplorer.h" diff --git a/Source/QtDialog/WarningMessagesDialog.h b/Source/QtDialog/WarningMessagesDialog.h index 6c274a71d9..4bb739c484 100644 --- a/Source/QtDialog/WarningMessagesDialog.h +++ b/Source/QtDialog/WarningMessagesDialog.h @@ -16,8 +16,8 @@ #include <QDialog> #include <QWidget> -#include "ui_WarningMessagesDialog.h" #include "QCMake.h" +#include "ui_WarningMessagesDialog.h" /** * Dialog window for setting the warning message related options. diff --git a/Source/bindexplib.cxx b/Source/bindexplib.cxx index e7263aeadf..b179f83488 100644 --- a/Source/bindexplib.cxx +++ b/Source/bindexplib.cxx @@ -72,11 +72,11 @@ */ #include "bindexplib.h" #include <cmsys/Encoding.hxx> -#include <windows.h> -#include <stdio.h> -#include <string> #include <fstream> #include <iostream> +#include <stdio.h> +#include <string> +#include <windows.h> typedef struct cmANON_OBJECT_HEADER_BIGOBJ { /* same as ANON_OBJECT_HEADER_V2 */ 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/cmAddLibraryCommand.cxx b/Source/cmAddLibraryCommand.cxx index 5296cbb365..e40ecf4ffe 100644 --- a/Source/cmAddLibraryCommand.cxx +++ b/Source/cmAddLibraryCommand.cxx @@ -11,8 +11,8 @@ ============================================================================*/ #include "cmAddLibraryCommand.h" -#include "cmake.h" #include "cmState.h" +#include "cmake.h" // cmLibraryCommand bool cmAddLibraryCommand diff --git a/Source/cmArchiveWrite.cxx b/Source/cmArchiveWrite.cxx index e62a2ed11b..b06b2f5f01 100644 --- a/Source/cmArchiveWrite.cxx +++ b/Source/cmArchiveWrite.cxx @@ -11,12 +11,12 @@ ============================================================================*/ #include "cmArchiveWrite.h" -#include "cmSystemTools.h" #include "cmLocale.h" +#include "cmSystemTools.h" +#include "cm_get_date.h" +#include <cm_libarchive.h> #include <cmsys/Directory.hxx> #include <cmsys/FStream.hxx> -#include <cm_libarchive.h> -#include "cm_get_date.h" #ifndef __LA_SSIZE_T # define __LA_SSIZE_T la_ssize_t 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/cmBootstrapCommands1.cxx b/Source/cmBootstrapCommands1.cxx index 0782b3ba79..2de8770146 100644 --- a/Source/cmBootstrapCommands1.cxx +++ b/Source/cmBootstrapCommands1.cxx @@ -13,7 +13,6 @@ // that CMake knows about at compile time. // This is sort of a boot strapping approach since you would // like to have CMake to build CMake. -#include "cmCommands.h" #include "cmAddCustomCommandCommand.cxx" #include "cmAddCustomTargetCommand.cxx" #include "cmAddDefinitionsCommand.cxx" @@ -27,6 +26,7 @@ #include "cmCMakeMinimumRequired.cxx" #include "cmCMakePolicyCommand.cxx" #include "cmCommandArgumentsHelper.cxx" +#include "cmCommands.h" #include "cmConfigureFileCommand.cxx" #include "cmContinueCommand.cxx" #include "cmCoreTryCompile.cxx" @@ -42,9 +42,9 @@ #include "cmEndWhileCommand.cxx" #include "cmExecProgramCommand.cxx" #include "cmExecuteProcessCommand.cxx" +#include "cmFileCommand.cxx" #include "cmFindBase.cxx" #include "cmFindCommon.cxx" -#include "cmFileCommand.cxx" #include "cmFindFileCommand.cxx" #include "cmFindLibraryCommand.cxx" #include "cmFindPackageCommand.cxx" @@ -52,9 +52,9 @@ #include "cmFindProgramCommand.cxx" #include "cmForEachCommand.cxx" #include "cmFunctionCommand.cxx" +#include "cmParseArgumentsCommand.cxx" #include "cmPathLabel.cxx" #include "cmSearchPath.cxx" -#include "cmParseArgumentsCommand.cxx" void GetBootstrapCommands1(std::vector<cmCommand*>& commands) { diff --git a/Source/cmBootstrapCommands2.cxx b/Source/cmBootstrapCommands2.cxx index e522d8c795..38d008d28e 100644 --- a/Source/cmBootstrapCommands2.cxx +++ b/Source/cmBootstrapCommands2.cxx @@ -22,14 +22,15 @@ #include "cmGetPropertyCommand.cxx" #include "cmGetSourceFilePropertyCommand.cxx" #include "cmGetTargetPropertyCommand.cxx" +#include "cmGetTestPropertyCommand.cxx" #include "cmHexFileConverter.cxx" #include "cmIfCommand.cxx" #include "cmIncludeCommand.cxx" #include "cmIncludeDirectoryCommand.cxx" #include "cmIncludeRegularExpressionCommand.cxx" -#include "cmInstallFilesCommand.cxx" -#include "cmInstallCommandArguments.cxx" #include "cmInstallCommand.cxx" +#include "cmInstallCommandArguments.cxx" +#include "cmInstallFilesCommand.cxx" #include "cmInstallTargetsCommand.cxx" #include "cmLinkDirectoriesCommand.cxx" #include "cmListCommand.cxx" @@ -48,7 +49,6 @@ #include "cmSetSourceFilesPropertiesCommand.cxx" #include "cmSetTargetPropertiesCommand.cxx" #include "cmSetTestsPropertiesCommand.cxx" -#include "cmGetTestPropertyCommand.cxx" #include "cmSiteNameCommand.cxx" #include "cmStringCommand.cxx" #include "cmSubdirCommand.cxx" diff --git a/Source/cmCPackPropertiesGenerator.cxx b/Source/cmCPackPropertiesGenerator.cxx index 35b3d59dc3..3eef55a8a3 100644 --- a/Source/cmCPackPropertiesGenerator.cxx +++ b/Source/cmCPackPropertiesGenerator.cxx @@ -1,7 +1,7 @@ #include "cmCPackPropertiesGenerator.h" -#include "cmOutputConverter.h" #include "cmLocalGenerator.h" +#include "cmOutputConverter.h" cmCPackPropertiesGenerator::cmCPackPropertiesGenerator( cmLocalGenerator* lg, diff --git a/Source/cmCPackPropertiesGenerator.h b/Source/cmCPackPropertiesGenerator.h index eec3df092d..e54bcab353 100644 --- a/Source/cmCPackPropertiesGenerator.h +++ b/Source/cmCPackPropertiesGenerator.h @@ -12,8 +12,8 @@ #ifndef cmCPackPropertiesGenerator_h #define cmCPackPropertiesGenerator_h -#include "cmScriptGenerator.h" #include "cmInstalledFile.h" +#include "cmScriptGenerator.h" class cmLocalGenerator; 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..1f07a07c93 100644 --- a/Source/cmCTest.cxx +++ b/Source/cmCTest.cxx @@ -12,24 +12,25 @@ #include "cmCurl.h" // include before anything that includes windows.h #include "cmCTest.h" -#include "cmake.h" -#include "cmMakefile.h" -#include "cmGlobalGenerator.h" -#include <cmsys/Base64.h> -#include <cmsys/Directory.hxx> -#include <cmsys/SystemInformation.hxx> -#include <cmsys/FStream.hxx> -#include "cmDynamicLoader.h" -#include "cmGeneratedFileStream.h" -#include "cmVersionMacros.h" + +#include "cmAlgorithms.h" #include "cmCTestCommand.h" #include "cmCTestStartCommand.h" -#include "cmAlgorithms.h" +#include "cmDynamicLoader.h" +#include "cmGeneratedFileStream.h" +#include "cmGlobalGenerator.h" +#include "cmMakefile.h" #include "cmState.h" +#include "cmVersionMacros.h" #include "cmXMLWriter.h" +#include "cmake.h" +#include <cmsys/Base64.h> +#include <cmsys/Directory.hxx> +#include <cmsys/FStream.hxx> +#include <cmsys/SystemInformation.hxx> -#include "cmCTestBuildHandler.h" #include "cmCTestBuildAndTestHandler.h" +#include "cmCTestBuildHandler.h" #include "cmCTestConfigureHandler.h" #include "cmCTestCoverageHandler.h" #include "cmCTestMemCheckHandler.h" @@ -41,14 +42,14 @@ #include "cmVersion.h" -#include <cmsys/RegularExpression.hxx> -#include <cmsys/Process.h> #include <cmsys/Glob.hxx> +#include <cmsys/Process.h> +#include <cmsys/RegularExpression.hxx> -#include <stdlib.h> -#include <math.h> -#include <float.h> #include <ctype.h> +#include <float.h> +#include <math.h> +#include <stdlib.h> #include <cmsys/auto_ptr.hxx> 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..afa2ba75b0 100644 --- a/Source/cmCacheManager.cxx +++ b/Source/cmCacheManager.cxx @@ -9,16 +9,16 @@ 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" +#include "cmSystemTools.h" #include "cmVersion.h" +#include "cmake.h" #include <cmsys/Directory.hxx> -#include <cmsys/Glob.hxx> #include <cmsys/FStream.hxx> +#include <cmsys/Glob.hxx> #include <cmsys/RegularExpression.hxx> cmCacheManager::cmCacheManager() 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..d5e394d5e8 100644 --- a/Source/cmCommand.h +++ b/Source/cmCommand.h @@ -13,9 +13,10 @@ #define cmCommand_h #include "cmObject.h" + +#include "cmCommandArgumentsHelper.h" #include "cmListFileCache.h" #include "cmMakefile.h" -#include "cmCommandArgumentsHelper.h" /** \class cmCommand * \brief Superclass for all commands in CMake. 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.cxx b/Source/cmComputeLinkDepends.cxx index 2796fdf665..f546fc8039 100644 --- a/Source/cmComputeLinkDepends.cxx +++ b/Source/cmComputeLinkDepends.cxx @@ -11,13 +11,13 @@ ============================================================================*/ #include "cmComputeLinkDepends.h" +#include "cmAlgorithms.h" #include "cmComputeComponentGraph.h" -#include "cmLocalGenerator.h" #include "cmGlobalGenerator.h" +#include "cmLocalGenerator.h" #include "cmMakefile.h" #include "cmTarget.h" #include "cmake.h" -#include "cmAlgorithms.h" #include <assert.h> diff --git a/Source/cmComputeLinkDepends.h b/Source/cmComputeLinkDepends.h index f10e4e435b..ea23308d26 100644 --- a/Source/cmComputeLinkDepends.h +++ b/Source/cmComputeLinkDepends.h @@ -13,9 +13,9 @@ #define cmComputeLinkDepends_h #include "cmStandardIncludes.h" -#include "cmLinkItem.h" #include "cmGraphAdjacencyList.h" +#include "cmLinkItem.h" #include <queue> diff --git a/Source/cmComputeLinkInformation.cxx b/Source/cmComputeLinkInformation.cxx index 50d8324383..f88d58ce5a 100644 --- a/Source/cmComputeLinkInformation.cxx +++ b/Source/cmComputeLinkInformation.cxx @@ -14,14 +14,14 @@ #include "cmComputeLinkDepends.h" #include "cmOrderDirectories.h" -#include "cmLocalGenerator.h" +#include "cmAlgorithms.h" +#include "cmGeneratorTarget.h" #include "cmGlobalGenerator.h" -#include "cmState.h" -#include "cmOutputConverter.h" +#include "cmLocalGenerator.h" #include "cmMakefile.h" -#include "cmGeneratorTarget.h" +#include "cmOutputConverter.h" +#include "cmState.h" #include "cmake.h" -#include "cmAlgorithms.h" #include <ctype.h> diff --git a/Source/cmComputeTargetDepends.cxx b/Source/cmComputeTargetDepends.cxx index 586b5bfb1b..7f12006f5a 100644 --- a/Source/cmComputeTargetDepends.cxx +++ b/Source/cmComputeTargetDepends.cxx @@ -15,9 +15,9 @@ #include "cmGlobalGenerator.h" #include "cmLocalGenerator.h" #include "cmMakefile.h" +#include "cmSourceFile.h" #include "cmState.h" #include "cmSystemTools.h" -#include "cmSourceFile.h" #include "cmTarget.h" #include "cmake.h" diff --git a/Source/cmConditionEvaluator.cxx b/Source/cmConditionEvaluator.cxx index 07c9dd6205..3711b9bed1 100644 --- a/Source/cmConditionEvaluator.cxx +++ b/Source/cmConditionEvaluator.cxx @@ -11,8 +11,9 @@ ============================================================================*/ #include "cmConditionEvaluator.h" -#include "cmOutputConverter.h" + #include "cmAlgorithms.h" +#include "cmOutputConverter.h" static std::string const keyAND = "AND"; static std::string const keyCOMMAND = "COMMAND"; diff --git a/Source/cmCoreTryCompile.cxx b/Source/cmCoreTryCompile.cxx index cfd31b2612..231c260c23 100644 --- a/Source/cmCoreTryCompile.cxx +++ b/Source/cmCoreTryCompile.cxx @@ -10,11 +10,12 @@ See the License for more information. ============================================================================*/ #include "cmCoreTryCompile.h" -#include "cmake.h" -#include "cmOutputConverter.h" -#include "cmGlobalGenerator.h" + #include "cmAlgorithms.h" #include "cmExportTryCompileFileGenerator.h" +#include "cmGlobalGenerator.h" +#include "cmOutputConverter.h" +#include "cmake.h" #include <cmsys/Directory.hxx> #include <assert.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/cmCryptoHash.cxx b/Source/cmCryptoHash.cxx index 66162181ee..d1112f2f7b 100644 --- a/Source/cmCryptoHash.cxx +++ b/Source/cmCryptoHash.cxx @@ -11,9 +11,9 @@ ============================================================================*/ #include "cmCryptoHash.h" -#include <cmsys/MD5.h> -#include <cmsys/FStream.hxx> #include "cm_sha2.h" +#include <cmsys/FStream.hxx> +#include <cmsys/MD5.h> //---------------------------------------------------------------------------- cmsys::auto_ptr<cmCryptoHash> cmCryptoHash::New(const char* algo) 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/cmCustomCommandGenerator.cxx b/Source/cmCustomCommandGenerator.cxx index dc06678cf0..5d3a1cecca 100644 --- a/Source/cmCustomCommandGenerator.cxx +++ b/Source/cmCustomCommandGenerator.cxx @@ -11,11 +11,11 @@ ============================================================================*/ #include "cmCustomCommandGenerator.h" -#include "cmMakefile.h" -#include "cmLocalGenerator.h" #include "cmCustomCommand.h" -#include "cmOutputConverter.h" #include "cmGeneratorExpression.h" +#include "cmLocalGenerator.h" +#include "cmMakefile.h" +#include "cmOutputConverter.h" //---------------------------------------------------------------------------- cmCustomCommandGenerator::cmCustomCommandGenerator( diff --git a/Source/cmDefinePropertyCommand.cxx b/Source/cmDefinePropertyCommand.cxx index 0efc7fcf58..47fc22e011 100644 --- a/Source/cmDefinePropertyCommand.cxx +++ b/Source/cmDefinePropertyCommand.cxx @@ -10,8 +10,9 @@ See the License for more information. ============================================================================*/ #include "cmDefinePropertyCommand.h" -#include "cmake.h" + #include "cmState.h" +#include "cmake.h" bool cmDefinePropertyCommand ::InitialPass(std::vector<std::string> const& args, cmExecutionStatus &) diff --git a/Source/cmDepends.cxx b/Source/cmDepends.cxx index d4190112d4..40b552b980 100644 --- a/Source/cmDepends.cxx +++ b/Source/cmDepends.cxx @@ -11,13 +11,13 @@ ============================================================================*/ #include "cmDepends.h" +#include "cmFileTimeComparison.h" +#include "cmGeneratedFileStream.h" #include "cmLocalGenerator.h" #include "cmMakefile.h" -#include "cmGeneratedFileStream.h" #include "cmSystemTools.h" -#include "cmFileTimeComparison.h" -#include <string.h> #include <cmsys/FStream.hxx> +#include <string.h> //---------------------------------------------------------------------------- cmDepends::cmDepends(cmLocalGenerator* lg, const char* targetDir): diff --git a/Source/cmDependsC.cxx b/Source/cmDependsC.cxx index 6cdd4c13d5..6bf815ec27 100644 --- a/Source/cmDependsC.cxx +++ b/Source/cmDependsC.cxx @@ -11,11 +11,11 @@ ============================================================================*/ #include "cmDependsC.h" +#include "cmAlgorithms.h" #include "cmFileTimeComparison.h" #include "cmLocalGenerator.h" #include "cmMakefile.h" #include "cmSystemTools.h" -#include "cmAlgorithms.h" #include <cmsys/FStream.hxx> #include <ctype.h> // isspace 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/cmDependsFortran.cxx b/Source/cmDependsFortran.cxx index 80f560f316..a7909b2642 100644 --- a/Source/cmDependsFortran.cxx +++ b/Source/cmDependsFortran.cxx @@ -11,14 +11,14 @@ ============================================================================*/ #include "cmDependsFortran.h" -#include "cmSystemTools.h" +#include "cmGeneratedFileStream.h" #include "cmLocalGenerator.h" #include "cmMakefile.h" -#include "cmGeneratedFileStream.h" +#include "cmSystemTools.h" #include "cmFortranParser.h" /* Interface to parser object. */ -#include <cmsys/FStream.hxx> #include <assert.h> +#include <cmsys/FStream.hxx> // TODO: Test compiler for the case of the mod file. Some always // use lower case and some always use upper case. I do not know if any diff --git a/Source/cmDocumentation.cxx b/Source/cmDocumentation.cxx index 4f3475536e..81e67962e5 100644 --- a/Source/cmDocumentation.cxx +++ b/Source/cmDocumentation.cxx @@ -11,14 +11,14 @@ ============================================================================*/ #include "cmDocumentation.h" +#include "cmAlgorithms.h" +#include "cmRST.h" #include "cmSystemTools.h" #include "cmVersion.h" -#include "cmRST.h" -#include "cmAlgorithms.h" #include <cmsys/Directory.hxx> -#include <cmsys/Glob.hxx> #include <cmsys/FStream.hxx> +#include <cmsys/Glob.hxx> #include <ctype.h> 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..0e6f577afd 100644 --- a/Source/cmELF.cxx +++ b/Source/cmELF.cxx @@ -10,15 +10,16 @@ See the License for more information. ============================================================================*/ #include "cmStandardIncludes.h" // to get CMAKE_USE_ELF_PARSER first + #include "cmELF.h" -#include <cmsys/auto_ptr.hxx> #include <cmsys/FStream.hxx> +#include <cmsys/auto_ptr.hxx> // Include the ELF format information system header. #if defined(__OpenBSD__) -# include <stdint.h> # include <elf_abi.h> +# include <stdint.h> #elif defined(__HAIKU__) # include <elf32.h> # include <elf64.h> 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/cmExportBuildFileGenerator.cxx b/Source/cmExportBuildFileGenerator.cxx index dcb21876cc..87ea2c234e 100644 --- a/Source/cmExportBuildFileGenerator.cxx +++ b/Source/cmExportBuildFileGenerator.cxx @@ -11,9 +11,9 @@ ============================================================================*/ #include "cmExportBuildFileGenerator.h" -#include "cmLocalGenerator.h" -#include "cmGlobalGenerator.h" #include "cmExportSet.h" +#include "cmGlobalGenerator.h" +#include "cmLocalGenerator.h" #include "cmTargetExport.h" //---------------------------------------------------------------------------- diff --git a/Source/cmExportCommand.cxx b/Source/cmExportCommand.cxx index 4eec66a339..bbd07db787 100644 --- a/Source/cmExportCommand.cxx +++ b/Source/cmExportCommand.cxx @@ -10,12 +10,13 @@ See the License for more information. ============================================================================*/ #include "cmExportCommand.h" -#include "cmGlobalGenerator.h" + #include "cmGeneratedFileStream.h" +#include "cmGlobalGenerator.h" #include "cmake.h" -#include <cmsys/RegularExpression.hxx> #include <cmsys/Encoding.hxx> +#include <cmsys/RegularExpression.hxx> #include "cmExportBuildFileGenerator.h" diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx index c005995f76..2b3ce148c4 100644 --- a/Source/cmExportFileGenerator.cxx +++ b/Source/cmExportFileGenerator.cxx @@ -11,22 +11,22 @@ ============================================================================*/ #include "cmExportFileGenerator.h" +#include "cmAlgorithms.h" +#include "cmComputeLinkInformation.h" #include "cmExportSet.h" #include "cmGeneratedFileStream.h" #include "cmGlobalGenerator.h" #include "cmInstallExportGenerator.h" #include "cmLocalGenerator.h" #include "cmMakefile.h" +#include "cmOutputConverter.h" #include "cmSystemTools.h" #include "cmTargetExport.h" #include "cmVersion.h" -#include "cmComputeLinkInformation.h" -#include "cmAlgorithms.h" -#include "cmOutputConverter.h" -#include <cmsys/auto_ptr.hxx> -#include <cmsys/FStream.hxx> #include <assert.h> +#include <cmsys/FStream.hxx> +#include <cmsys/auto_ptr.hxx> //---------------------------------------------------------------------------- static std::string cmExportFileGeneratorEscape(std::string const& str) diff --git a/Source/cmExportFileGenerator.h b/Source/cmExportFileGenerator.h index 18f0b009aa..9fc02a486b 100644 --- a/Source/cmExportFileGenerator.h +++ b/Source/cmExportFileGenerator.h @@ -15,8 +15,8 @@ #include "cmCommand.h" #include "cmGeneratorExpression.h" -#include "cmVersionMacros.h" #include "cmVersion.h" +#include "cmVersionMacros.h" #define STRINGIFY_HELPER(X) #X #define STRINGIFY(X) STRINGIFY_HELPER(X) diff --git a/Source/cmExportInstallFileGenerator.cxx b/Source/cmExportInstallFileGenerator.cxx index 71418e825d..0ea24c1acc 100644 --- a/Source/cmExportInstallFileGenerator.cxx +++ b/Source/cmExportInstallFileGenerator.cxx @@ -11,15 +11,15 @@ ============================================================================*/ #include "cmExportInstallFileGenerator.h" +#include "cmAlgorithms.h" #include "cmExportSet.h" #include "cmExportSetMap.h" #include "cmGeneratedFileStream.h" #include "cmGlobalGenerator.h" -#include "cmLocalGenerator.h" #include "cmInstallExportGenerator.h" #include "cmInstallTargetGenerator.h" +#include "cmLocalGenerator.h" #include "cmTargetExport.h" -#include "cmAlgorithms.h" //---------------------------------------------------------------------------- cmExportInstallFileGenerator diff --git a/Source/cmExportLibraryDependenciesCommand.cxx b/Source/cmExportLibraryDependenciesCommand.cxx index 21d961fbc4..a715070203 100644 --- a/Source/cmExportLibraryDependenciesCommand.cxx +++ b/Source/cmExportLibraryDependenciesCommand.cxx @@ -10,10 +10,11 @@ See the License for more information. ============================================================================*/ #include "cmExportLibraryDependenciesCommand.h" -#include "cmGlobalGenerator.h" + #include "cmGeneratedFileStream.h" -#include "cmake.h" +#include "cmGlobalGenerator.h" #include "cmVersion.h" +#include "cmake.h" #include <cmsys/auto_ptr.hxx> diff --git a/Source/cmExportSet.cxx b/Source/cmExportSet.cxx index 0059b64007..83c4fdc128 100644 --- a/Source/cmExportSet.cxx +++ b/Source/cmExportSet.cxx @@ -11,9 +11,10 @@ ============================================================================*/ #include "cmExportSet.h" -#include "cmTargetExport.h" + #include "cmAlgorithms.h" #include "cmLocalGenerator.h" +#include "cmTargetExport.h" cmExportSet::~cmExportSet() { 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..d267cd364b 100644 --- a/Source/cmExportSetMap.cxx +++ b/Source/cmExportSetMap.cxx @@ -11,8 +11,9 @@ ============================================================================*/ #include "cmExportSetMap.h" -#include "cmExportSet.h" + #include "cmAlgorithms.h" +#include "cmExportSet.h" cmExportSet* cmExportSetMap::operator[](const std::string &name) { 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/cmExportTryCompileFileGenerator.cxx b/Source/cmExportTryCompileFileGenerator.cxx index 83127e7ed9..5bafa1cb6f 100644 --- a/Source/cmExportTryCompileFileGenerator.cxx +++ b/Source/cmExportTryCompileFileGenerator.cxx @@ -13,9 +13,9 @@ #include "cmExportTryCompileFileGenerator.h" #include "cmGeneratedFileStream.h" +#include "cmGeneratorExpressionDAGChecker.h" #include "cmGlobalGenerator.h" #include "cmLocalGenerator.h" -#include "cmGeneratorExpressionDAGChecker.h" //---------------------------------------------------------------------------- cmExportTryCompileFileGenerator::cmExportTryCompileFileGenerator( 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..f6be583cc6 100644 --- a/Source/cmExtraCodeBlocksGenerator.cxx +++ b/Source/cmExtraCodeBlocksGenerator.cxx @@ -11,14 +11,15 @@ See the License for more information. ============================================================================*/ #include "cmExtraCodeBlocksGenerator.h" + +#include "cmGeneratedFileStream.h" #include "cmGlobalUnixMakefileGenerator3.h" #include "cmLocalUnixMakefileGenerator3.h" #include "cmMakefile.h" -#include "cmake.h" #include "cmSourceFile.h" -#include "cmGeneratedFileStream.h" #include "cmSystemTools.h" #include "cmXMLWriter.h" +#include "cmake.h" #include <cmsys/SystemTools.hxx> diff --git a/Source/cmExtraCodeLiteGenerator.cxx b/Source/cmExtraCodeLiteGenerator.cxx index 9fc7b1eec5..6c7d5f6e6d 100644 --- a/Source/cmExtraCodeLiteGenerator.cxx +++ b/Source/cmExtraCodeLiteGenerator.cxx @@ -12,19 +12,20 @@ See the License for more information. ============================================================================*/ #include "cmExtraCodeLiteGenerator.h" + +#include "cmGeneratedFileStream.h" #include "cmGlobalUnixMakefileGenerator3.h" #include "cmLocalUnixMakefileGenerator3.h" #include "cmMakefile.h" -#include "cmake.h" #include "cmSourceFile.h" -#include "cmGeneratedFileStream.h" #include "cmSystemTools.h" +#include "cmake.h" -#include <cmsys/SystemTools.hxx> -#include <cmsys/SystemInformation.hxx> -#include <cmsys/Directory.hxx> #include "cmStandardIncludes.h" #include "cmXMLWriter.h" +#include <cmsys/Directory.hxx> +#include <cmsys/SystemInformation.hxx> +#include <cmsys/SystemTools.hxx> //---------------------------------------------------------------------------- void cmExtraCodeLiteGenerator::GetDocumentation(cmDocumentationEntry& entry, diff --git a/Source/cmExtraEclipseCDT4Generator.cxx b/Source/cmExtraEclipseCDT4Generator.cxx index 9e67301fd8..40cc90466d 100644 --- a/Source/cmExtraEclipseCDT4Generator.cxx +++ b/Source/cmExtraEclipseCDT4Generator.cxx @@ -12,18 +12,19 @@ See the License for more information. ============================================================================*/ #include "cmExtraEclipseCDT4Generator.h" + +#include "cmGeneratedFileStream.h" #include "cmGlobalUnixMakefileGenerator3.h" #include "cmLocalUnixMakefileGenerator3.h" #include "cmMakefile.h" -#include "cmGeneratedFileStream.h" +#include "cmSourceFile.h" #include "cmState.h" #include "cmTarget.h" -#include "cmSourceFile.h" #include "cmXMLWriter.h" #include "cmSystemTools.h" -#include <stdlib.h> #include <assert.h> +#include <stdlib.h> static void AppendAttribute(cmXMLWriter& xml, const char* keyval) { diff --git a/Source/cmExtraKateGenerator.cxx b/Source/cmExtraKateGenerator.cxx index ff5d3ab5fb..4b779d813c 100644 --- a/Source/cmExtraKateGenerator.cxx +++ b/Source/cmExtraKateGenerator.cxx @@ -11,13 +11,14 @@ See the License for more information. ============================================================================*/ #include "cmExtraKateGenerator.h" + +#include "cmGeneratedFileStream.h" #include "cmGlobalUnixMakefileGenerator3.h" #include "cmLocalUnixMakefileGenerator3.h" #include "cmMakefile.h" -#include "cmake.h" #include "cmSourceFile.h" -#include "cmGeneratedFileStream.h" #include "cmSystemTools.h" +#include "cmake.h" #include <cmsys/SystemTools.hxx> diff --git a/Source/cmExtraSublimeTextGenerator.cxx b/Source/cmExtraSublimeTextGenerator.cxx index 92d38b95c7..a8367c4f94 100644 --- a/Source/cmExtraSublimeTextGenerator.cxx +++ b/Source/cmExtraSublimeTextGenerator.cxx @@ -11,7 +11,7 @@ See the License for more information. ============================================================================*/ #include "cmExtraSublimeTextGenerator.h" -#include "cmake.h" + #include "cmGeneratedFileStream.h" #include "cmGeneratorTarget.h" #include "cmGlobalUnixMakefileGenerator3.h" @@ -20,6 +20,7 @@ #include "cmMakefile.h" #include "cmSourceFile.h" #include "cmSystemTools.h" +#include "cmake.h" #include <cmsys/SystemTools.hxx> diff --git a/Source/cmFileCommand.cxx b/Source/cmFileCommand.cxx index b0a61b2c3d..035b97ff96 100644 --- a/Source/cmFileCommand.cxx +++ b/Source/cmFileCommand.cxx @@ -10,14 +10,15 @@ See the License for more information. ============================================================================*/ #include "cmFileCommand.h" + +#include "cmAlgorithms.h" +#include "cmCryptoHash.h" #include "cmCryptoHash.h" -#include "cmake.h" -#include "cmHexFileConverter.h" -#include "cmInstallType.h" #include "cmFileTimeComparison.h" #include "cmGlobalGenerator.h" -#include "cmCryptoHash.h" -#include "cmAlgorithms.h" +#include "cmHexFileConverter.h" +#include "cmInstallType.h" +#include "cmake.h" #include "cmTimestamp.h" @@ -27,16 +28,16 @@ #endif #undef GetCurrentDirectory -#include <assert.h> #include <sys/types.h> +#include <assert.h> #include <sys/stat.h> -#include <cmsys/auto_ptr.hxx> #include <cmsys/Directory.hxx> +#include <cmsys/Encoding.hxx> +#include <cmsys/FStream.hxx> #include <cmsys/Glob.hxx> #include <cmsys/RegularExpression.hxx> -#include <cmsys/FStream.hxx> -#include <cmsys/Encoding.hxx> +#include <cmsys/auto_ptr.hxx> // Table of permissions flags. #if defined(_WIN32) && !defined(__CYGWIN__) diff --git a/Source/cmFileLock.cxx b/Source/cmFileLock.cxx index e6aa5f49d5..0d41c53c54 100644 --- a/Source/cmFileLock.cxx +++ b/Source/cmFileLock.cxx @@ -12,8 +12,8 @@ #include "cmFileLock.h" -#include <assert.h> #include "cmFileLockResult.h" +#include <assert.h> // Common implementation diff --git a/Source/cmFileLockPool.cxx b/Source/cmFileLockPool.cxx index 3710eb0302..939a8f5371 100644 --- a/Source/cmFileLockPool.cxx +++ b/Source/cmFileLockPool.cxx @@ -14,9 +14,9 @@ #include <assert.h> +#include "cmAlgorithms.h" #include "cmFileLock.h" #include "cmFileLockResult.h" -#include "cmAlgorithms.h" cmFileLockPool::cmFileLockPool() { diff --git a/Source/cmFileLockUnix.cxx b/Source/cmFileLockUnix.cxx index 36a2d72887..f5e77be2ec 100644 --- a/Source/cmFileLockUnix.cxx +++ b/Source/cmFileLockUnix.cxx @@ -12,11 +12,11 @@ #include "cmFileLock.h" +#include "cmSystemTools.h" #include <errno.h> // errno -#include <stdio.h> // SEEK_SET #include <fcntl.h> +#include <stdio.h> // SEEK_SET #include <unistd.h> -#include "cmSystemTools.h" cmFileLock::cmFileLock(): File(-1) { diff --git a/Source/cmFileLockWin32.cxx b/Source/cmFileLockWin32.cxx index dc65948bd2..e40ae2c299 100644 --- a/Source/cmFileLockWin32.cxx +++ b/Source/cmFileLockWin32.cxx @@ -12,8 +12,8 @@ #include "cmFileLock.h" -#include <windows.h> // CreateFileW #include "cmSystemTools.h" +#include <windows.h> // CreateFileW cmFileLock::cmFileLock(): File(INVALID_HANDLE_VALUE) { diff --git a/Source/cmFindCommon.cxx b/Source/cmFindCommon.cxx index 913985fdb5..d70fa89244 100644 --- a/Source/cmFindCommon.cxx +++ b/Source/cmFindCommon.cxx @@ -10,8 +10,9 @@ See the License for more information. ============================================================================*/ #include "cmFindCommon.h" -#include <functional> + #include <algorithm> +#include <functional> //---------------------------------------------------------------------------- cmFindCommon::PathGroup cmFindCommon::PathGroup::All("ALL"); diff --git a/Source/cmFindCommon.h b/Source/cmFindCommon.h index 3fefc8da5a..2b87427226 100644 --- a/Source/cmFindCommon.h +++ b/Source/cmFindCommon.h @@ -13,8 +13,8 @@ #define cmFindCommon_h #include "cmCommand.h" -#include "cmSearchPath.h" #include "cmPathLabel.h" +#include "cmSearchPath.h" /** \class cmFindCommon * \brief Base class for FIND_XXX implementations. 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/cmFindPackageCommand.cxx b/Source/cmFindPackageCommand.cxx index 64176e7fb2..97f1563660 100644 --- a/Source/cmFindPackageCommand.cxx +++ b/Source/cmFindPackageCommand.cxx @@ -11,19 +11,19 @@ ============================================================================*/ #include "cmFindPackageCommand.h" +#include "cmAlgorithms.h" #include <cmsys/Directory.hxx> -#include <cmsys/RegularExpression.hxx> #include <cmsys/Encoding.hxx> -#include "cmAlgorithms.h" +#include <cmsys/RegularExpression.hxx> #ifdef CMAKE_BUILD_WITH_CMAKE #include "cmVariableWatch.h" #endif #if defined(__HAIKU__) -#include <string.h> #include <FindDirectory.h> #include <StorageDefs.h> +#include <string.h> #endif //---------------------------------------------------------------------------- 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.cxx b/Source/cmGeneratorExpression.cxx index 6796a011fb..d0ed28dba1 100644 --- a/Source/cmGeneratorExpression.cxx +++ b/Source/cmGeneratorExpression.cxx @@ -15,10 +15,10 @@ #include "cmAlgorithms.h" #include "cmSystemTools.h" +#include "cmGeneratorExpressionDAGChecker.h" #include "cmGeneratorExpressionEvaluator.h" #include "cmGeneratorExpressionLexer.h" #include "cmGeneratorExpressionParser.h" -#include "cmGeneratorExpressionDAGChecker.h" //---------------------------------------------------------------------------- cmGeneratorExpression::cmGeneratorExpression( 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/cmGeneratorExpressionContext.h b/Source/cmGeneratorExpressionContext.h index e802138bc7..68cdf49264 100644 --- a/Source/cmGeneratorExpressionContext.h +++ b/Source/cmGeneratorExpressionContext.h @@ -14,8 +14,8 @@ #include "cmListFileCache.h" -#include <set> #include <map> +#include <set> #include <string> class cmGeneratorTarget; diff --git a/Source/cmGeneratorExpressionDAGChecker.cxx b/Source/cmGeneratorExpressionDAGChecker.cxx index c3b0272ed9..00a497c705 100644 --- a/Source/cmGeneratorExpressionDAGChecker.cxx +++ b/Source/cmGeneratorExpressionDAGChecker.cxx @@ -12,8 +12,8 @@ #include "cmGeneratorExpressionDAGChecker.h" -#include "cmLocalGenerator.h" #include "cmAlgorithms.h" +#include "cmLocalGenerator.h" //---------------------------------------------------------------------------- cmGeneratorExpressionDAGChecker::cmGeneratorExpressionDAGChecker( diff --git a/Source/cmGeneratorExpressionEvaluationFile.cxx b/Source/cmGeneratorExpressionEvaluationFile.cxx index 4ac2a0d0e2..5d8050b83c 100644 --- a/Source/cmGeneratorExpressionEvaluationFile.cxx +++ b/Source/cmGeneratorExpressionEvaluationFile.cxx @@ -12,11 +12,11 @@ #include "cmGeneratorExpressionEvaluationFile.h" -#include "cmMakefile.h" -#include "cmLocalGenerator.h" +#include "cmGeneratedFileStream.h" #include "cmGlobalGenerator.h" +#include "cmLocalGenerator.h" +#include "cmMakefile.h" #include "cmSourceFile.h" -#include "cmGeneratedFileStream.h" #include <cmsys/FStream.hxx> #include <assert.h> 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..d9dd3b16ac 100644 --- a/Source/cmGeneratorExpressionEvaluator.cxx +++ b/Source/cmGeneratorExpressionEvaluator.cxx @@ -9,16 +9,16 @@ implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License for more information. ============================================================================*/ -#include "cmMakefile.h" - #include "cmGeneratorExpressionEvaluator.h" -#include "cmGeneratorExpressionParser.h" -#include "cmGeneratorExpressionDAGChecker.h" + +#include "cmAlgorithms.h" #include "cmGeneratorExpression.h" -#include "cmLocalGenerator.h" +#include "cmGeneratorExpressionDAGChecker.h" +#include "cmGeneratorExpressionParser.h" #include "cmGlobalGenerator.h" +#include "cmLocalGenerator.h" +#include "cmMakefile.h" #include "cmSourceFile.h" -#include "cmAlgorithms.h" #include <cmsys/String.h> diff --git a/Source/cmGeneratorExpressionEvaluator.h b/Source/cmGeneratorExpressionEvaluator.h index 407f83f195..b60bb5dcf8 100644 --- a/Source/cmGeneratorExpressionEvaluator.h +++ b/Source/cmGeneratorExpressionEvaluator.h @@ -12,11 +12,12 @@ #ifndef cmGeneratorExpressionEvaluator_h #define cmGeneratorExpressionEvaluator_h -#include "cmListFileCache.h" #include "cmGeneratorExpressionContext.h" -#include <vector> +#include "cmListFileCache.h" + #include <string> +#include <vector> struct cmGeneratorExpressionDAGChecker; struct cmGeneratorExpressionNode; diff --git a/Source/cmGeneratorExpressionNode.cxx b/Source/cmGeneratorExpressionNode.cxx index 32b2f82518..a9227b0cf5 100644 --- a/Source/cmGeneratorExpressionNode.cxx +++ b/Source/cmGeneratorExpressionNode.cxx @@ -11,10 +11,11 @@ ============================================================================*/ #include "cmGeneratorExpressionNode.h" -#include "cmGlobalGenerator.h" + #include "cmAlgorithms.h" -#include "cmOutputConverter.h" +#include "cmGlobalGenerator.h" #include "cmMakefile.h" +#include "cmOutputConverter.h" //---------------------------------------------------------------------------- std::string cmGeneratorExpressionNode::EvaluateDependentExpression( diff --git a/Source/cmGeneratorExpressionNode.h b/Source/cmGeneratorExpressionNode.h index 854811b99e..2d66727f33 100644 --- a/Source/cmGeneratorExpressionNode.h +++ b/Source/cmGeneratorExpressionNode.h @@ -12,10 +12,11 @@ #ifndef cmGeneratorExpressionNode_h #define cmGeneratorExpressionNode_h +#include "cmGeneratorExpression.h" + +#include "cmGeneratorExpressionDAGChecker.h" #include "cmGeneratorExpressionEvaluator.h" #include "cmGeneratorExpressionParser.h" -#include "cmGeneratorExpressionDAGChecker.h" -#include "cmGeneratorExpression.h" #include "cmLocalGenerator.h" #include "cmSourceFile.h" diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx index d7c2782019..f115d83f96 100644 --- a/Source/cmGeneratorTarget.cxx +++ b/Source/cmGeneratorTarget.cxx @@ -11,21 +11,21 @@ ============================================================================*/ #include "cmGeneratorTarget.h" -#include "cmTarget.h" -#include "cmMakefile.h" -#include "cmLocalGenerator.h" -#include "cmGlobalGenerator.h" -#include "cmSourceFile.h" -#include "cmGeneratorExpression.h" -#include "cmGeneratorExpressionDAGChecker.h" +#include "cmAlgorithms.h" #include "cmComputeLinkInformation.h" #include "cmCustomCommandGenerator.h" -#include "cmAlgorithms.h" +#include "cmGeneratorExpression.h" +#include "cmGeneratorExpressionDAGChecker.h" +#include "cmGlobalGenerator.h" +#include "cmLocalGenerator.h" +#include "cmMakefile.h" +#include "cmSourceFile.h" +#include "cmTarget.h" #include <queue> -#include <errno.h> #include "assert.h" +#include <errno.h> #if defined(CMAKE_BUILD_WITH_CMAKE) #include <cmsys/hash_set.hxx> diff --git a/Source/cmGetCMakePropertyCommand.cxx b/Source/cmGetCMakePropertyCommand.cxx index 1a91183d42..2be4dec9da 100644 --- a/Source/cmGetCMakePropertyCommand.cxx +++ b/Source/cmGetCMakePropertyCommand.cxx @@ -11,10 +11,10 @@ ============================================================================*/ #include "cmGetCMakePropertyCommand.h" +#include "cmAlgorithms.h" #include "cmGlobalGenerator.h" -#include "cmake.h" #include "cmState.h" -#include "cmAlgorithms.h" +#include "cmake.h" // cmGetCMakePropertyCommand bool cmGetCMakePropertyCommand 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/cmGetPropertyCommand.cxx b/Source/cmGetPropertyCommand.cxx index 617a8116e1..bbeae4bebf 100644 --- a/Source/cmGetPropertyCommand.cxx +++ b/Source/cmGetPropertyCommand.cxx @@ -11,12 +11,12 @@ ============================================================================*/ #include "cmGetPropertyCommand.h" -#include "cmake.h" -#include "cmState.h" -#include "cmTest.h" #include "cmGlobalGenerator.h" -#include "cmSourceFile.h" #include "cmPropertyDefinition.h" +#include "cmSourceFile.h" +#include "cmState.h" +#include "cmTest.h" +#include "cmake.h" //---------------------------------------------------------------------------- cmGetPropertyCommand::cmGetPropertyCommand() diff --git a/Source/cmGetTestPropertyCommand.cxx b/Source/cmGetTestPropertyCommand.cxx index bf34589f40..3d7a013fa8 100644 --- a/Source/cmGetTestPropertyCommand.cxx +++ b/Source/cmGetTestPropertyCommand.cxx @@ -11,8 +11,8 @@ ============================================================================*/ #include "cmGetTestPropertyCommand.h" -#include "cmake.h" #include "cmTest.h" +#include "cmake.h" // cmGetTestPropertyCommand bool cmGetTestPropertyCommand 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..f845c59751 100644 --- a/Source/cmGhsMultiTargetGenerator.cxx +++ b/Source/cmGhsMultiTargetGenerator.cxx @@ -10,12 +10,13 @@ See the License for more information. ============================================================================*/ #include "cmGhsMultiTargetGenerator.h" + +#include "cmGeneratedFileStream.h" #include "cmGlobalGhsMultiGenerator.h" #include "cmLocalGhsMultiGenerator.h" #include "cmMakefile.h" -#include "cmTarget.h" -#include "cmGeneratedFileStream.h" #include "cmSourceFile.h" +#include "cmTarget.h" #include <assert.h> #include <cmAlgorithms.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..84ade253b1 100644 --- a/Source/cmGlobalGenerator.cxx +++ b/Source/cmGlobalGenerator.cxx @@ -17,31 +17,32 @@ #endif #include "cmGlobalGenerator.h" -#include "cmLocalGenerator.h" + +#include "cmAlgorithms.h" +#include "cmCPackPropertiesGenerator.h" +#include "cmComputeTargetDepends.h" +#include "cmExportBuildFileGenerator.h" #include "cmExternalMakefileProjectGenerator.h" -#include "cmake.h" -#include "cmState.h" +#include "cmGeneratedFileStream.h" +#include "cmGeneratorExpression.h" +#include "cmGeneratorTarget.h" +#include "cmInstallGenerator.h" +#include "cmLocalGenerator.h" #include "cmMakefile.h" #include "cmQtAutoGeneratorInitializer.h" #include "cmSourceFile.h" -#include "cmVersion.h" +#include "cmState.h" #include "cmTargetExport.h" -#include "cmComputeTargetDepends.h" -#include "cmGeneratedFileStream.h" -#include "cmGeneratorTarget.h" -#include "cmGeneratorExpression.h" -#include "cmExportBuildFileGenerator.h" -#include "cmCPackPropertiesGenerator.h" -#include "cmAlgorithms.h" -#include "cmInstallGenerator.h" +#include "cmVersion.h" +#include "cmake.h" #include <cmsys/Directory.hxx> #include <cmsys/FStream.hxx> #if defined(CMAKE_BUILD_WITH_CMAKE) -# include <cmsys/MD5.h> # include "cm_jsoncpp_value.h" # include "cm_jsoncpp_writer.h" +# include <cmsys/MD5.h> #endif #include <stdlib.h> // required for atof diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h index 14c7d67827..1576f09bdd 100644 --- a/Source/cmGlobalGenerator.h +++ b/Source/cmGlobalGenerator.h @@ -15,13 +15,13 @@ #include "cmStandardIncludes.h" -#include "cmTarget.h" // For cmTargets -#include "cmTargetDepend.h" // For cmTargetDependSet -#include "cmSystemTools.h" // for cmSystemTools::OutputOption #include "cmExportSetMap.h" // For cmExportSetMap -#include "cmGeneratorTarget.h" #include "cmGeneratorExpression.h" +#include "cmGeneratorTarget.h" #include "cmState.h" +#include "cmSystemTools.h" // for cmSystemTools::OutputOption +#include "cmTarget.h" // For cmTargets +#include "cmTargetDepend.h" // For cmTargetDependSet #if defined(CMAKE_BUILD_WITH_CMAKE) # include "cmFileLockPool.h" diff --git a/Source/cmGlobalGhsMultiGenerator.cxx b/Source/cmGlobalGhsMultiGenerator.cxx index 1bcbd26adc..df7011ccda 100644 --- a/Source/cmGlobalGhsMultiGenerator.cxx +++ b/Source/cmGlobalGhsMultiGenerator.cxx @@ -10,13 +10,14 @@ See the License for more information. ============================================================================*/ #include "cmGlobalGhsMultiGenerator.h" + +#include "cmGeneratedFileStream.h" +#include "cmGhsMultiTargetGenerator.h" #include "cmLocalGhsMultiGenerator.h" #include "cmMakefile.h" #include "cmVersion.h" -#include "cmGeneratedFileStream.h" -#include "cmGhsMultiTargetGenerator.h" -#include <cmsys/SystemTools.hxx> #include <cmAlgorithms.h> +#include <cmsys/SystemTools.hxx> const char *cmGlobalGhsMultiGenerator::FILE_EXTENSION = ".gpj"; const char *cmGlobalGhsMultiGenerator::DEFAULT_MAKE_PROGRAM = "gbuild"; diff --git a/Source/cmGlobalGhsMultiGenerator.h b/Source/cmGlobalGhsMultiGenerator.h index 6f86c5d4e3..5de9d2bd72 100644 --- a/Source/cmGlobalGhsMultiGenerator.h +++ b/Source/cmGlobalGhsMultiGenerator.h @@ -12,9 +12,10 @@ #ifndef cmGhsMultiGenerator_h #define cmGhsMultiGenerator_h -#include "cmGlobalGeneratorFactory.h" #include "cmGlobalGenerator.h" + #include "cmGhsMultiGpj.h" +#include "cmGlobalGeneratorFactory.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..e2f1fc5601 100644 --- a/Source/cmGlobalKdevelopGenerator.cxx +++ b/Source/cmGlobalKdevelopGenerator.cxx @@ -11,18 +11,19 @@ See the License for more information. ============================================================================*/ #include "cmGlobalKdevelopGenerator.h" + +#include "cmGeneratedFileStream.h" #include "cmGlobalUnixMakefileGenerator3.h" #include "cmLocalUnixMakefileGenerator3.h" #include "cmMakefile.h" -#include "cmake.h" #include "cmSourceFile.h" -#include "cmGeneratedFileStream.h" #include "cmSystemTools.h" #include "cmXMLWriter.h" +#include "cmake.h" -#include <cmsys/SystemTools.hxx> #include <cmsys/Directory.hxx> #include <cmsys/FStream.hxx> +#include <cmsys/SystemTools.hxx> //---------------------------------------------------------------------------- void cmGlobalKdevelopGenerator 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..a8a7262ae3 100644 --- a/Source/cmGlobalNinjaGenerator.cxx +++ b/Source/cmGlobalNinjaGenerator.cxx @@ -10,14 +10,15 @@ implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License for more information. ============================================================================*/ +#include "cmGlobalNinjaGenerator.h" + +#include "cmAlgorithms.h" #include "cmGeneratedFileStream.h" #include "cmGeneratorExpressionEvaluationFile.h" #include "cmGeneratorTarget.h" -#include "cmGlobalNinjaGenerator.h" #include "cmLocalNinjaGenerator.h" #include "cmMakefile.h" #include "cmVersion.h" -#include "cmAlgorithms.h" #include <algorithm> #include <assert.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..0098f1e93f 100644 --- a/Source/cmGlobalUnixMakefileGenerator3.cxx +++ b/Source/cmGlobalUnixMakefileGenerator3.cxx @@ -10,13 +10,14 @@ See the License for more information. ============================================================================*/ #include "cmGlobalUnixMakefileGenerator3.h" + +#include "cmAlgorithms.h" +#include "cmGeneratedFileStream.h" +#include "cmGeneratorTarget.h" #include "cmLocalUnixMakefileGenerator3.h" -#include "cmMakefileTargetGenerator.h" #include "cmMakefile.h" +#include "cmMakefileTargetGenerator.h" #include "cmake.h" -#include "cmGeneratedFileStream.h" -#include "cmGeneratorTarget.h" -#include "cmAlgorithms.h" cmGlobalUnixMakefileGenerator3::cmGlobalUnixMakefileGenerator3(cmake* cm) : cmGlobalCommonGenerator(cm) 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..22ffbcc548 100644 --- a/Source/cmGlobalVisualStudio10Generator.cxx +++ b/Source/cmGlobalVisualStudio10Generator.cxx @@ -10,14 +10,16 @@ See the License for more information. ============================================================================*/ #include "windows.h" // this must be first to define GetCurrentDirectory + #include "cmGlobalVisualStudio10Generator.h" + +#include "cmAlgorithms.h" #include "cmLocalVisualStudio10Generator.h" #include "cmMakefile.h" #include "cmSourceFile.h" #include "cmVisualStudioSlnData.h" #include "cmVisualStudioSlnParser.h" #include "cmake.h" -#include "cmAlgorithms.h" static const char vs10generatorName[] = "Visual Studio 10 2010"; diff --git a/Source/cmGlobalVisualStudio11Generator.cxx b/Source/cmGlobalVisualStudio11Generator.cxx index 9b00357753..de6fc43c8b 100644 --- a/Source/cmGlobalVisualStudio11Generator.cxx +++ b/Source/cmGlobalVisualStudio11Generator.cxx @@ -10,9 +10,10 @@ See the License for more information. ============================================================================*/ #include "cmGlobalVisualStudio11Generator.h" + +#include "cmAlgorithms.h" #include "cmLocalVisualStudio10Generator.h" #include "cmMakefile.h" -#include "cmAlgorithms.h" static const char vs11generatorName[] = "Visual Studio 11 2012"; diff --git a/Source/cmGlobalVisualStudio12Generator.cxx b/Source/cmGlobalVisualStudio12Generator.cxx index 568d4d7ff6..bfd908fd32 100644 --- a/Source/cmGlobalVisualStudio12Generator.cxx +++ b/Source/cmGlobalVisualStudio12Generator.cxx @@ -10,9 +10,10 @@ See the License for more information. ============================================================================*/ #include "cmGlobalVisualStudio12Generator.h" + +#include "cmAlgorithms.h" #include "cmLocalVisualStudio10Generator.h" #include "cmMakefile.h" -#include "cmAlgorithms.h" static const char vs12generatorName[] = "Visual Studio 12 2013"; diff --git a/Source/cmGlobalVisualStudio14Generator.cxx b/Source/cmGlobalVisualStudio14Generator.cxx index c058f8ce42..893cc7b13d 100644 --- a/Source/cmGlobalVisualStudio14Generator.cxx +++ b/Source/cmGlobalVisualStudio14Generator.cxx @@ -10,9 +10,10 @@ See the License for more information. ============================================================================*/ #include "cmGlobalVisualStudio14Generator.h" + +#include "cmAlgorithms.h" #include "cmLocalVisualStudio10Generator.h" #include "cmMakefile.h" -#include "cmAlgorithms.h" static const char vs14generatorName[] = "Visual Studio 14 2015"; diff --git a/Source/cmGlobalVisualStudio71Generator.cxx b/Source/cmGlobalVisualStudio71Generator.cxx index dd1f2e4807..0ca4db1725 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 ba498ef2b9..058183cf87 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..47ac66da7a 100644 --- a/Source/cmGlobalVisualStudio8Generator.cxx +++ b/Source/cmGlobalVisualStudio8Generator.cxx @@ -10,13 +10,15 @@ See the License for more information. ============================================================================*/ #include "windows.h" // this must be first to define GetCurrentDirectory + #include "cmGlobalVisualStudio8Generator.h" + +#include "cmGeneratedFileStream.h" #include "cmLocalVisualStudio7Generator.h" #include "cmMakefile.h" +#include "cmSourceFile.h" #include "cmVisualStudioWCEPlatformParser.h" #include "cmake.h" -#include "cmGeneratedFileStream.h" -#include "cmSourceFile.h" static const char vs8generatorName[] = "Visual Studio 8 2005"; 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/cmGlobalVisualStudioGenerator.cxx b/Source/cmGlobalVisualStudioGenerator.cxx index 9817b09dfa..479b53c8ef 100644 --- a/Source/cmGlobalVisualStudioGenerator.cxx +++ b/Source/cmGlobalVisualStudioGenerator.cxx @@ -12,6 +12,7 @@ ============================================================================*/ #include "cmGlobalVisualStudioGenerator.h" +#include "cmAlgorithms.h" #include "cmCallVisualStudioMacro.h" #include "cmGeneratedFileStream.h" #include "cmGeneratorTarget.h" @@ -20,7 +21,6 @@ #include "cmSourceFile.h" #include "cmTarget.h" #include <cmsys/Encoding.hxx> -#include "cmAlgorithms.h" //---------------------------------------------------------------------------- cmGlobalVisualStudioGenerator::cmGlobalVisualStudioGenerator(cmake* cm) 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..19f7a74341 100644 --- a/Source/cmGlobalXCodeGenerator.cxx +++ b/Source/cmGlobalXCodeGenerator.cxx @@ -10,18 +10,19 @@ See the License for more information. ============================================================================*/ #include "cmGlobalXCodeGenerator.h" -#include "cmLocalXCodeGenerator.h" -#include "cmMakefile.h" -#include "cmXCodeObject.h" -#include "cmXCode21Object.h" -#include "cmake.h" -#include "cmGeneratedFileStream.h" + +#include "cmAlgorithms.h" #include "cmComputeLinkInformation.h" -#include "cmSourceFile.h" #include "cmCustomCommandGenerator.h" +#include "cmGeneratedFileStream.h" #include "cmGeneratorTarget.h" #include "cmGlobalGeneratorFactory.h" -#include "cmAlgorithms.h" +#include "cmLocalXCodeGenerator.h" +#include "cmMakefile.h" +#include "cmSourceFile.h" +#include "cmXCode21Object.h" +#include "cmXCodeObject.h" +#include "cmake.h" #include <cmsys/auto_ptr.hxx> diff --git a/Source/cmGlobalXCodeGenerator.h b/Source/cmGlobalXCodeGenerator.h index f7bfb26c42..c3b361337a 100644 --- a/Source/cmGlobalXCodeGenerator.h +++ b/Source/cmGlobalXCodeGenerator.h @@ -13,8 +13,9 @@ #define cmGlobalXCodeGenerator_h #include "cmGlobalGenerator.h" -#include "cmXCodeObject.h" + #include "cmCustomCommand.h" +#include "cmXCodeObject.h" class cmGlobalGeneratorFactory; class cmSourceFile; class cmSourceGroup; diff --git a/Source/cmGraphVizWriter.cxx b/Source/cmGraphVizWriter.cxx index 448306fe4f..76b6430e03 100644 --- a/Source/cmGraphVizWriter.cxx +++ b/Source/cmGraphVizWriter.cxx @@ -10,10 +10,11 @@ See the License for more information. ============================================================================*/ #include "cmGraphVizWriter.h" -#include "cmMakefile.h" -#include "cmLocalGenerator.h" -#include "cmGlobalGenerator.h" + #include "cmGeneratedFileStream.h" +#include "cmGlobalGenerator.h" +#include "cmLocalGenerator.h" +#include "cmMakefile.h" diff --git a/Source/cmGraphVizWriter.h b/Source/cmGraphVizWriter.h index 90d31d3bee..7914ca350b 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,9 +9,13 @@ 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 "cmLocalGenerator.h" #include <cmsys/RegularExpression.hxx> class cmGeneratorTarget; 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..37f03c5c63 100644 --- a/Source/cmIfCommand.cxx +++ b/Source/cmIfCommand.cxx @@ -10,14 +10,15 @@ See the License for more information. ============================================================================*/ #include "cmIfCommand.h" -#include "cmStringCommand.h" + #include "cmOutputConverter.h" +#include "cmStringCommand.h" #include "cmConditionEvaluator.h" -#include <stdlib.h> // required for atof -#include <list> #include <cmsys/RegularExpression.hxx> +#include <list> +#include <stdlib.h> // required for atof static std::string cmIfCommandError( 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/cmInstallCommand.cxx b/Source/cmInstallCommand.cxx index f70f2521a8..d287568bda 100644 --- a/Source/cmInstallCommand.cxx +++ b/Source/cmInstallCommand.cxx @@ -11,14 +11,14 @@ ============================================================================*/ #include "cmInstallCommand.h" +#include "cmExportSet.h" +#include "cmInstallCommandArguments.h" #include "cmInstallDirectoryGenerator.h" +#include "cmInstallExportGenerator.h" #include "cmInstallFilesGenerator.h" #include "cmInstallScriptGenerator.h" #include "cmInstallTargetGenerator.h" -#include "cmInstallExportGenerator.h" -#include "cmInstallCommandArguments.h" #include "cmTargetExport.h" -#include "cmExportSet.h" #include <cmsys/Glob.hxx> 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/cmInstallExportGenerator.cxx b/Source/cmInstallExportGenerator.cxx index 80fc054601..a31c0c979d 100644 --- a/Source/cmInstallExportGenerator.cxx +++ b/Source/cmInstallExportGenerator.cxx @@ -13,12 +13,12 @@ #include <stdio.h> -#include "cmake.h" -#include "cmInstallTargetGenerator.h" #include "cmGeneratedFileStream.h" -#include "cmMakefile.h" -#include "cmLocalGenerator.h" #include "cmGlobalGenerator.h" +#include "cmInstallTargetGenerator.h" +#include "cmLocalGenerator.h" +#include "cmMakefile.h" +#include "cmake.h" #include "cmInstallFilesGenerator.h" diff --git a/Source/cmInstallFilesGenerator.cxx b/Source/cmInstallFilesGenerator.cxx index 3dd5528af1..97035628e6 100644 --- a/Source/cmInstallFilesGenerator.cxx +++ b/Source/cmInstallFilesGenerator.cxx @@ -12,9 +12,9 @@ #include "cmInstallFilesGenerator.h" #include "cmGeneratorExpression.h" +#include "cmLocalGenerator.h" #include "cmMakefile.h" #include "cmSystemTools.h" -#include "cmLocalGenerator.h" //---------------------------------------------------------------------------- cmInstallFilesGenerator 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/cmInstallTargetGenerator.cxx b/Source/cmInstallTargetGenerator.cxx index 6a944bfe28..0010333294 100644 --- a/Source/cmInstallTargetGenerator.cxx +++ b/Source/cmInstallTargetGenerator.cxx @@ -13,12 +13,12 @@ #include "cmComputeLinkInformation.h" #include "cmGeneratorExpression.h" +#include "cmGeneratorTarget.h" +#include "cmGeneratorTarget.h" #include "cmGlobalGenerator.h" #include "cmLocalGenerator.h" #include "cmMakefile.h" -#include "cmGeneratorTarget.h" #include "cmake.h" -#include "cmGeneratorTarget.h" #include <assert.h> diff --git a/Source/cmInstalledFile.cxx b/Source/cmInstalledFile.cxx index fa5e81528e..c5ac9eb845 100644 --- a/Source/cmInstalledFile.cxx +++ b/Source/cmInstalledFile.cxx @@ -10,9 +10,10 @@ See the License for more information. ============================================================================*/ #include "cmInstalledFile.h" -#include "cmSystemTools.h" -#include "cmMakefile.h" + #include "cmAlgorithms.h" +#include "cmMakefile.h" +#include "cmSystemTools.h" //---------------------------------------------------------------------------- cmInstalledFile::cmInstalledFile(): diff --git a/Source/cmListCommand.cxx b/Source/cmListCommand.cxx index 15a1af560d..05be9e5476 100644 --- a/Source/cmListCommand.cxx +++ b/Source/cmListCommand.cxx @@ -10,14 +10,15 @@ See the License for more information. ============================================================================*/ #include "cmListCommand.h" + +#include "cmAlgorithms.h" #include <cmsys/RegularExpression.hxx> #include <cmsys/SystemTools.hxx> -#include "cmAlgorithms.h" #include <algorithm> -#include <stdlib.h> // required for atoi -#include <ctype.h> #include <assert.h> +#include <ctype.h> +#include <stdlib.h> // required for atoi //---------------------------------------------------------------------------- bool cmListCommand ::InitialPass(std::vector<std::string> const& args, cmExecutionStatus &) diff --git a/Source/cmListFileCache.cxx b/Source/cmListFileCache.cxx index 1cc66f47a9..5a161045db 100644 --- a/Source/cmListFileCache.cxx +++ b/Source/cmListFileCache.cxx @@ -12,9 +12,9 @@ #include "cmListFileCache.h" #include "cmListFileLexer.h" +#include "cmMakefile.h" #include "cmOutputConverter.h" #include "cmSystemTools.h" -#include "cmMakefile.h" #include "cmVersion.h" #include <cmsys/RegularExpression.hxx> diff --git a/Source/cmLoadCacheCommand.cxx b/Source/cmLoadCacheCommand.cxx index 6ade535422..63fc00ce81 100644 --- a/Source/cmLoadCacheCommand.cxx +++ b/Source/cmLoadCacheCommand.cxx @@ -11,8 +11,8 @@ ============================================================================*/ #include "cmLoadCacheCommand.h" -#include <cmsys/RegularExpression.hxx> #include <cmsys/FStream.hxx> +#include <cmsys/RegularExpression.hxx> // cmLoadCacheCommand bool cmLoadCacheCommand diff --git a/Source/cmLoadCommandCommand.cxx b/Source/cmLoadCommandCommand.cxx index 403f7fcc84..14b70e413b 100644 --- a/Source/cmLoadCommandCommand.cxx +++ b/Source/cmLoadCommandCommand.cxx @@ -10,8 +10,9 @@ See the License for more information. ============================================================================*/ #include "cmLoadCommandCommand.h" -#include "cmCPluginAPI.h" + #include "cmCPluginAPI.cxx" +#include "cmCPluginAPI.h" #include "cmDynamicLoader.h" #include <cmsys/DynamicLoader.hxx> diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx index b93fc21e59..6c2ba05231 100644 --- a/Source/cmLocalGenerator.cxx +++ b/Source/cmLocalGenerator.cxx @@ -11,22 +11,22 @@ ============================================================================*/ #include "cmLocalGenerator.h" +#include "cmAlgorithms.h" #include "cmComputeLinkInformation.h" +#include "cmCustomCommandGenerator.h" #include "cmGeneratedFileStream.h" +#include "cmGeneratorExpressionEvaluationFile.h" #include "cmGlobalGenerator.h" -#include "cmInstallGenerator.h" #include "cmInstallFilesGenerator.h" -#include "cmGeneratorExpressionEvaluationFile.h" +#include "cmInstallGenerator.h" #include "cmInstallScriptGenerator.h" #include "cmInstallTargetGenerator.h" #include "cmMakefile.h" #include "cmSourceFile.h" #include "cmTest.h" #include "cmTestGenerator.h" -#include "cmCustomCommandGenerator.h" #include "cmVersion.h" #include "cmake.h" -#include "cmAlgorithms.h" #if defined(CMAKE_BUILD_WITH_CMAKE) # define CM_LG_ENCODE_OBJECT_NAMES diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h index b673a85cc0..0bad0d6934 100644 --- a/Source/cmLocalGenerator.h +++ b/Source/cmLocalGenerator.h @@ -13,9 +13,10 @@ #define cmLocalGenerator_h #include "cmStandardIncludes.h" + +#include "cmOutputConverter.h" #include "cmState.h" #include "cmake.h" -#include "cmOutputConverter.h" class cmMakefile; class cmGlobalGenerator; diff --git a/Source/cmLocalGhsMultiGenerator.cxx b/Source/cmLocalGhsMultiGenerator.cxx index a77a75e022..f23f27d64e 100644 --- a/Source/cmLocalGhsMultiGenerator.cxx +++ b/Source/cmLocalGhsMultiGenerator.cxx @@ -10,11 +10,12 @@ See the License for more information. ============================================================================*/ #include "cmLocalGhsMultiGenerator.h" -#include "cmGlobalGhsMultiGenerator.h" + +#include "cmGeneratedFileStream.h" #include "cmGeneratorTarget.h" -#include "cmMakefile.h" #include "cmGhsMultiTargetGenerator.h" -#include "cmGeneratedFileStream.h" +#include "cmGlobalGhsMultiGenerator.h" +#include "cmMakefile.h" cmLocalGhsMultiGenerator::cmLocalGhsMultiGenerator(cmGlobalGenerator* gg, cmMakefile* mf) diff --git a/Source/cmLocalNinjaGenerator.cxx b/Source/cmLocalNinjaGenerator.cxx index 030b094e1a..c26065c228 100644 --- a/Source/cmLocalNinjaGenerator.cxx +++ b/Source/cmLocalNinjaGenerator.cxx @@ -11,14 +11,15 @@ See the License for more information. ============================================================================*/ #include "cmLocalNinjaGenerator.h" + #include "cmCustomCommandGenerator.h" -#include "cmMakefile.h" +#include "cmGeneratedFileStream.h" #include "cmGlobalNinjaGenerator.h" +#include "cmMakefile.h" #include "cmNinjaTargetGenerator.h" -#include "cmGeneratedFileStream.h" #include "cmSourceFile.h" -#include "cmake.h" #include "cmState.h" +#include "cmake.h" #include <assert.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/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx index afdff337ee..2a0e07d31b 100644 --- a/Source/cmLocalUnixMakefileGenerator3.cxx +++ b/Source/cmLocalUnixMakefileGenerator3.cxx @@ -11,16 +11,16 @@ ============================================================================*/ #include "cmLocalUnixMakefileGenerator3.h" +#include "cmAlgorithms.h" +#include "cmCustomCommandGenerator.h" +#include "cmFileTimeComparison.h" #include "cmGeneratedFileStream.h" #include "cmGlobalUnixMakefileGenerator3.h" #include "cmMakefile.h" #include "cmMakefileTargetGenerator.h" #include "cmSourceFile.h" -#include "cmake.h" #include "cmVersion.h" -#include "cmFileTimeComparison.h" -#include "cmCustomCommandGenerator.h" -#include "cmAlgorithms.h" +#include "cmake.h" // Include dependency scanners for supported languages. Only the // C/C++ scanner is needed for bootstrapping CMake. @@ -30,11 +30,11 @@ # include "cmDependsJava.h" #endif -#include <cmsys/auto_ptr.hxx> #include <cmsys/Terminal.h> +#include <cmsys/auto_ptr.hxx> -#include <queue> #include <algorithm> +#include <queue> //---------------------------------------------------------------------------- // Escape special characters in Makefile dependency lines diff --git a/Source/cmLocalVisualStudio10Generator.cxx b/Source/cmLocalVisualStudio10Generator.cxx index d0784add2e..314fa0fc0c 100644 --- a/Source/cmLocalVisualStudio10Generator.cxx +++ b/Source/cmLocalVisualStudio10Generator.cxx @@ -10,11 +10,13 @@ See the License for more information. ============================================================================*/ #include "cmLocalVisualStudio10Generator.h" + +#include "cmGlobalVisualStudio10Generator.h" #include "cmMakefile.h" #include "cmVisualStudio10TargetGenerator.h" -#include "cmGlobalVisualStudio10Generator.h" -#include <cm_expat.h> #include "cmXMLParser.h" +#include <cm_expat.h> + class cmVS10XMLParser : public cmXMLParser { public: diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx index 2f66517ead..38b7ac339a 100644 --- a/Source/cmLocalVisualStudio7Generator.cxx +++ b/Source/cmLocalVisualStudio7Generator.cxx @@ -9,16 +9,17 @@ implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License for more information. ============================================================================*/ -#include "cmGlobalVisualStudio7Generator.h" #include "cmLocalVisualStudio7Generator.h" -#include "cmXMLParser.h" -#include <cm_expat.h> + +#include "cmCustomCommandGenerator.h" +#include "cmGeneratorTarget.h" +#include "cmGlobalVisualStudio7Generator.h" #include "cmMakefile.h" -#include "cmSystemTools.h" #include "cmSourceFile.h" -#include "cmGeneratorTarget.h" -#include "cmCustomCommandGenerator.h" +#include "cmSystemTools.h" +#include "cmXMLParser.h" #include "cmake.h" +#include <cm_expat.h> #include "cmComputeLinkInformation.h" #include "cmGeneratedFileStream.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..23e2bfd179 100644 --- a/Source/cmLocalVisualStudioGenerator.cxx +++ b/Source/cmLocalVisualStudioGenerator.cxx @@ -10,11 +10,12 @@ See the License for more information. ============================================================================*/ #include "cmLocalVisualStudioGenerator.h" + +#include "cmCustomCommandGenerator.h" #include "cmGlobalGenerator.h" #include "cmMakefile.h" #include "cmSourceFile.h" #include "cmSystemTools.h" -#include "cmCustomCommandGenerator.h" #include "windows.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..d563fe78fa 100644 --- a/Source/cmLocalXCodeGenerator.cxx +++ b/Source/cmLocalXCodeGenerator.cxx @@ -10,9 +10,10 @@ See the License for more information. ============================================================================*/ #include "cmLocalXCodeGenerator.h" + #include "cmGlobalXCodeGenerator.h" -#include "cmSourceFile.h" #include "cmMakefile.h" +#include "cmSourceFile.h" //---------------------------------------------------------------------------- cmLocalXCodeGenerator::cmLocalXCodeGenerator(cmGlobalGenerator* gg, 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..bb4d4a1cc6 100644 --- a/Source/cmMachO.cxx +++ b/Source/cmMachO.cxx @@ -10,13 +10,14 @@ See the License for more information. ============================================================================*/ #include "cmStandardIncludes.h" // to get CMAKE_USE_MACH_PARSER first + #include "cmMachO.h" #include <cmsys/FStream.hxx> // Include the Mach-O format information system header. -#include <mach-o/loader.h> #include <mach-o/fat.h> +#include <mach-o/loader.h> /** diff --git a/Source/cmMacroCommand.cxx b/Source/cmMacroCommand.cxx index 71de7a7230..36831fe110 100644 --- a/Source/cmMacroCommand.cxx +++ b/Source/cmMacroCommand.cxx @@ -11,8 +11,8 @@ ============================================================================*/ #include "cmMacroCommand.h" -#include "cmake.h" #include "cmAlgorithms.h" +#include "cmake.h" // define the class for macro commands class cmMacroHelperCommand : public cmCommand 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..3bc118148b 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -10,37 +10,38 @@ See the License for more information. ============================================================================*/ #include "cmMakefile.h" -#include "cmVersion.h" + #include "cmCommand.h" -#include "cmSourceFile.h" -#include "cmSourceFileLocation.h" -#include "cmSystemTools.h" -#include "cmGlobalGenerator.h" +#include "cmCommandArgumentParserHelper.h" #include "cmCommands.h" -#include "cmState.h" -#include "cmOutputConverter.h" #include "cmFunctionBlocker.h" +#include "cmGeneratorExpression.h" #include "cmGeneratorExpressionEvaluationFile.h" +#include "cmGlobalGenerator.h" #include "cmListFileCache.h" -#include "cmCommandArgumentParserHelper.h" -#include "cmGeneratorExpression.h" +#include "cmOutputConverter.h" +#include "cmSourceFile.h" +#include "cmSourceFileLocation.h" +#include "cmState.h" +#include "cmSystemTools.h" #include "cmTest.h" +#include "cmVersion.h" #ifdef CMAKE_BUILD_WITH_CMAKE # include "cmVariableWatch.h" #endif +#include "cmAlgorithms.h" #include "cmInstallGenerator.h" #include "cmTestGenerator.h" -#include "cmAlgorithms.h" #include "cmake.h" #include <stdlib.h> // required for atoi -#include <cmsys/RegularExpression.hxx> #include <cmsys/FStream.hxx> +#include <cmsys/RegularExpression.hxx> #include <cmsys/auto_ptr.hxx> -#include <list> -#include <ctype.h> // for isspace #include <assert.h> +#include <ctype.h> // for isspace +#include <list> // default is not to be building executables cmMakefile::cmMakefile(cmGlobalGenerator* globalGenerator, diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h index 089a83d128..fa5e9b4889 100644 --- a/Source/cmMakefile.h +++ b/Source/cmMakefile.h @@ -12,22 +12,24 @@ #ifndef cmMakefile_h #define cmMakefile_h +#include "cmStandardIncludes.h" + +#include "cmAlgorithms.h" #include "cmExecutionStatus.h" +#include "cmExpandedCommandArgument.h" #include "cmListFileCache.h" +#include "cmNewLineStyle.h" +#include "cmState.h" #include "cmSystemTools.h" #include "cmTarget.h" -#include "cmNewLineStyle.h" -#include "cmExpandedCommandArgument.h" #include "cmake.h" -#include "cmState.h" -#include "cmAlgorithms.h" #if defined(CMAKE_BUILD_WITH_CMAKE) #include "cmSourceGroup.h" #endif -#include <cmsys/auto_ptr.hxx> #include <cmsys/RegularExpression.hxx> +#include <cmsys/auto_ptr.hxx> #if defined(CMAKE_BUILD_WITH_CMAKE) # ifdef CMake_HAVE_CXX11_UNORDERED_MAP # include <unordered_map> diff --git a/Source/cmMakefileLibraryTargetGenerator.cxx b/Source/cmMakefileLibraryTargetGenerator.cxx index 435844e314..9ded69f3e0 100644 --- a/Source/cmMakefileLibraryTargetGenerator.cxx +++ b/Source/cmMakefileLibraryTargetGenerator.cxx @@ -11,13 +11,13 @@ ============================================================================*/ #include "cmMakefileLibraryTargetGenerator.h" +#include "cmAlgorithms.h" #include "cmGeneratedFileStream.h" #include "cmGlobalUnixMakefileGenerator3.h" #include "cmLocalUnixMakefileGenerator3.h" #include "cmMakefile.h" #include "cmSourceFile.h" #include "cmake.h" -#include "cmAlgorithms.h" //---------------------------------------------------------------------------- cmMakefileLibraryTargetGenerator diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx index 29708d95b9..e14f828e21 100644 --- a/Source/cmMakefileTargetGenerator.cxx +++ b/Source/cmMakefileTargetGenerator.cxx @@ -11,19 +11,19 @@ ============================================================================*/ #include "cmMakefileTargetGenerator.h" -#include "cmGeneratorTarget.h" +#include "cmAlgorithms.h" +#include "cmComputeLinkInformation.h" +#include "cmCustomCommandGenerator.h" #include "cmGeneratedFileStream.h" +#include "cmGeneratorExpression.h" +#include "cmGeneratorTarget.h" #include "cmGlobalGenerator.h" #include "cmGlobalUnixMakefileGenerator3.h" #include "cmLocalUnixMakefileGenerator3.h" #include "cmMakefile.h" #include "cmSourceFile.h" -#include "cmake.h" #include "cmState.h" -#include "cmComputeLinkInformation.h" -#include "cmCustomCommandGenerator.h" -#include "cmGeneratorExpression.h" -#include "cmAlgorithms.h" +#include "cmake.h" #include "cmMakefileExecutableTargetGenerator.h" #include "cmMakefileLibraryTargetGenerator.h" diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx index 322f37d2f1..0429421d43 100644 --- a/Source/cmNinjaNormalTargetGenerator.cxx +++ b/Source/cmNinjaNormalTargetGenerator.cxx @@ -11,18 +11,19 @@ See the License for more information. ============================================================================*/ #include "cmNinjaNormalTargetGenerator.h" -#include "cmLocalNinjaGenerator.h" -#include "cmGlobalNinjaGenerator.h" -#include "cmSourceFile.h" + +#include "cmAlgorithms.h" +#include "cmCustomCommandGenerator.h" #include "cmGeneratedFileStream.h" +#include "cmGeneratorTarget.h" +#include "cmGlobalNinjaGenerator.h" +#include "cmLocalNinjaGenerator.h" #include "cmMakefile.h" #include "cmOSXBundleGenerator.h" -#include "cmGeneratorTarget.h" -#include "cmCustomCommandGenerator.h" -#include "cmAlgorithms.h" +#include "cmSourceFile.h" -#include <assert.h> #include <algorithm> +#include <assert.h> #include <limits> #ifndef _WIN32 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..8830b8f3a6 100644 --- a/Source/cmNinjaTargetGenerator.cxx +++ b/Source/cmNinjaTargetGenerator.cxx @@ -11,18 +11,19 @@ See the License for more information. ============================================================================*/ #include "cmNinjaTargetGenerator.h" -#include "cmGlobalNinjaGenerator.h" -#include "cmLocalNinjaGenerator.h" + +#include "cmAlgorithms.h" +#include "cmComputeLinkInformation.h" +#include "cmCustomCommandGenerator.h" #include "cmGeneratedFileStream.h" #include "cmGeneratorTarget.h" +#include "cmGlobalNinjaGenerator.h" +#include "cmLocalNinjaGenerator.h" +#include "cmMakefile.h" #include "cmNinjaNormalTargetGenerator.h" #include "cmNinjaUtilityTargetGenerator.h" -#include "cmSystemTools.h" -#include "cmMakefile.h" -#include "cmComputeLinkInformation.h" #include "cmSourceFile.h" -#include "cmCustomCommandGenerator.h" -#include "cmAlgorithms.h" +#include "cmSystemTools.h" #include <algorithm> diff --git a/Source/cmNinjaTargetGenerator.h b/Source/cmNinjaTargetGenerator.h index 371bc3cc68..8225a60f4c 100644 --- a/Source/cmNinjaTargetGenerator.h +++ b/Source/cmNinjaTargetGenerator.h @@ -15,10 +15,9 @@ #include "cmCommonTargetGenerator.h" -#include "cmStandardIncludes.h" -#include "cmNinjaTypes.h" #include "cmGlobalNinjaGenerator.h" #include "cmLocalNinjaGenerator.h" +#include "cmNinjaTypes.h" #include "cmOSXBundleGenerator.h" class cmTarget; 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..735730e346 100644 --- a/Source/cmNinjaUtilityTargetGenerator.cxx +++ b/Source/cmNinjaUtilityTargetGenerator.cxx @@ -11,12 +11,13 @@ See the License for more information. ============================================================================*/ #include "cmNinjaUtilityTargetGenerator.h" + #include "cmCustomCommand.h" +#include "cmCustomCommandGenerator.h" #include "cmGeneratedFileStream.h" #include "cmGlobalNinjaGenerator.h" #include "cmMakefile.h" #include "cmSourceFile.h" -#include "cmCustomCommandGenerator.h" cmNinjaUtilityTargetGenerator::cmNinjaUtilityTargetGenerator( cmGeneratorTarget *target) 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..9850728006 100644 --- a/Source/cmOSXBundleGenerator.cxx +++ b/Source/cmOSXBundleGenerator.cxx @@ -10,9 +10,10 @@ See the License for more information. ============================================================================*/ #include "cmOSXBundleGenerator.h" + +#include "cmLocalGenerator.h" #include "cmMakefile.h" #include "cmTarget.h" -#include "cmLocalGenerator.h" #include <cassert> diff --git a/Source/cmOSXBundleGenerator.h b/Source/cmOSXBundleGenerator.h index f945c15a8c..3952e9509c 100644 --- a/Source/cmOSXBundleGenerator.h +++ b/Source/cmOSXBundleGenerator.h @@ -13,10 +13,11 @@ #define cmOSXBundleGenerator_h #include "cmStandardIncludes.h" + #include "cmSourceFile.h" -#include <string> #include <set> +#include <string> class cmTarget; class cmMakefile; diff --git a/Source/cmOrderDirectories.cxx b/Source/cmOrderDirectories.cxx index 61efd01e4b..2e884e4ff0 100644 --- a/Source/cmOrderDirectories.cxx +++ b/Source/cmOrderDirectories.cxx @@ -11,10 +11,10 @@ ============================================================================*/ #include "cmOrderDirectories.h" +#include "cmAlgorithms.h" #include "cmGlobalGenerator.h" #include "cmSystemTools.h" #include "cmake.h" -#include "cmAlgorithms.h" #include <assert.h> diff --git a/Source/cmOutputConverter.cxx b/Source/cmOutputConverter.cxx index 59fb2e9e15..3c5d2f4ec2 100644 --- a/Source/cmOutputConverter.cxx +++ b/Source/cmOutputConverter.cxx @@ -16,8 +16,8 @@ #include <assert.h> -#include <string.h> /* strlen */ #include <ctype.h> /* isalpha */ +#include <string.h> /* strlen */ cmOutputConverter::cmOutputConverter(cmState::Snapshot snapshot) : StateSnapshot(snapshot), LinkScriptShell(false) 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..0432da5cd6 100644 --- a/Source/cmPolicies.cxx +++ b/Source/cmPolicies.cxx @@ -1,14 +1,15 @@ #include "cmPolicies.h" -#include "cmake.h" + +#include "cmAlgorithms.h" #include "cmMakefile.h" #include "cmVersion.h" #include "cmVersionMacros.h" -#include "cmAlgorithms.h" +#include "cmake.h" +#include <assert.h> #include <ctype.h> #include <map> -#include <set> #include <queue> -#include <assert.h> +#include <set> static bool stringToId(const char* input, cmPolicies::PolicyID& pid) { 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..cba2b5a216 100644 --- a/Source/cmPropertyDefinitionMap.cxx +++ b/Source/cmPropertyDefinitionMap.cxx @@ -10,8 +10,9 @@ See the License for more information. ============================================================================*/ #include "cmPropertyDefinitionMap.h" -#include "cmSystemTools.h" + #include "cmDocumentationSection.h" +#include "cmSystemTools.h" void cmPropertyDefinitionMap ::DefineProperty(const std::string& name, cmProperty::ScopeType scope, diff --git a/Source/cmPropertyMap.cxx b/Source/cmPropertyMap.cxx index ef09dbcf08..2b2502329d 100644 --- a/Source/cmPropertyMap.cxx +++ b/Source/cmPropertyMap.cxx @@ -10,9 +10,10 @@ See the License for more information. ============================================================================*/ #include "cmPropertyMap.h" + +#include "cmState.h" #include "cmSystemTools.h" #include "cmake.h" -#include "cmState.h" #include <assert.h> diff --git a/Source/cmQtAutoGeneratorInitializer.h b/Source/cmQtAutoGeneratorInitializer.h index eaf140d26b..b411597f7f 100644 --- a/Source/cmQtAutoGeneratorInitializer.h +++ b/Source/cmQtAutoGeneratorInitializer.h @@ -16,9 +16,9 @@ #include "cmStandardIncludes.h" +#include <map> #include <string> #include <vector> -#include <map> class cmSourceFile; class cmGeneratorTarget; diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx index 07fc239cf2..a55a3f3710 100644 --- a/Source/cmQtAutoGenerators.cxx +++ b/Source/cmQtAutoGenerators.cxx @@ -11,26 +11,26 @@ See the License for more information. ============================================================================*/ +#include "cmQtAutoGenerators.h" + +#include "cmAlgorithms.h" #include "cmGlobalGenerator.h" -#include "cmOutputConverter.h" #include "cmMakefile.h" -#include "cmSystemTools.h" +#include "cmOutputConverter.h" #include "cmState.h" -#include "cmAlgorithms.h" +#include "cmSystemTools.h" #include <sys/stat.h> -#include <cmsys/Terminal.h> -#include <cmsys/FStream.hxx> #include <assert.h> +#include <cmsys/FStream.hxx> +#include <cmsys/Terminal.h> #include <string.h> #if defined(__APPLE__) #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..315e9155d3 100644 --- a/Source/cmQtAutoGenerators.h +++ b/Source/cmQtAutoGenerators.h @@ -14,10 +14,12 @@ #ifndef cmQtAutoGenerators_h #define cmQtAutoGenerators_h +#include "cmStandardIncludes.h" + #include <list> -#include <vector> -#include <string> #include <map> +#include <string> +#include <vector> class cmMakefile; diff --git a/Source/cmRST.cxx b/Source/cmRST.cxx index cb61ed9958..67667ea0b8 100644 --- a/Source/cmRST.cxx +++ b/Source/cmRST.cxx @@ -11,8 +11,8 @@ ============================================================================*/ #include "cmRST.h" -#include "cmSystemTools.h" #include "cmAlgorithms.h" +#include "cmSystemTools.h" #include "cmVersion.h" #include <cmsys/FStream.hxx> #include <ctype.h> diff --git a/Source/cmSearchPath.cxx b/Source/cmSearchPath.cxx index c9cc81737a..70855b32a3 100644 --- a/Source/cmSearchPath.cxx +++ b/Source/cmSearchPath.cxx @@ -9,10 +9,10 @@ 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" +#include "cmFindCommon.h" //---------------------------------------------------------------------------- cmSearchPath::cmSearchPath(cmFindCommon* findCmd) diff --git a/Source/cmSetPropertyCommand.cxx b/Source/cmSetPropertyCommand.cxx index 17ad475bf1..fb13a19e27 100644 --- a/Source/cmSetPropertyCommand.cxx +++ b/Source/cmSetPropertyCommand.cxx @@ -10,9 +10,10 @@ See the License for more information. ============================================================================*/ #include "cmSetPropertyCommand.h" + +#include "cmSetSourceFilesPropertiesCommand.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/cmSetTestsPropertiesCommand.cxx b/Source/cmSetTestsPropertiesCommand.cxx index 53dc5a8a67..70c34c4411 100644 --- a/Source/cmSetTestsPropertiesCommand.cxx +++ b/Source/cmSetTestsPropertiesCommand.cxx @@ -11,8 +11,8 @@ ============================================================================*/ #include "cmSetTestsPropertiesCommand.h" -#include "cmake.h" #include "cmTest.h" +#include "cmake.h" // cmSetTestsPropertiesCommand bool cmSetTestsPropertiesCommand 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/cmSourceFileLocation.cxx b/Source/cmSourceFileLocation.cxx index 00d5d6afe2..988ddebb86 100644 --- a/Source/cmSourceFileLocation.cxx +++ b/Source/cmSourceFileLocation.cxx @@ -11,10 +11,10 @@ ============================================================================*/ #include "cmSourceFileLocation.h" -#include "cmMakefile.h" +#include "cmAlgorithms.h" #include "cmGlobalGenerator.h" +#include "cmMakefile.h" #include "cmSystemTools.h" -#include "cmAlgorithms.h" #include "assert.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..f80586e1ad 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 @@ -34,23 +35,23 @@ #include <cm_kwiml.h> #include <fstream> -#include <iostream> #include <iomanip> +#include <iostream> #include <sstream> // we must have stl with the standard include style -#include <vector> -#include <string> -#include <iterator> #include <algorithm> #include <functional> +#include <iterator> #include <map> #include <set> +#include <string> +#include <vector> // include the "c" string header -#include <string.h> #include <stdio.h> #include <stdlib.h> +#include <string.h> #if defined( _MSC_VER ) typedef unsigned short mode_t; diff --git a/Source/cmState.cxx b/Source/cmState.cxx index f5d63784ff..a400def0f0 100644 --- a/Source/cmState.cxx +++ b/Source/cmState.cxx @@ -11,12 +11,12 @@ ============================================================================*/ #include "cmState.h" -#include "cmake.h" -#include "cmVersion.h" +#include "cmAlgorithms.h" #include "cmCacheManager.h" #include "cmCommand.h" -#include "cmAlgorithms.h" #include "cmDefinitions.h" +#include "cmVersion.h" +#include "cmake.h" #include <assert.h> diff --git a/Source/cmState.h b/Source/cmState.h index 7ead7e02e3..705c1a8185 100644 --- a/Source/cmState.h +++ b/Source/cmState.h @@ -13,11 +13,12 @@ #define cmState_h #include "cmStandardIncludes.h" -#include "cmPropertyDefinitionMap.h" -#include "cmPropertyMap.h" -#include "cmLinkedTree.h" + #include "cmAlgorithms.h" +#include "cmLinkedTree.h" #include "cmPolicies.h" +#include "cmPropertyDefinitionMap.h" +#include "cmPropertyMap.h" class cmake; class cmCommand; diff --git a/Source/cmStringCommand.cxx b/Source/cmStringCommand.cxx index 3c027a0f4d..e10e1aebb0 100644 --- a/Source/cmStringCommand.cxx +++ b/Source/cmStringCommand.cxx @@ -10,13 +10,14 @@ See the License for more information. ============================================================================*/ #include "cmStringCommand.h" + #include "cmCryptoHash.h" #include <cmsys/RegularExpression.hxx> #include <cmsys/SystemTools.hxx> -#include <stdlib.h> // required for atoi #include <ctype.h> +#include <stdlib.h> // required for atoi #include <time.h> #include <cmTimestamp.h> diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx index 9af54bffca..3177a84f9c 100644 --- a/Source/cmSystemTools.cxx +++ b/Source/cmSystemTools.cxx @@ -9,23 +9,23 @@ implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License for more information. ============================================================================*/ - #include "cmSystemTools.h" + #include "cmAlgorithms.h" +#include <assert.h> #include <ctype.h> #include <errno.h> -#include <time.h> -#include <string.h> #include <stdlib.h> -#include <assert.h> +#include <string.h> +#include <time.h> #ifdef __QNX__ # include <malloc.h> /* for malloc/free on QNX */ #endif +#include <cmsys/Directory.hxx> +#include <cmsys/Encoding.hxx> #include <cmsys/Glob.hxx> #include <cmsys/RegularExpression.hxx> -#include <cmsys/Directory.hxx> #include <cmsys/System.h> -#include <cmsys/Encoding.hxx> #if defined(CMAKE_BUILD_WITH_CMAKE) # include "cmArchiveWrite.h" # include "cmLocale.h" @@ -39,13 +39,14 @@ #if defined(_WIN32) # include <windows.h> + // include wincrypt.h after windows.h # include <wincrypt.h> #else -# include <sys/time.h> # include <sys/types.h> +# include <sys/time.h> +# include <sys/wait.h> # include <unistd.h> # include <utime.h> -# include <sys/wait.h> #endif #if defined(__APPLE__) diff --git a/Source/cmSystemTools.h b/Source/cmSystemTools.h index d444675396..d311750a56 100644 --- a/Source/cmSystemTools.h +++ b/Source/cmSystemTools.h @@ -14,8 +14,8 @@ #include "cmStandardIncludes.h" -#include <cmsys/SystemTools.hxx> #include <cmsys/Process.h> +#include <cmsys/SystemTools.hxx> class cmSystemToolsFileTime; diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx index e118356835..fe14af6096 100644 --- a/Source/cmTarget.cxx +++ b/Source/cmTarget.cxx @@ -10,22 +10,23 @@ See the License for more information. ============================================================================*/ #include "cmTarget.h" -#include "cmake.h" -#include "cmMakefile.h" -#include "cmSourceFile.h" -#include "cmOutputConverter.h" -#include "cmGlobalGenerator.h" + +#include "cmAlgorithms.h" #include "cmComputeLinkInformation.h" -#include "cmListFileCache.h" #include "cmGeneratorExpression.h" #include "cmGeneratorExpressionDAGChecker.h" -#include "cmAlgorithms.h" +#include "cmGlobalGenerator.h" +#include "cmListFileCache.h" +#include "cmMakefile.h" +#include "cmOutputConverter.h" +#include "cmSourceFile.h" +#include "cmake.h" +#include <assert.h> #include <cmsys/RegularExpression.hxx> +#include <errno.h> #include <map> #include <set> #include <stdlib.h> // required for atof -#include <assert.h> -#include <errno.h> #if defined(CMAKE_BUILD_WITH_CMAKE) #include <cmsys/hash_set.hxx> #define UNORDERED_SET cmsys::hash_set diff --git a/Source/cmTarget.h b/Source/cmTarget.h index 4e97c2c0eb..262cc9b64a 100644 --- a/Source/cmTarget.h +++ b/Source/cmTarget.h @@ -12,10 +12,12 @@ #ifndef cmTarget_h #define cmTarget_h +#include "cmStandardIncludes.h" + #include "cmCustomCommand.h" -#include "cmPropertyMap.h" -#include "cmPolicies.h" #include "cmListFileCache.h" +#include "cmPolicies.h" +#include "cmPropertyMap.h" #include <cmsys/auto_ptr.hxx> #if defined(CMAKE_BUILD_WITH_CMAKE) diff --git a/Source/cmTest.cxx b/Source/cmTest.cxx index 6fcd0dc95b..7182122d65 100644 --- a/Source/cmTest.cxx +++ b/Source/cmTest.cxx @@ -10,10 +10,11 @@ See the License for more information. ============================================================================*/ #include "cmTest.h" + #include "cmSystemTools.h" -#include "cmake.h" #include "cmMakefile.h" +#include "cmake.h" //---------------------------------------------------------------------------- cmTest::cmTest(cmMakefile* mf) diff --git a/Source/cmTest.h b/Source/cmTest.h index ca88afecd2..46013af04f 100644 --- a/Source/cmTest.h +++ b/Source/cmTest.h @@ -12,9 +12,11 @@ #ifndef cmTest_h #define cmTest_h +#include "cmStandardIncludes.h" + #include "cmCustomCommand.h" -#include "cmPropertyMap.h" #include "cmListFileCache.h" +#include "cmPropertyMap.h" class cmMakefile; /** \class cmTest diff --git a/Source/cmTestGenerator.cxx b/Source/cmTestGenerator.cxx index b411f15e46..5790fa696e 100644 --- a/Source/cmTestGenerator.cxx +++ b/Source/cmTestGenerator.cxx @@ -12,8 +12,8 @@ #include "cmTestGenerator.h" #include "cmGeneratorExpression.h" -#include "cmOutputConverter.h" #include "cmLocalGenerator.h" +#include "cmOutputConverter.h" #include "cmSystemTools.h" #include "cmTest.h" diff --git a/Source/cmTimestamp.cxx b/Source/cmTimestamp.cxx index 1c795c4ff0..7d1ba3231a 100644 --- a/Source/cmTimestamp.cxx +++ b/Source/cmTimestamp.cxx @@ -11,12 +11,12 @@ ============================================================================*/ #include "cmTimestamp.h" -#include <cstring> #include <cstdlib> +#include <cstring> #include <sys/types.h> -#include <sys/stat.h> #include <sstream> +#include <sys/stat.h> //---------------------------------------------------------------------------- std::string cmTimestamp::CurrentTime( 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..f30071ec1d 100644 --- a/Source/cmUseMangledMesaCommand.cxx +++ b/Source/cmUseMangledMesaCommand.cxx @@ -10,10 +10,11 @@ See the License for more information. ============================================================================*/ #include "cmUseMangledMesaCommand.h" + #include "cmSystemTools.h" -#include <cmsys/RegularExpression.hxx> #include <cmsys/FStream.hxx> +#include <cmsys/RegularExpression.hxx> bool cmUseMangledMesaCommand ::InitialPass(std::vector<std::string> const& args, cmExecutionStatus &) diff --git a/Source/cmUuid.cxx b/Source/cmUuid.cxx index e2d0049ebe..5f8935f2af 100644 --- a/Source/cmUuid.cxx +++ b/Source/cmUuid.cxx @@ -13,8 +13,8 @@ #include <string.h> -#include <cmsys/MD5.h> #include "cm_sha2.h" +#include <cmsys/MD5.h> cmUuid::cmUuid() { 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..b4bdb2ad6e 100644 --- a/Source/cmVisualStudio10TargetGenerator.cxx +++ b/Source/cmVisualStudio10TargetGenerator.cxx @@ -9,37 +9,38 @@ implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License for more information. ============================================================================*/ -#include "windows.h" #include "cmVisualStudio10TargetGenerator.h" -#include "cmGlobalVisualStudio10Generator.h" -#include "cmGeneratorTarget.h" + #include "cmComputeLinkInformation.h" +#include "cmCustomCommandGenerator.h" #include "cmGeneratedFileStream.h" +#include "cmGeneratorTarget.h" +#include "cmGlobalVisualStudio10Generator.h" +#include "cmLocalVisualStudio7Generator.h" #include "cmMakefile.h" #include "cmSourceFile.h" -#include "cmVisualStudioGeneratorOptions.h" -#include "cmLocalVisualStudio7Generator.h" -#include "cmCustomCommandGenerator.h" #include "cmVS10CLFlagTable.h" -#include "cmVS10RCFlagTable.h" -#include "cmVS10LinkFlagTable.h" #include "cmVS10LibFlagTable.h" +#include "cmVS10LinkFlagTable.h" #include "cmVS10MASMFlagTable.h" +#include "cmVS10RCFlagTable.h" #include "cmVS11CLFlagTable.h" -#include "cmVS11RCFlagTable.h" -#include "cmVS11LinkFlagTable.h" #include "cmVS11LibFlagTable.h" +#include "cmVS11LinkFlagTable.h" #include "cmVS11MASMFlagTable.h" +#include "cmVS11RCFlagTable.h" #include "cmVS12CLFlagTable.h" -#include "cmVS12RCFlagTable.h" -#include "cmVS12LinkFlagTable.h" #include "cmVS12LibFlagTable.h" +#include "cmVS12LinkFlagTable.h" #include "cmVS12MASMFlagTable.h" +#include "cmVS12RCFlagTable.h" #include "cmVS14CLFlagTable.h" -#include "cmVS14RCFlagTable.h" -#include "cmVS14LinkFlagTable.h" #include "cmVS14LibFlagTable.h" +#include "cmVS14LinkFlagTable.h" #include "cmVS14MASMFlagTable.h" +#include "cmVS14RCFlagTable.h" +#include "cmVisualStudioGeneratorOptions.h" +#include "windows.h" #include <cmsys/auto_ptr.hxx> 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.cxx b/Source/cmXMLSafe.cxx index 4ad05ca316..e76ee52925 100644 --- a/Source/cmXMLSafe.cxx +++ b/Source/cmXMLSafe.cxx @@ -16,8 +16,8 @@ #include <iostream> #include <sstream> -#include <string.h> #include <stdio.h> +#include <string.h> //---------------------------------------------------------------------------- cmXMLSafe::cmXMLSafe(const char* s): diff --git a/Source/cmXMLSafe.h b/Source/cmXMLSafe.h index ead2e014c5..7cf34bac94 100644 --- a/Source/cmXMLSafe.h +++ b/Source/cmXMLSafe.h @@ -13,8 +13,9 @@ #define cmXMLSafe_h #include <cmsys/Configure.hxx> -#include <string> + #include <iosfwd> +#include <string> /** \class cmXMLSafe * \brief Write strings to XML with proper escapes 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..da6e59e368 100644 --- a/Source/cmake.cxx +++ b/Source/cmake.cxx @@ -10,17 +10,18 @@ See the License for more information. ============================================================================*/ #include "cmake.h" -#include "cmMakefile.h" -#include "cmLocalGenerator.h" -#include "cmExternalMakefileProjectGenerator.h" -#include "cmCommands.h" + +#include "cmAlgorithms.h" #include "cmCommand.h" +#include "cmCommands.h" +#include "cmDocumentationFormatter.h" +#include "cmExternalMakefileProjectGenerator.h" #include "cmFileTimeComparison.h" +#include "cmLocalGenerator.h" +#include "cmMakefile.h" #include "cmSourceFile.h" -#include "cmTest.h" -#include "cmDocumentationFormatter.h" -#include "cmAlgorithms.h" #include "cmState.h" +#include "cmTest.h" #if defined(CMAKE_BUILD_WITH_CMAKE) # include "cmGraphVizWriter.h" @@ -28,9 +29,9 @@ # include <cmsys/SystemInformation.hxx> #endif +#include <cmsys/FStream.hxx> #include <cmsys/Glob.hxx> #include <cmsys/RegularExpression.hxx> -#include <cmsys/FStream.hxx> // only build kdevelop generator on non-windows platforms // when not bootstrapping cmake @@ -51,17 +52,17 @@ // include the generator #if defined(_WIN32) && !defined(__CYGWIN__) # if !defined(CMAKE_BOOT_MINGW) -# include "cmGlobalVisualStudio71Generator.h" -# include "cmGlobalVisualStudio8Generator.h" -# include "cmGlobalVisualStudio9Generator.h" +# include "cmGlobalBorlandMakefileGenerator.h" +# include "cmGlobalGhsMultiGenerator.h" +# include "cmGlobalJOMMakefileGenerator.h" +# include "cmGlobalNMakeMakefileGenerator.h" # include "cmGlobalVisualStudio10Generator.h" # include "cmGlobalVisualStudio11Generator.h" # include "cmGlobalVisualStudio12Generator.h" # include "cmGlobalVisualStudio14Generator.h" -# include "cmGlobalBorlandMakefileGenerator.h" -# include "cmGlobalNMakeMakefileGenerator.h" -# include "cmGlobalJOMMakefileGenerator.h" -# include "cmGlobalGhsMultiGenerator.h" +# include "cmGlobalVisualStudio71Generator.h" +# include "cmGlobalVisualStudio8Generator.h" +# include "cmGlobalVisualStudio9Generator.h" # define CMAKE_HAVE_VS_GENERATORS # endif # include "cmGlobalMSYSMakefileGenerator.h" @@ -80,8 +81,8 @@ #if !defined(CMAKE_BOOT_MINGW) # include "cmExtraCodeBlocksGenerator.h" #endif -#include "cmExtraSublimeTextGenerator.h" #include "cmExtraKateGenerator.h" +#include "cmExtraSublimeTextGenerator.h" #ifdef CMAKE_USE_KDEVELOP # include "cmGlobalKdevelopGenerator.h" @@ -99,8 +100,8 @@ # define CMAKE_USE_XCODE 1 # endif # include <sys/types.h> -# include <sys/time.h> # include <sys/resource.h> +# include <sys/time.h> #endif #include <sys/stat.h> // struct stat diff --git a/Source/cmake.h b/Source/cmake.h index 8644dda1c3..e41ba5699a 100644 --- a/Source/cmake.h +++ b/Source/cmake.h @@ -13,11 +13,13 @@ #ifndef cmake_h #define cmake_h -#include "cmListFileCache.h" -#include "cmSystemTools.h" -#include "cmInstalledFile.h" +#include "cmStandardIncludes.h" + #include "cmCacheManager.h" +#include "cmInstalledFile.h" +#include "cmListFileCache.h" #include "cmState.h" +#include "cmSystemTools.h" class cmGlobalGeneratorFactory; class cmGlobalGenerator; diff --git a/Source/cmakemain.cxx b/Source/cmakemain.cxx index 600cc1a914..785fd90668 100644 --- a/Source/cmakemain.cxx +++ b/Source/cmakemain.cxx @@ -12,19 +12,19 @@ // include these first, otherwise there will be problems on Windows // with GetCurrentDirectory() being redefined #ifdef CMAKE_BUILD_WITH_CMAKE -#include "cmDynamicLoader.h" #include "cmDocumentation.h" +#include "cmDynamicLoader.h" #endif -#include "cmake.h" -#include "cmcmd.h" -#include "cmState.h" -#include "cmListFileCache.h" -#include "cmSourceFile.h" +#include "cmAlgorithms.h" #include "cmGlobalGenerator.h" +#include "cmListFileCache.h" #include "cmLocalGenerator.h" #include "cmMakefile.h" -#include "cmAlgorithms.h" +#include "cmSourceFile.h" +#include "cmState.h" +#include "cmake.h" +#include "cmcmd.h" #include <cmsys/Encoding.hxx> #ifdef CMAKE_BUILD_WITH_CMAKE diff --git a/Source/cmakexbuild.cxx b/Source/cmakexbuild.cxx index 9aaeeaa4d7..1385ff7221 100644 --- a/Source/cmakexbuild.cxx +++ b/Source/cmakexbuild.cxx @@ -9,9 +9,10 @@ implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License for more information. ============================================================================*/ -#include <cmsys/Process.h> #include "cmStandardIncludes.h" + #include "cmSystemTools.h" +#include <cmsys/Process.h> // This is a wrapper program for xcodebuild // it calls xcodebuild, and does two things diff --git a/Source/cmcldeps.cxx b/Source/cmcldeps.cxx index f3c6059b1c..644da1dfef 100644 --- a/Source/cmcldeps.cxx +++ b/Source/cmcldeps.cxx @@ -19,12 +19,12 @@ // /showIncludes is equivalent to -MD, not -MMD, that is, system headers are // included. - -#include <windows.h> -#include <sstream> #include <cmSystemTools.h> #include <cmsys/Encoding.hxx> +#include <sstream> +#include <windows.h> + // We don't want any wildcard expansion. // See http://msdn.microsoft.com/en-us/library/zay8tzh6(v=vs.85).aspx void _setargv() {} diff --git a/Source/cmcmd.cxx b/Source/cmcmd.cxx index 19f3886287..22c6a0657c 100644 --- a/Source/cmcmd.cxx +++ b/Source/cmcmd.cxx @@ -10,20 +10,21 @@ See the License for more information. ============================================================================*/ #include "cmcmd.h" -#include "cmMakefile.h" -#include "cmLocalGenerator.h" + +#include "cmAlgorithms.h" #include "cmGlobalGenerator.h" +#include "cmLocalGenerator.h" +#include "cmMakefile.h" #include "cmQtAutoGenerators.h" #include "cmVersion.h" -#include "cmAlgorithms.h" #if defined(CMAKE_BUILD_WITH_CMAKE) # include "cmDependsFortran.h" // For -E cmake_copy_f90_mod callback. #endif #include <cmsys/Directory.hxx> -#include <cmsys/Process.h> #include <cmsys/FStream.hxx> +#include <cmsys/Process.h> #include <cmsys/Terminal.h> #if defined(CMAKE_HAVE_VS_GENERATORS) diff --git a/Source/ctest.cxx b/Source/ctest.cxx index 7fa6aed8e2..5c80487a42 100644 --- a/Source/ctest.cxx +++ b/Source/ctest.cxx @@ -13,11 +13,11 @@ #include "cmSystemTools.h" // Need these for documentation support. -#include "cmake.h" #include "cmDocumentation.h" +#include "cmake.h" -#include "CTest/cmCTestScriptHandler.h" #include "CTest/cmCTestLaunch.h" +#include "CTest/cmCTestScriptHandler.h" #include "cmsys/Encoding.hxx" //---------------------------------------------------------------------------- diff --git a/Tests/BuildDepends/Project/bar.cxx b/Tests/BuildDepends/Project/bar.cxx index dadf93d6b9..c4adbf8e64 100644 --- a/Tests/BuildDepends/Project/bar.cxx +++ b/Tests/BuildDepends/Project/bar.cxx @@ -1,7 +1,7 @@ +#include <noregen.h> +#include <regen.h> #include <stdio.h> #include <string.h> -#include <regen.h> -#include <noregen.h> int main(int argc, char** argv) { diff --git a/Tests/BuildDepends/Project/ninjadep.cpp b/Tests/BuildDepends/Project/ninjadep.cpp index 8d61336137..5498b177ba 100644 --- a/Tests/BuildDepends/Project/ninjadep.cpp +++ b/Tests/BuildDepends/Project/ninjadep.cpp @@ -1,5 +1,5 @@ -#include <stdio.h> #include "dir/header.h" +#include <stdio.h> int main() { printf("HEADER_STRING: %s\n", HEADER_STRING); diff --git a/Tests/BuildDepends/Project/zot.cxx b/Tests/BuildDepends/Project/zot.cxx index 775fd3b438..186554b82e 100644 --- a/Tests/BuildDepends/Project/zot.cxx +++ b/Tests/BuildDepends/Project/zot.cxx @@ -1,6 +1,6 @@ +#include <stdio.h> #include <zot.hxx> #include <zot_custom.hxx> -#include <stdio.h> const char* zot_macro_dir_f(); const char* zot_macro_tgt_f(); diff --git a/Tests/BundleTest/BundleLib.cxx b/Tests/BundleTest/BundleLib.cxx index 37bc178d63..54f9534d02 100644 --- a/Tests/BundleTest/BundleLib.cxx +++ b/Tests/BundleTest/BundleLib.cxx @@ -1,6 +1,6 @@ #include <stdio.h> -#include <string.h> #include <stdlib.h> +#include <string.h> #include <unistd.h> #include <CoreFoundation/CoreFoundation.h> diff --git a/Tests/BundleUtilities/module.cpp b/Tests/BundleUtilities/module.cpp index ee1b542fb3..51730d9de3 100644 --- a/Tests/BundleUtilities/module.cpp +++ b/Tests/BundleUtilities/module.cpp @@ -1,7 +1,7 @@ #include "module.h" -#include "stdio.h" #include "shared2.h" +#include "stdio.h" void module() { diff --git a/Tests/CMakeCommands/target_include_directories/consumer.cpp b/Tests/CMakeCommands/target_include_directories/consumer.cpp index 649510ce08..9e1656a977 100644 --- a/Tests/CMakeCommands/target_include_directories/consumer.cpp +++ b/Tests/CMakeCommands/target_include_directories/consumer.cpp @@ -1,9 +1,9 @@ +#include "consumer.h" #include "common.h" -#include "publicinclude.h" #include "interfaceinclude.h" +#include "publicinclude.h" #include "relative_dir.h" -#include "consumer.h" #ifdef TEST_LANG_DEFINES #include "cxx_only.h" #endif diff --git a/Tests/CMakeCommands/target_link_libraries/targetC.cpp b/Tests/CMakeCommands/target_link_libraries/targetC.cpp index a4ef6369d0..35426605df 100644 --- a/Tests/CMakeCommands/target_link_libraries/targetC.cpp +++ b/Tests/CMakeCommands/target_link_libraries/targetC.cpp @@ -1,8 +1,8 @@ #include "depG.h" -#include "foo.h" #include "bar.h" +#include "foo.h" #ifndef TEST_DEF #error Expected TEST_DEF definition diff --git a/Tests/CMakeLib/testUTF8.cxx b/Tests/CMakeLib/testUTF8.cxx index 4ab96cf01e..204a717391 100644 --- a/Tests/CMakeLib/testUTF8.cxx +++ b/Tests/CMakeLib/testUTF8.cxx @@ -11,8 +11,8 @@ ============================================================================*/ #include <cm_utf8.h> -#include <string.h> #include <stdio.h> +#include <string.h> typedef char test_utf8_char[5]; diff --git a/Tests/CompileDefinitions/runtest.c b/Tests/CompileDefinitions/runtest.c index 02d2cadb0c..c2d51aaf0c 100644 --- a/Tests/CompileDefinitions/runtest.c +++ b/Tests/CompileDefinitions/runtest.c @@ -1,6 +1,6 @@ -#include <string.h> -#include <stdio.h> #include <ctype.h> +#include <stdio.h> +#include <string.h> #ifndef BUILD_CONFIG_NAME # error "BUILD_CONFIG_NAME not defined!" diff --git a/Tests/Complex/Executable/complex.cxx b/Tests/Complex/Executable/complex.cxx index ec222a5ace..8d538db8a3 100644 --- a/Tests/Complex/Executable/complex.cxx +++ b/Tests/Complex/Executable/complex.cxx @@ -1,18 +1,18 @@ +#include "Aout.h" +#include "ExtraSources/file1.h" #include "cmTestConfigure.h" #include "cmTestConfigureEscape.h" #include "cmTestGeneratedHeader.h" #include "cmVersion.h" -#include "ExtraSources/file1.h" -#include "Aout.h" #include "file2.h" #include "sharedFile.h" extern "C" { #include "testConly.h" } -#include <vector> -#include <string> #include <iostream> #include <string.h> +#include <string> +#include <vector> #include <stdio.h> #include <sys/stat.h> diff --git a/Tests/ComplexOneConfig/Executable/complex.cxx b/Tests/ComplexOneConfig/Executable/complex.cxx index ec222a5ace..8d538db8a3 100644 --- a/Tests/ComplexOneConfig/Executable/complex.cxx +++ b/Tests/ComplexOneConfig/Executable/complex.cxx @@ -1,18 +1,18 @@ +#include "Aout.h" +#include "ExtraSources/file1.h" #include "cmTestConfigure.h" #include "cmTestConfigureEscape.h" #include "cmTestGeneratedHeader.h" #include "cmVersion.h" -#include "ExtraSources/file1.h" -#include "Aout.h" #include "file2.h" #include "sharedFile.h" extern "C" { #include "testConly.h" } -#include <vector> -#include <string> #include <iostream> #include <string.h> +#include <string> +#include <vector> #include <stdio.h> #include <sys/stat.h> diff --git a/Tests/ExportImport/Export/testSharedLibDepends.h b/Tests/ExportImport/Export/testSharedLibDepends.h index 8b2f84eb34..e84fb54544 100644 --- a/Tests/ExportImport/Export/testSharedLibDepends.h +++ b/Tests/ExportImport/Export/testSharedLibDepends.h @@ -4,8 +4,8 @@ #include "testsharedlibdepends_export.h" -#include "testSharedLibRequired.h" #include "renamed.h" +#include "testSharedLibRequired.h" struct TESTSHAREDLIBDEPENDS_EXPORT TestSharedLibDepends { diff --git a/Tests/ExportImport/Import/A/deps_shared_iface.cpp b/Tests/ExportImport/Import/A/deps_shared_iface.cpp index d5e4de3c0a..0c5cb7fd70 100644 --- a/Tests/ExportImport/Import/A/deps_shared_iface.cpp +++ b/Tests/ExportImport/Import/A/deps_shared_iface.cpp @@ -21,8 +21,8 @@ #endif #ifdef TEST_SUBDIR_LIB -#include "subdir.h" #include "renamed.h" +#include "subdir.h" #endif #ifdef DO_GNU_TESTS diff --git a/Tests/FindGSL/rng/main.cc b/Tests/FindGSL/rng/main.cc index 72543be779..e1e0a4778b 100644 --- a/Tests/FindGSL/rng/main.cc +++ b/Tests/FindGSL/rng/main.cc @@ -1,5 +1,5 @@ -#include <math.h> #include "gsl/gsl_rng.h" +#include <math.h> int main() { diff --git a/Tests/FindGTK2/cairomm/main.cpp b/Tests/FindGTK2/cairomm/main.cpp index ea8f1065cc..0db3a04214 100644 --- a/Tests/FindGTK2/cairomm/main.cpp +++ b/Tests/FindGTK2/cairomm/main.cpp @@ -8,11 +8,11 @@ #define _USE_MATH_DEFINES #endif -#include <string> -#include <iostream> -#include <cairommconfig.h> #include <cairomm/context.h> #include <cairomm/surface.h> +#include <cairommconfig.h> +#include <iostream> +#include <string> #include <cmath> diff --git a/Tests/FindGTK2/gtkmm/main.cpp b/Tests/FindGTK2/gtkmm/main.cpp index 5ff64d113a..566a4bd0af 100644 --- a/Tests/FindGTK2/gtkmm/main.cpp +++ b/Tests/FindGTK2/gtkmm/main.cpp @@ -1,5 +1,5 @@ -#include <gtkmm.h> #include "helloworld.h" +#include <gtkmm.h> int main(int argc, char *argv[]) { diff --git a/Tests/FindGTK2/sigc++/main.cpp b/Tests/FindGTK2/sigc++/main.cpp index 78428e76bf..ccf415e481 100644 --- a/Tests/FindGTK2/sigc++/main.cpp +++ b/Tests/FindGTK2/sigc++/main.cpp @@ -1,8 +1,7 @@ // Taken from https://developer.gnome.org/libsigc++-tutorial/stable/ch02.html - -#include <sigc++/sigc++.h> #include <iostream> +#include <sigc++/sigc++.h> class AlienDetector { diff --git a/Tests/FindLTTngUST/Test/main.c b/Tests/FindLTTngUST/Test/main.c index ac775a0c4a..1f313c1a9b 100644 --- a/Tests/FindLTTngUST/Test/main.c +++ b/Tests/FindLTTngUST/Test/main.c @@ -1,7 +1,7 @@ #include <assert.h> -#include <string.h> -#include <stdio.h> #include <lttng/ust-version.h> +#include <stdio.h> +#include <string.h> #ifdef CMAKE_LTTNGUST_HAS_TRACEF #include <lttng/tracef.h> diff --git a/Tests/FindPNG/Test/main.c b/Tests/FindPNG/Test/main.c index 27e14786bb..06d943d1b5 100644 --- a/Tests/FindPNG/Test/main.c +++ b/Tests/FindPNG/Test/main.c @@ -1,6 +1,6 @@ #include <assert.h> -#include <string.h> #include <png.h> +#include <string.h> int main() { diff --git a/Tests/FindPackageModeMakefileTest/main.cpp b/Tests/FindPackageModeMakefileTest/main.cpp index e5f9134ce9..db1ffb19ed 100644 --- a/Tests/FindPackageModeMakefileTest/main.cpp +++ b/Tests/FindPackageModeMakefileTest/main.cpp @@ -1,5 +1,5 @@ -#include <stdio.h> #include <foo.h> +#include <stdio.h> int main() { diff --git a/Tests/FindXalanC/Test/main.cxx b/Tests/FindXalanC/Test/main.cxx index 3b4a2df8ee..7d0f42cf4a 100644 --- a/Tests/FindXalanC/Test/main.cxx +++ b/Tests/FindXalanC/Test/main.cxx @@ -1,5 +1,5 @@ -#include <xercesc/util/PlatformUtils.hpp> #include <xalanc/XalanTransformer/XalanTransformer.hpp> +#include <xercesc/util/PlatformUtils.hpp> int main() { diff --git a/Tests/IncludeDirectories/TargetIncludeDirectories/main.cpp b/Tests/IncludeDirectories/TargetIncludeDirectories/main.cpp index aed0bde46b..2ee05e2eed 100644 --- a/Tests/IncludeDirectories/TargetIncludeDirectories/main.cpp +++ b/Tests/IncludeDirectories/TargetIncludeDirectories/main.cpp @@ -1,17 +1,17 @@ +#include "arguments.h" +#include "bang.h" #include "bar.h" #include "bat.h" -#include "foo.h" #include "baz.h" -#include "bang.h" #include "bing.h" #include "bung.h" -#include "ting.h" -#include "arguments.h" +#include "common.h" +#include "foo.h" #include "list.h" -#include "target.h" #include "prefix_foo_bar_bat.h" -#include "common.h" +#include "target.h" +#include "ting.h" int main(int, char**) { diff --git a/Tests/LoadCommand/CMakeCommands/cmTestCommand.c b/Tests/LoadCommand/CMakeCommands/cmTestCommand.c index fc04934dd9..eac121d41c 100644 --- a/Tests/LoadCommand/CMakeCommands/cmTestCommand.c +++ b/Tests/LoadCommand/CMakeCommands/cmTestCommand.c @@ -1,7 +1,7 @@ #include "cmCPluginAPI.h" -#include <string.h> -#include <stdlib.h> #include <stdio.h> +#include <stdlib.h> +#include <string.h> typedef struct { diff --git a/Tests/LoadCommandOneConfig/CMakeCommands/cmTestCommand.c b/Tests/LoadCommandOneConfig/CMakeCommands/cmTestCommand.c index fc04934dd9..eac121d41c 100644 --- a/Tests/LoadCommandOneConfig/CMakeCommands/cmTestCommand.c +++ b/Tests/LoadCommandOneConfig/CMakeCommands/cmTestCommand.c @@ -1,7 +1,7 @@ #include "cmCPluginAPI.h" -#include <string.h> -#include <stdlib.h> #include <stdio.h> +#include <stdlib.h> +#include <string.h> typedef struct { diff --git a/Tests/MFC/mfc1/ChildFrm.cpp b/Tests/MFC/mfc1/ChildFrm.cpp index b04c4f2314..889ccebecd 100644 --- a/Tests/MFC/mfc1/ChildFrm.cpp +++ b/Tests/MFC/mfc1/ChildFrm.cpp @@ -1,6 +1,8 @@ // ChildFrm.cpp : implementation of the CChildFrame class // + #include "stdafx.h" + #include "mfc1.h" #include "ChildFrm.h" diff --git a/Tests/MFC/mfc1/MainFrm.cpp b/Tests/MFC/mfc1/MainFrm.cpp index 44554bf4c8..222c3dae39 100644 --- a/Tests/MFC/mfc1/MainFrm.cpp +++ b/Tests/MFC/mfc1/MainFrm.cpp @@ -2,6 +2,7 @@ // #include "stdafx.h" + #include "mfc1.h" #include "MainFrm.h" diff --git a/Tests/MFC/mfc1/mfc1.cpp b/Tests/MFC/mfc1/mfc1.cpp index 9530cd2b94..1777d7f29b 100644 --- a/Tests/MFC/mfc1/mfc1.cpp +++ b/Tests/MFC/mfc1/mfc1.cpp @@ -2,8 +2,9 @@ // #include "stdafx.h" -#include "mfc1.h" + #include "MainFrm.h" +#include "mfc1.h" #include "ChildFrm.h" #include "mfc1Doc.h" diff --git a/Tests/MFC/mfc1/mfc1Doc.cpp b/Tests/MFC/mfc1/mfc1Doc.cpp index 8767052ed2..db76b060d9 100644 --- a/Tests/MFC/mfc1/mfc1Doc.cpp +++ b/Tests/MFC/mfc1/mfc1Doc.cpp @@ -2,6 +2,7 @@ // #include "stdafx.h" + #include "mfc1.h" #include "mfc1Doc.h" diff --git a/Tests/MFC/mfc1/mfc1View.cpp b/Tests/MFC/mfc1/mfc1View.cpp index 06c765230f..800030216e 100644 --- a/Tests/MFC/mfc1/mfc1View.cpp +++ b/Tests/MFC/mfc1/mfc1View.cpp @@ -2,6 +2,7 @@ // #include "stdafx.h" + #include "mfc1.h" #include "mfc1Doc.h" diff --git a/Tests/MFC/mfc1/stdafx.h b/Tests/MFC/mfc1/stdafx.h index 35a678dcde..654a23f485 100644 --- a/Tests/MFC/mfc1/stdafx.h +++ b/Tests/MFC/mfc1/stdafx.h @@ -46,9 +46,9 @@ // turns off MFC's hiding of some common and often safely ignored warning messages #define _AFX_ALL_WARNINGS -#include <afxwin.h> // MFC core and standard components -#include <afxext.h> // MFC extensions -#include <afxdisp.h> // MFC Automation classes +#include <afxdisp.h> // MFC Automation classes +#include <afxext.h> // MFC extensions +#include <afxwin.h> // MFC core and standard components #include <afxdtctl.h> // MFC support for Internet Explorer 4 Common Controls #ifndef _AFX_NO_AFXCMN_SUPPORT diff --git a/Tests/OutOfSource/OutOfSourceSubdir/simple.cxx b/Tests/OutOfSource/OutOfSourceSubdir/simple.cxx index d88c311f8e..69d7c82d15 100644 --- a/Tests/OutOfSource/OutOfSourceSubdir/simple.cxx +++ b/Tests/OutOfSource/OutOfSourceSubdir/simple.cxx @@ -1,8 +1,8 @@ #include <stdio.h> #include <string.h> -#include "testlib.h" #include "testdp.h" +#include "testlib.h" extern int simple(); #ifndef NO_DEEPSRC diff --git a/Tests/Plugin/src/example_exe.cxx b/Tests/Plugin/src/example_exe.cxx index 12d92041aa..393bb680c0 100644 --- a/Tests/Plugin/src/example_exe.cxx +++ b/Tests/Plugin/src/example_exe.cxx @@ -2,8 +2,8 @@ #include <example_exe.h> -#include <kwsys/DynamicLoader.hxx> #include <iostream> +#include <kwsys/DynamicLoader.hxx> #include <string> #include <stdio.h> diff --git a/Tests/Preprocess/preprocess.c b/Tests/Preprocess/preprocess.c index 16209acf49..af5eae6722 100644 --- a/Tests/Preprocess/preprocess.c +++ b/Tests/Preprocess/preprocess.c @@ -3,8 +3,8 @@ #include FILE_PATH #include TARGET_PATH -#include <string.h> #include <stdio.h> +#include <string.h> int check_defines_C(void) { diff --git a/Tests/Preprocess/preprocess.cxx b/Tests/Preprocess/preprocess.cxx index 27b6ac89a6..d1681036f0 100644 --- a/Tests/Preprocess/preprocess.cxx +++ b/Tests/Preprocess/preprocess.cxx @@ -3,8 +3,8 @@ #include FILE_PATH #include TARGET_PATH -#include <string.h> #include <stdio.h> +#include <string.h> extern "C" int check_defines_C(void); diff --git a/Tests/Qt4Deploy/testdeploy.cpp b/Tests/Qt4Deploy/testdeploy.cpp index 8b9c8d6fa5..255453a40e 100644 --- a/Tests/Qt4Deploy/testdeploy.cpp +++ b/Tests/Qt4Deploy/testdeploy.cpp @@ -1,7 +1,7 @@ #include <QCoreApplication> -#include <QSqlDatabase> -#include <QLibraryInfo> #include <QDebug> +#include <QLibraryInfo> +#include <QSqlDatabase> #include <QStringList> int main(int argc, char** argv) diff --git a/Tests/QtAutogen/Bdir/libB.h b/Tests/QtAutogen/Bdir/libB.h index 510c17f8fe..746b67a67a 100644 --- a/Tests/QtAutogen/Bdir/libB.h +++ b/Tests/QtAutogen/Bdir/libB.h @@ -4,8 +4,8 @@ #include "libb_export.h" -#include <QObject> #include "libA.h" +#include <QObject> class LIBB_EXPORT LibB : public QObject { diff --git a/Tests/QtAutogen/calwidget.cpp b/Tests/QtAutogen/calwidget.cpp index 5f59994b7b..0e314cd6a9 100644 --- a/Tests/QtAutogen/calwidget.cpp +++ b/Tests/QtAutogen/calwidget.cpp @@ -38,13 +38,13 @@ ** ****************************************************************************/ + #include <QCalendarWidget> + #include <QCheckBox> #include <QComboBox> + #include <QDateEdit> #include <QGridLayout> - #include <QLabel> #include <QGroupBox> - #include <QCheckBox> - #include <QDateEdit> - #include <QCalendarWidget> + #include <QLabel> #include <QTextCharFormat> #include "calwidget.h" diff --git a/Tests/QtAutogen/codeeditor.h b/Tests/QtAutogen/codeeditor.h index 56e9e79239..fd79a2ac43 100644 --- a/Tests/QtAutogen/codeeditor.h +++ b/Tests/QtAutogen/codeeditor.h @@ -41,8 +41,8 @@ #ifndef CODEEDITOR_H #define CODEEDITOR_H - #include <QPlainTextEdit> #include <QObject> + #include <QPlainTextEdit> class QPaintEvent; class QResizeEvent; diff --git a/Tests/QtAutogen/libC.h b/Tests/QtAutogen/libC.h index 4fb4a2cf4c..6682576d18 100644 --- a/Tests/QtAutogen/libC.h +++ b/Tests/QtAutogen/libC.h @@ -4,8 +4,8 @@ #include "libc_export.h" -#include <QObject> #include "libB.h" +#include <QObject> class LIBC_EXPORT LibC : public QObject { diff --git a/Tests/QtAutogen/main.cpp b/Tests/QtAutogen/main.cpp index eb596650e5..1636cd443c 100644 --- a/Tests/QtAutogen/main.cpp +++ b/Tests/QtAutogen/main.cpp @@ -41,16 +41,16 @@ #include <QCoreApplication> #include <QTimer> -#include "codeeditor.h" +#include "abc.h" +#include "blub.h" #include "calwidget.h" +#include "codeeditor.h" #include "foo.h" -#include "blub.h" +#include "libC.h" +#include "resourcetester.h" #include "sub/bar.h" -#include "abc.h" #include "xyz.h" #include "yaf.h" -#include "libC.h" -#include "resourcetester.h" #ifdef TEST_DEBUG_CLASS #include "debug_class.h" #include <iostream> diff --git a/Tests/QtAutogen/resourcetester.cpp b/Tests/QtAutogen/resourcetester.cpp index 043ec75fc3..75ae28f8f4 100644 --- a/Tests/QtAutogen/resourcetester.cpp +++ b/Tests/QtAutogen/resourcetester.cpp @@ -1,8 +1,8 @@ #include "resourcetester.h" -#include <QDebug> #include <QApplication> +#include <QDebug> #include <QFile> #include <QTimer> diff --git a/Tests/QtAutogen/same_name/ccc/item.cpp b/Tests/QtAutogen/same_name/ccc/item.cpp index 2584881e40..12c71d0fa7 100644 --- a/Tests/QtAutogen/same_name/ccc/item.cpp +++ b/Tests/QtAutogen/same_name/ccc/item.cpp @@ -22,5 +22,5 @@ MocTest::go() } // Include own moc files -#include "moc_item.cpp" #include "item.moc" +#include "moc_item.cpp" diff --git a/Tests/QtAutogen/same_name/main.cpp b/Tests/QtAutogen/same_name/main.cpp index 166466e327..fc77a9902c 100644 --- a/Tests/QtAutogen/same_name/main.cpp +++ b/Tests/QtAutogen/same_name/main.cpp @@ -1,7 +1,7 @@ -#include "aaa/item.hpp" #include "aaa/bbb/item.hpp" -#include "bbb/item.hpp" +#include "aaa/item.hpp" #include "bbb/aaa/item.hpp" +#include "bbb/item.hpp" #include "ccc/item.hpp" int main(int argv, char **args) diff --git a/Tests/RunCMake/AutoExportDll/hello.cxx b/Tests/RunCMake/AutoExportDll/hello.cxx index 3933fc114d..4196948f6f 100644 --- a/Tests/RunCMake/AutoExportDll/hello.cxx +++ b/Tests/RunCMake/AutoExportDll/hello.cxx @@ -1,5 +1,5 @@ -#include <stdio.h> #include "hello.h" +#include <stdio.h> int Hello::Data = 0; void Hello::real() { diff --git a/Tests/RunCMake/AutoExportDll/say.cxx b/Tests/RunCMake/AutoExportDll/say.cxx index 655b3c21a2..0d78d4be89 100644 --- a/Tests/RunCMake/AutoExportDll/say.cxx +++ b/Tests/RunCMake/AutoExportDll/say.cxx @@ -1,5 +1,5 @@ -#include <stdio.h> #include "hello.h" +#include <stdio.h> #ifdef _MSC_VER #include "windows.h" #else diff --git a/Tests/StagingPrefix/Consumer/main.cpp b/Tests/StagingPrefix/Consumer/main.cpp index 612ee05a91..5c0202d254 100644 --- a/Tests/StagingPrefix/Consumer/main.cpp +++ b/Tests/StagingPrefix/Consumer/main.cpp @@ -1,6 +1,6 @@ -#include "foo.h" #include "bar.h" +#include "foo.h" int main(int, char **) { diff --git a/Tests/StringFileTest/StringFile.cxx b/Tests/StringFileTest/StringFile.cxx index 9eba6bff97..073e30c33f 100644 --- a/Tests/StringFileTest/StringFile.cxx +++ b/Tests/StringFileTest/StringFile.cxx @@ -1,5 +1,6 @@ #include <stdio.h> #include <string.h> + #include "OutputFile.h" int main(int, char*[]) diff --git a/Tests/TestsWorkingDirectory/main.c b/Tests/TestsWorkingDirectory/main.c index 19f2f14afd..3616f8e342 100644 --- a/Tests/TestsWorkingDirectory/main.c +++ b/Tests/TestsWorkingDirectory/main.c @@ -5,8 +5,8 @@ #if defined(_WIN32) && (defined(_MSC_VER) || defined(__WATCOMC__) || defined(__BORLANDC__) || defined(__MINGW32__)) -#include <io.h> #include <direct.h> +#include <io.h> #if defined(__WATCOMC__) #include <direct.h> diff --git a/Tests/Tutorial/Step1/tutorial.cxx b/Tests/Tutorial/Step1/tutorial.cxx index 8ab6dc3067..a3584c475a 100644 --- a/Tests/Tutorial/Step1/tutorial.cxx +++ b/Tests/Tutorial/Step1/tutorial.cxx @@ -1,8 +1,8 @@ // A simple program that computes the square root of a number +#include "TutorialConfig.h" +#include <math.h> #include <stdio.h> #include <stdlib.h> -#include <math.h> -#include "TutorialConfig.h" int main (int argc, char *argv[]) { diff --git a/Tests/Tutorial/Step2/MathFunctions/mysqrt.cxx b/Tests/Tutorial/Step2/MathFunctions/mysqrt.cxx index 62523f69fb..0f7c10605d 100644 --- a/Tests/Tutorial/Step2/MathFunctions/mysqrt.cxx +++ b/Tests/Tutorial/Step2/MathFunctions/mysqrt.cxx @@ -1,5 +1,5 @@ -#include <stdio.h> #include "MathFunctions.h" +#include <stdio.h> // a hack square root calculation using simple operations double mysqrt(double x) diff --git a/Tests/Tutorial/Step2/tutorial.cxx b/Tests/Tutorial/Step2/tutorial.cxx index c27da0b847..af88dad465 100644 --- a/Tests/Tutorial/Step2/tutorial.cxx +++ b/Tests/Tutorial/Step2/tutorial.cxx @@ -1,8 +1,8 @@ // A simple program that computes the square root of a number +#include "TutorialConfig.h" +#include <math.h> #include <stdio.h> #include <stdlib.h> -#include <math.h> -#include "TutorialConfig.h" #ifdef USE_MYMATH #include "MathFunctions.h" diff --git a/Tests/Tutorial/Step3/MathFunctions/mysqrt.cxx b/Tests/Tutorial/Step3/MathFunctions/mysqrt.cxx index 62523f69fb..0f7c10605d 100644 --- a/Tests/Tutorial/Step3/MathFunctions/mysqrt.cxx +++ b/Tests/Tutorial/Step3/MathFunctions/mysqrt.cxx @@ -1,5 +1,5 @@ -#include <stdio.h> #include "MathFunctions.h" +#include <stdio.h> // a hack square root calculation using simple operations double mysqrt(double x) diff --git a/Tests/Tutorial/Step3/tutorial.cxx b/Tests/Tutorial/Step3/tutorial.cxx index c27da0b847..af88dad465 100644 --- a/Tests/Tutorial/Step3/tutorial.cxx +++ b/Tests/Tutorial/Step3/tutorial.cxx @@ -1,8 +1,8 @@ // A simple program that computes the square root of a number +#include "TutorialConfig.h" +#include <math.h> #include <stdio.h> #include <stdlib.h> -#include <math.h> -#include "TutorialConfig.h" #ifdef USE_MYMATH #include "MathFunctions.h" diff --git a/Tests/Tutorial/Step4/MathFunctions/mysqrt.cxx b/Tests/Tutorial/Step4/MathFunctions/mysqrt.cxx index d081d11d20..bbd08fa0d3 100644 --- a/Tests/Tutorial/Step4/MathFunctions/mysqrt.cxx +++ b/Tests/Tutorial/Step4/MathFunctions/mysqrt.cxx @@ -1,6 +1,6 @@ -#include <stdio.h> #include "MathFunctions.h" #include "TutorialConfig.h" +#include <stdio.h> #include <math.h> diff --git a/Tests/Tutorial/Step4/tutorial.cxx b/Tests/Tutorial/Step4/tutorial.cxx index c27da0b847..af88dad465 100644 --- a/Tests/Tutorial/Step4/tutorial.cxx +++ b/Tests/Tutorial/Step4/tutorial.cxx @@ -1,8 +1,8 @@ // A simple program that computes the square root of a number +#include "TutorialConfig.h" +#include <math.h> #include <stdio.h> #include <stdlib.h> -#include <math.h> -#include "TutorialConfig.h" #ifdef USE_MYMATH #include "MathFunctions.h" diff --git a/Tests/Tutorial/Step5/MathFunctions/MakeTable.cxx b/Tests/Tutorial/Step5/MathFunctions/MakeTable.cxx index ef98d5fdcb..a23feeb620 100644 --- a/Tests/Tutorial/Step5/MathFunctions/MakeTable.cxx +++ b/Tests/Tutorial/Step5/MathFunctions/MakeTable.cxx @@ -1,6 +1,6 @@ // A simple program that builds a sqrt table -#include <stdio.h> #include <math.h> +#include <stdio.h> int main (int argc, char *argv[]) { diff --git a/Tests/Tutorial/Step5/MathFunctions/mysqrt.cxx b/Tests/Tutorial/Step5/MathFunctions/mysqrt.cxx index 1f9b887191..a488af6a3d 100644 --- a/Tests/Tutorial/Step5/MathFunctions/mysqrt.cxx +++ b/Tests/Tutorial/Step5/MathFunctions/mysqrt.cxx @@ -1,6 +1,6 @@ -#include <stdio.h> #include "MathFunctions.h" #include "TutorialConfig.h" +#include <stdio.h> // include the generated table #include "Table.h" diff --git a/Tests/Tutorial/Step5/tutorial.cxx b/Tests/Tutorial/Step5/tutorial.cxx index c27da0b847..af88dad465 100644 --- a/Tests/Tutorial/Step5/tutorial.cxx +++ b/Tests/Tutorial/Step5/tutorial.cxx @@ -1,8 +1,8 @@ // A simple program that computes the square root of a number +#include "TutorialConfig.h" +#include <math.h> #include <stdio.h> #include <stdlib.h> -#include <math.h> -#include "TutorialConfig.h" #ifdef USE_MYMATH #include "MathFunctions.h" diff --git a/Tests/Tutorial/Step6/MathFunctions/MakeTable.cxx b/Tests/Tutorial/Step6/MathFunctions/MakeTable.cxx index ef98d5fdcb..a23feeb620 100644 --- a/Tests/Tutorial/Step6/MathFunctions/MakeTable.cxx +++ b/Tests/Tutorial/Step6/MathFunctions/MakeTable.cxx @@ -1,6 +1,6 @@ // A simple program that builds a sqrt table -#include <stdio.h> #include <math.h> +#include <stdio.h> int main (int argc, char *argv[]) { diff --git a/Tests/Tutorial/Step6/MathFunctions/mysqrt.cxx b/Tests/Tutorial/Step6/MathFunctions/mysqrt.cxx index 1f9b887191..a488af6a3d 100644 --- a/Tests/Tutorial/Step6/MathFunctions/mysqrt.cxx +++ b/Tests/Tutorial/Step6/MathFunctions/mysqrt.cxx @@ -1,6 +1,6 @@ -#include <stdio.h> #include "MathFunctions.h" #include "TutorialConfig.h" +#include <stdio.h> // include the generated table #include "Table.h" diff --git a/Tests/Tutorial/Step6/tutorial.cxx b/Tests/Tutorial/Step6/tutorial.cxx index c27da0b847..af88dad465 100644 --- a/Tests/Tutorial/Step6/tutorial.cxx +++ b/Tests/Tutorial/Step6/tutorial.cxx @@ -1,8 +1,8 @@ // A simple program that computes the square root of a number +#include "TutorialConfig.h" +#include <math.h> #include <stdio.h> #include <stdlib.h> -#include <math.h> -#include "TutorialConfig.h" #ifdef USE_MYMATH #include "MathFunctions.h" diff --git a/Tests/Tutorial/Step7/MathFunctions/MakeTable.cxx b/Tests/Tutorial/Step7/MathFunctions/MakeTable.cxx index ef98d5fdcb..a23feeb620 100644 --- a/Tests/Tutorial/Step7/MathFunctions/MakeTable.cxx +++ b/Tests/Tutorial/Step7/MathFunctions/MakeTable.cxx @@ -1,6 +1,6 @@ // A simple program that builds a sqrt table -#include <stdio.h> #include <math.h> +#include <stdio.h> int main (int argc, char *argv[]) { diff --git a/Tests/Tutorial/Step7/MathFunctions/mysqrt.cxx b/Tests/Tutorial/Step7/MathFunctions/mysqrt.cxx index 1f9b887191..a488af6a3d 100644 --- a/Tests/Tutorial/Step7/MathFunctions/mysqrt.cxx +++ b/Tests/Tutorial/Step7/MathFunctions/mysqrt.cxx @@ -1,6 +1,6 @@ -#include <stdio.h> #include "MathFunctions.h" #include "TutorialConfig.h" +#include <stdio.h> // include the generated table #include "Table.h" diff --git a/Tests/Tutorial/Step7/tutorial.cxx b/Tests/Tutorial/Step7/tutorial.cxx index c27da0b847..af88dad465 100644 --- a/Tests/Tutorial/Step7/tutorial.cxx +++ b/Tests/Tutorial/Step7/tutorial.cxx @@ -1,8 +1,8 @@ // A simple program that computes the square root of a number +#include "TutorialConfig.h" +#include <math.h> #include <stdio.h> #include <stdlib.h> -#include <math.h> -#include "TutorialConfig.h" #ifdef USE_MYMATH #include "MathFunctions.h" diff --git a/Tests/VSResource/main.cpp b/Tests/VSResource/main.cpp index ccf700c42d..f8372b70b5 100644 --- a/Tests/VSResource/main.cpp +++ b/Tests/VSResource/main.cpp @@ -1,5 +1,5 @@ -#include <windows.h> #include <stdio.h> +#include <windows.h> extern int lib(); diff --git a/Tests/VSWinStorePhone/Direct3DApp1/CubeRenderer.cpp b/Tests/VSWinStorePhone/Direct3DApp1/CubeRenderer.cpp index f4827f2d67..7632388128 100644 --- a/Tests/VSWinStorePhone/Direct3DApp1/CubeRenderer.cpp +++ b/Tests/VSWinStorePhone/Direct3DApp1/CubeRenderer.cpp @@ -1,4 +1,5 @@ #include "pch.h" + #include "CubeRenderer.h" using namespace DirectX; diff --git a/Tests/VSWinStorePhone/Direct3DApp1/Direct3DApp1.cpp b/Tests/VSWinStorePhone/Direct3DApp1/Direct3DApp1.cpp index 3dbb97f105..41ca124b34 100644 --- a/Tests/VSWinStorePhone/Direct3DApp1/Direct3DApp1.cpp +++ b/Tests/VSWinStorePhone/Direct3DApp1/Direct3DApp1.cpp @@ -1,6 +1,7 @@ #include "pch.h" -#include "Direct3DApp1.h" + #include "BasicTimer.h" +#include "Direct3DApp1.h" using namespace Windows::ApplicationModel; using namespace Windows::ApplicationModel::Core; diff --git a/Tests/VSWinStorePhone/Direct3DApp1/Direct3DApp1.h b/Tests/VSWinStorePhone/Direct3DApp1/Direct3DApp1.h index 40b69a1734..6861e44acd 100644 --- a/Tests/VSWinStorePhone/Direct3DApp1/Direct3DApp1.h +++ b/Tests/VSWinStorePhone/Direct3DApp1/Direct3DApp1.h @@ -1,6 +1,7 @@ #pragma once #include "pch.h" + #include "CubeRenderer.h" ref class Direct3DApp1 sealed : public Windows::ApplicationModel::Core::IFrameworkView diff --git a/Tests/VSWinStorePhone/Direct3DApp1/Direct3DBase.cpp b/Tests/VSWinStorePhone/Direct3DApp1/Direct3DBase.cpp index 46727b5ff3..f09c8daef2 100644 --- a/Tests/VSWinStorePhone/Direct3DApp1/Direct3DBase.cpp +++ b/Tests/VSWinStorePhone/Direct3DApp1/Direct3DBase.cpp @@ -1,4 +1,5 @@ #include "pch.h" + #include "Direct3DBase.h" using namespace DirectX; diff --git a/Tests/VSWinStorePhone/Direct3DApp1/DirectXHelper.h b/Tests/VSWinStorePhone/Direct3DApp1/DirectXHelper.h index d411a9b815..3434ba9ea8 100644 --- a/Tests/VSWinStorePhone/Direct3DApp1/DirectXHelper.h +++ b/Tests/VSWinStorePhone/Direct3DApp1/DirectXHelper.h @@ -1,8 +1,8 @@ #pragma once -#include <wrl/client.h> #include <ppl.h> #include <ppltasks.h> +#include <wrl/client.h> namespace DX { diff --git a/Tests/VSWinStorePhone/Direct3DApp1/pch.h b/Tests/VSWinStorePhone/Direct3DApp1/pch.h index 2302e66ba7..78ebea3472 100644 --- a/Tests/VSWinStorePhone/Direct3DApp1/pch.h +++ b/Tests/VSWinStorePhone/Direct3DApp1/pch.h @@ -1,7 +1,7 @@ #pragma once -#include <wrl/client.h> -#include <d3d11_1.h> #include <DirectXMath.h> -#include <memory> #include <agile.h> +#include <d3d11_1.h> +#include <memory> +#include <wrl/client.h> diff --git a/Tests/VSXaml/App.xaml.cpp b/Tests/VSXaml/App.xaml.cpp index 334dc1f9c4..2cb2b3284d 100644 --- a/Tests/VSXaml/App.xaml.cpp +++ b/Tests/VSXaml/App.xaml.cpp @@ -4,6 +4,7 @@ // #include "pch.h" + #include "MainPage.xaml.h" using namespace VSXaml; @@ -122,4 +123,4 @@ void App::OnSuspending(Object^ sender, SuspendingEventArgs^ e) void App::OnNavigationFailed(Platform::Object ^sender, Windows::UI::Xaml::Navigation::NavigationFailedEventArgs ^e) { throw ref new FailureException("Failed to load Page " + e->SourcePageType.Name); -}
\ No newline at end of file +} diff --git a/Tests/VSXaml/MainPage.xaml.cpp b/Tests/VSXaml/MainPage.xaml.cpp index d0a64e8b2a..63f2decf82 100644 --- a/Tests/VSXaml/MainPage.xaml.cpp +++ b/Tests/VSXaml/MainPage.xaml.cpp @@ -4,6 +4,7 @@ // #include "pch.h" + #include "MainPage.xaml.h" using namespace VSXaml; diff --git a/Tests/Wrapping/qtwrappingmain.cxx b/Tests/Wrapping/qtwrappingmain.cxx index fabecfc720..55c7952bac 100644 --- a/Tests/Wrapping/qtwrappingmain.cxx +++ b/Tests/Wrapping/qtwrappingmain.cxx @@ -1,9 +1,9 @@ -#include <qapplication.h> #include "qtwrapping.h" +#include <qapplication.h> #ifndef _WIN32 -# include <stdlib.h> # include <stdio.h> +# include <stdlib.h> #endif int main(int argc, char *argv[]) diff --git a/Tests/X11/HelloWorldX11.cxx b/Tests/X11/HelloWorldX11.cxx index f2b8bdd473..27ab843b6a 100644 --- a/Tests/X11/HelloWorldX11.cxx +++ b/Tests/X11/HelloWorldX11.cxx @@ -19,8 +19,8 @@ /* include the X library headers */ #include <X11/Xlib.h> -#include <X11/Xutil.h> #include <X11/Xos.h> +#include <X11/Xutil.h> class Main { diff --git a/Utilities/Release/WiX/CustomAction/detect_nsis_overwrite.cpp b/Utilities/Release/WiX/CustomAction/detect_nsis_overwrite.cpp index dad1ae5114..d4f628cb93 100644 --- a/Utilities/Release/WiX/CustomAction/detect_nsis_overwrite.cpp +++ b/Utilities/Release/WiX/CustomAction/detect_nsis_overwrite.cpp @@ -1,4 +1,5 @@ #include <windows.h> + #include <msi.h> #include <msiquery.h> |