From d7a5f25599552b0d4dc7af59fef8af1addc090f1 Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 28 Apr 2016 11:16:44 -0400 Subject: [PATCH 1/7] Modules: Remove unused CMakeTestWatcomVersion.c file This file has not been used since commit v2.8.10~218^2~7^2 (Watcom: Simplify compiler version detection, 2012-08-13). --- Modules/CMakeTestWatcomVersion.c | 1 - 1 file changed, 1 deletion(-) delete mode 100644 Modules/CMakeTestWatcomVersion.c diff --git a/Modules/CMakeTestWatcomVersion.c b/Modules/CMakeTestWatcomVersion.c deleted file mode 100644 index 0343fb127..000000000 --- a/Modules/CMakeTestWatcomVersion.c +++ /dev/null @@ -1 +0,0 @@ -VERSION=__WATCOMC__ From 7110b754fe8dc82c4e18c7de72e8eedcec4561da Mon Sep 17 00:00:00 2001 From: Daniel Pfeifer Date: Wed, 27 Apr 2016 22:47:02 +0200 Subject: [PATCH 2/7] CursesDialog: add missing cmState include --- Source/CursesDialog/cmCursesMainForm.h | 1 + 1 file changed, 1 insertion(+) diff --git a/Source/CursesDialog/cmCursesMainForm.h b/Source/CursesDialog/cmCursesMainForm.h index 255c823be..d19416852 100644 --- a/Source/CursesDialog/cmCursesMainForm.h +++ b/Source/CursesDialog/cmCursesMainForm.h @@ -13,6 +13,7 @@ #define cmCursesMainForm_h #include "../cmStandardIncludes.h" +#include "../cmState.h" #include "cmCursesForm.h" #include "cmCursesStandardIncludes.h" From eda313b485a9252c176090a8c358127a2116551d Mon Sep 17 00:00:00 2001 From: Daniel Pfeifer Date: Wed, 27 Apr 2016 23:29:43 +0200 Subject: [PATCH 3/7] Tests: Stabilize include order in StringFileTest This test generates a header file which is not self-contained. Include it in a separate block of includes so that tools that sort includes do not move it. --- Tests/StringFileTest/StringFile.cxx | 1 + 1 file changed, 1 insertion(+) diff --git a/Tests/StringFileTest/StringFile.cxx b/Tests/StringFileTest/StringFile.cxx index 9eba6bff9..073e30c33 100644 --- a/Tests/StringFileTest/StringFile.cxx +++ b/Tests/StringFileTest/StringFile.cxx @@ -1,5 +1,6 @@ #include #include + #include "OutputFile.h" int main(int, char*[]) From eb817be034e0fd50b7abfc3ae032e2e06cbfd040 Mon Sep 17 00:00:00 2001 From: Brad King Date: Fri, 29 Apr 2016 09:07:46 -0400 Subject: [PATCH 4/7] Tests: Stabilize include order in MFC, VSXaml, and VSWinStorePhone These tests use a precompiled header that must be included first. Include the header in an isolated block so that tools that sort includes do not move it. --- Tests/MFC/mfc1/ChildFrm.cpp | 2 ++ Tests/MFC/mfc1/MainFrm.cpp | 1 + Tests/MFC/mfc1/mfc1.cpp | 1 + Tests/MFC/mfc1/mfc1Doc.cpp | 1 + Tests/MFC/mfc1/mfc1View.cpp | 1 + Tests/VSWinStorePhone/Direct3DApp1/CubeRenderer.cpp | 1 + Tests/VSWinStorePhone/Direct3DApp1/Direct3DApp1.cpp | 1 + Tests/VSWinStorePhone/Direct3DApp1/Direct3DApp1.h | 1 + Tests/VSWinStorePhone/Direct3DApp1/Direct3DBase.cpp | 1 + Tests/VSXaml/App.xaml.cpp | 3 ++- Tests/VSXaml/MainPage.xaml.cpp | 1 + 11 files changed, 13 insertions(+), 1 deletion(-) diff --git a/Tests/MFC/mfc1/ChildFrm.cpp b/Tests/MFC/mfc1/ChildFrm.cpp index b04c4f231..889ccebec 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 44554bf4c..222c3dae3 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 9530cd2b9..057e1d573 100644 --- a/Tests/MFC/mfc1/mfc1.cpp +++ b/Tests/MFC/mfc1/mfc1.cpp @@ -2,6 +2,7 @@ // #include "stdafx.h" + #include "mfc1.h" #include "MainFrm.h" diff --git a/Tests/MFC/mfc1/mfc1Doc.cpp b/Tests/MFC/mfc1/mfc1Doc.cpp index 8767052ed..db76b060d 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 06c765230..800030216 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/VSWinStorePhone/Direct3DApp1/CubeRenderer.cpp b/Tests/VSWinStorePhone/Direct3DApp1/CubeRenderer.cpp index f4827f2d6..763238812 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 3dbb97f10..3cfc5891b 100644 --- a/Tests/VSWinStorePhone/Direct3DApp1/Direct3DApp1.cpp +++ b/Tests/VSWinStorePhone/Direct3DApp1/Direct3DApp1.cpp @@ -1,4 +1,5 @@ #include "pch.h" + #include "Direct3DApp1.h" #include "BasicTimer.h" diff --git a/Tests/VSWinStorePhone/Direct3DApp1/Direct3DApp1.h b/Tests/VSWinStorePhone/Direct3DApp1/Direct3DApp1.h index 40b69a173..6861e44ac 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 46727b5ff..f09c8daef 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/VSXaml/App.xaml.cpp b/Tests/VSXaml/App.xaml.cpp index 334dc1f9c..2cb2b3284 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 d0a64e8b2..63f2decf8 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; From 0e7bca923e65df8fda37dd50ca68c7207eb3acbe Mon Sep 17 00:00:00 2001 From: Brad King Date: Fri, 29 Apr 2016 08:49:35 -0400 Subject: [PATCH 5/7] Utilities/Release: Stabilize include order in WiX custom action In `detect_nsis_overwrite.cpp` we include windows.h first, and we must preserve that. Place the include in an isolated block so that tools that sort includes do not move it. --- Utilities/Release/WiX/CustomAction/detect_nsis_overwrite.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/Utilities/Release/WiX/CustomAction/detect_nsis_overwrite.cpp b/Utilities/Release/WiX/CustomAction/detect_nsis_overwrite.cpp index dad1ae511..d4f628cb9 100644 --- a/Utilities/Release/WiX/CustomAction/detect_nsis_overwrite.cpp +++ b/Utilities/Release/WiX/CustomAction/detect_nsis_overwrite.cpp @@ -1,4 +1,5 @@ #include + #include #include From 180538c70634dd6dc7fc68b4afbc1cd288c5b5c6 Mon Sep 17 00:00:00 2001 From: Brad King Date: Fri, 29 Apr 2016 09:40:20 -0400 Subject: [PATCH 6/7] Source: Stabilize include order Each source file has a logical first include file. Include it in an isolated block so that tools that sort includes do not move them. --- Source/CPack/WiX/cmCPackWIXGenerator.h | 4 ++-- Source/CPack/WiX/cmWIXAccessControlList.h | 4 ++-- Source/CPack/WiX/cmWIXFeaturesSourceWriter.h | 1 + Source/CPack/WiX/cmWIXFilesSourceWriter.cxx | 1 + Source/CPack/WiX/cmWIXFilesSourceWriter.h | 1 + Source/CPack/WiX/cmWIXPatchParser.h | 4 ++-- Source/CPack/WiX/cmWIXRichTextFormatWriter.h | 2 ++ Source/CPack/WiX/cmWIXShortcut.h | 4 ++-- Source/CPack/WiX/cmWIXSourceWriter.cxx | 2 -- Source/CPack/WiX/cmWIXSourceWriter.h | 7 ++++--- Source/CPack/cmCPackArchiveGenerator.h | 3 ++- Source/CPack/cmCPackBundleGenerator.cxx | 1 + Source/CPack/cmCPackComponentGroup.cxx | 2 ++ Source/CPack/cmCPackDebGenerator.cxx | 1 + Source/CPack/cmCPackDebGenerator.h | 1 - Source/CPack/cmCPackDragNDropGenerator.cxx | 1 + Source/CPack/cmCPackGenerator.h | 1 + Source/CPack/cmCPackNSISGenerator.h | 2 +- Source/CPack/cmCPackOSXX11Generator.cxx | 1 + Source/CPack/cmCPackPackageMakerGenerator.h | 1 - Source/CPack/cmCPackRPMGenerator.cxx | 1 + Source/CPack/cmCPackRPMGenerator.h | 1 - Source/CPack/cmCPackSTGZGenerator.h | 1 - Source/CPack/cmCPackTarBZip2Generator.cxx | 1 + Source/CTest/cmCTestBatchTestHandler.cxx | 1 + Source/CTest/cmCTestBatchTestHandler.h | 1 + Source/CTest/cmCTestBuildHandler.h | 2 +- Source/CTest/cmCTestConfigureHandler.h | 2 +- Source/CTest/cmCTestCoverageHandler.cxx | 1 + Source/CTest/cmCTestCoverageHandler.h | 2 +- Source/CTest/cmCTestGenericHandler.cxx | 1 + Source/CTest/cmCTestGenericHandler.h | 2 +- Source/CTest/cmCTestLaunch.h | 1 + Source/CTest/cmCTestMemCheckHandler.cxx | 1 + Source/CTest/cmCTestMemCheckHandler.h | 3 +-- Source/CTest/cmCTestMultiProcessHandler.cxx | 1 + Source/CTest/cmCTestMultiProcessHandler.h | 2 +- Source/CTest/cmCTestP4.h | 1 + Source/CTest/cmCTestReadCustomFilesCommand.cxx | 1 + Source/CTest/cmCTestRunTest.cxx | 1 + Source/CTest/cmCTestRunTest.h | 2 +- Source/CTest/cmCTestScriptHandler.h | 2 +- Source/CTest/cmCTestSubmitCommand.h | 1 + Source/CTest/cmCTestSubmitHandler.cxx | 1 + Source/CTest/cmCTestTestHandler.cxx | 1 + Source/CTest/cmCTestTestHandler.h | 2 +- Source/CTest/cmCTestUpdateHandler.h | 2 +- Source/CTest/cmCTestUploadCommand.h | 1 + Source/CTest/cmParseBlanketJSCoverage.cxx | 4 ++-- Source/CTest/cmParseBlanketJSCoverage.h | 1 - Source/CTest/cmParseCacheCoverage.cxx | 4 ++-- Source/CTest/cmParseCoberturaCoverage.cxx | 4 ++-- Source/CTest/cmParseCoberturaCoverage.h | 1 - Source/CTest/cmParseDelphiCoverage.cxx | 4 ++-- Source/CTest/cmParseDelphiCoverage.h | 1 - Source/CTest/cmParseGTMCoverage.cxx | 4 ++-- Source/CTest/cmParseJacocoCoverage.cxx | 4 ++-- Source/CTest/cmParseJacocoCoverage.h | 1 - Source/CTest/cmParseMumpsCoverage.cxx | 4 ++-- Source/CTest/cmParseMumpsCoverage.h | 1 - Source/CTest/cmParsePHPCoverage.cxx | 4 ++-- Source/CTest/cmParsePHPCoverage.h | 1 - Source/CTest/cmProcess.cxx | 1 + Source/CTest/cmProcess.h | 2 +- Source/CursesDialog/ccmake.cxx | 3 ++- Source/CursesDialog/cmCursesBoolWidget.cxx | 1 + Source/CursesDialog/cmCursesBoolWidget.h | 1 + Source/CursesDialog/cmCursesCacheEntryComposite.cxx | 1 + Source/CursesDialog/cmCursesForm.h | 2 +- Source/CursesDialog/cmCursesLabelWidget.h | 1 - Source/CursesDialog/cmCursesLongMessageForm.cxx | 3 ++- Source/CursesDialog/cmCursesLongMessageForm.h | 4 ++-- Source/CursesDialog/cmCursesMainForm.cxx | 3 ++- Source/CursesDialog/cmCursesMainForm.h | 4 ++-- Source/CursesDialog/cmCursesOptionsWidget.cxx | 1 + Source/CursesDialog/cmCursesOptionsWidget.h | 1 + Source/CursesDialog/cmCursesStandardIncludes.h | 3 +++ Source/CursesDialog/cmCursesStringWidget.cxx | 1 + Source/CursesDialog/cmCursesWidget.h | 3 ++- Source/QtDialog/AddCacheEntry.cxx | 1 + Source/QtDialog/AddCacheEntry.h | 3 ++- Source/QtDialog/CMakeSetup.cxx | 1 + Source/QtDialog/CMakeSetupDialog.cxx | 1 + Source/QtDialog/CMakeSetupDialog.h | 1 + Source/QtDialog/Compilers.h | 1 + Source/QtDialog/FirstConfigure.cxx | 1 + Source/QtDialog/FirstConfigure.h | 2 ++ Source/QtDialog/QCMake.h | 5 +++-- Source/QtDialog/QCMakeCacheView.h | 1 + Source/QtDialog/QCMakeWidgets.h | 1 + Source/cmAddDependenciesCommand.cxx | 1 + Source/cmAuxSourceDirectoryCommand.cxx | 1 + Source/cmCPluginAPI.cxx | 3 ++- Source/cmCTest.cxx | 1 + Source/cmCTest.h | 1 + Source/cmCacheManager.cxx | 2 +- Source/cmCacheManager.h | 1 + Source/cmCallVisualStudioMacro.cxx | 2 +- Source/cmCommand.h | 1 + Source/cmCommands.h | 1 + Source/cmComputeLinkDepends.h | 2 +- Source/cmConditionEvaluator.cxx | 1 + Source/cmCoreTryCompile.cxx | 1 + Source/cmCreateTestSourceList.cxx | 1 + Source/cmCurl.cxx | 1 + Source/cmCurl.h | 4 ++-- Source/cmCustomCommand.h | 1 + Source/cmDefinePropertyCommand.cxx | 1 + Source/cmDependsC.h | 1 + Source/cmDocumentation.h | 1 + Source/cmDocumentationSection.h | 1 - Source/cmELF.cxx | 1 + Source/cmEndIfCommand.cxx | 1 + Source/cmExecProgramCommand.cxx | 1 + Source/cmExecuteProcessCommand.cxx | 1 + Source/cmExportCommand.cxx | 1 + Source/cmExportLibraryDependenciesCommand.cxx | 1 + Source/cmExportSet.cxx | 1 + Source/cmExportSet.h | 1 + Source/cmExportSetMap.cxx | 1 + Source/cmExportSetMap.h | 1 + Source/cmExternalMakefileProjectGenerator.cxx | 3 ++- Source/cmExtraCodeBlocksGenerator.cxx | 1 + Source/cmExtraCodeLiteGenerator.cxx | 1 + Source/cmExtraEclipseCDT4Generator.cxx | 1 + Source/cmExtraKateGenerator.cxx | 1 + Source/cmExtraSublimeTextGenerator.cxx | 1 + Source/cmFileCommand.cxx | 1 + Source/cmFindCommon.cxx | 1 + Source/cmFindFileCommand.cxx | 1 + Source/cmFindLibraryCommand.cxx | 1 + Source/cmFindProgramCommand.cxx | 1 + Source/cmForEachCommand.h | 1 + Source/cmFunctionBlocker.h | 1 + Source/cmFunctionCommand.h | 1 + Source/cmGeneratedFileStream.h | 1 + Source/cmGeneratorExpression.h | 1 + Source/cmGeneratorExpressionContext.cxx | 1 + Source/cmGeneratorExpressionEvaluationFile.h | 5 ++--- Source/cmGeneratorExpressionEvaluator.cxx | 4 ++-- Source/cmGeneratorExpressionEvaluator.h | 3 ++- Source/cmGeneratorExpressionNode.cxx | 1 + Source/cmGeneratorExpressionNode.h | 3 ++- Source/cmGetFilenameComponentCommand.cxx | 1 + Source/cmGhsMultiGpj.h | 2 ++ Source/cmGhsMultiTargetGenerator.cxx | 1 + Source/cmGhsMultiTargetGenerator.h | 4 ++-- Source/cmGlobalBorlandMakefileGenerator.cxx | 1 + Source/cmGlobalGenerator.cxx | 1 + Source/cmGlobalGhsMultiGenerator.cxx | 1 + Source/cmGlobalGhsMultiGenerator.h | 3 ++- Source/cmGlobalJOMMakefileGenerator.cxx | 1 + Source/cmGlobalKdevelopGenerator.cxx | 1 + Source/cmGlobalMSYSMakefileGenerator.cxx | 1 + Source/cmGlobalMinGWMakefileGenerator.cxx | 1 + Source/cmGlobalNMakeMakefileGenerator.cxx | 1 + Source/cmGlobalNinjaGenerator.cxx | 3 ++- Source/cmGlobalNinjaGenerator.h | 9 +++++---- Source/cmGlobalUnixMakefileGenerator3.cxx | 1 + Source/cmGlobalUnixMakefileGenerator3.h | 1 + Source/cmGlobalVisualStudio10Generator.cxx | 2 ++ Source/cmGlobalVisualStudio11Generator.cxx | 1 + Source/cmGlobalVisualStudio12Generator.cxx | 1 + Source/cmGlobalVisualStudio14Generator.cxx | 1 + Source/cmGlobalVisualStudio71Generator.cxx | 2 ++ Source/cmGlobalVisualStudio7Generator.cxx | 5 ++++- Source/cmGlobalVisualStudio7Generator.h | 1 + Source/cmGlobalVisualStudio8Generator.cxx | 2 ++ Source/cmGlobalVisualStudio9Generator.cxx | 2 ++ Source/cmGlobalWatcomWMakeGenerator.cxx | 1 + Source/cmGlobalXCodeGenerator.cxx | 1 + Source/cmGlobalXCodeGenerator.h | 1 + Source/cmGraphVizWriter.cxx | 1 + Source/cmGraphVizWriter.h | 6 ++++-- Source/cmHexFileConverter.h | 2 ++ Source/cmIDEOptions.h | 1 + Source/cmIfCommand.cxx | 1 + Source/cmIfCommand.h | 1 + Source/cmInstallCommandArguments.cxx | 1 + Source/cmInstallCommandArguments.h | 1 + Source/cmInstallProgramsCommand.cxx | 1 + Source/cmInstalledFile.cxx | 1 + Source/cmListCommand.cxx | 1 + Source/cmLoadCommandCommand.cxx | 1 + Source/cmLocalGenerator.h | 1 + Source/cmLocalGhsMultiGenerator.cxx | 1 + Source/cmLocalNinjaGenerator.cxx | 1 + Source/cmLocalNinjaGenerator.h | 7 ++++--- Source/cmLocalVisualStudio10Generator.cxx | 2 ++ Source/cmLocalVisualStudio7Generator.cxx | 3 ++- Source/cmLocalVisualStudio7Generator.h | 1 + Source/cmLocalVisualStudioGenerator.cxx | 1 + Source/cmLocalVisualStudioGenerator.h | 1 + Source/cmLocalXCodeGenerator.cxx | 1 + Source/cmLocale.h | 2 ++ Source/cmMachO.cxx | 1 + Source/cmMacroCommand.h | 1 + Source/cmMakefile.cxx | 1 + Source/cmMakefile.h | 2 ++ Source/cmNinjaNormalTargetGenerator.cxx | 1 + Source/cmNinjaNormalTargetGenerator.h | 10 +++++----- Source/cmNinjaTargetGenerator.cxx | 1 + Source/cmNinjaTargetGenerator.h | 1 - Source/cmNinjaTypes.h | 4 +++- Source/cmNinjaUtilityTargetGenerator.cxx | 1 + Source/cmNinjaUtilityTargetGenerator.h | 7 ++++--- Source/cmOSXBundleGenerator.cxx | 1 + Source/cmOSXBundleGenerator.h | 1 + Source/cmOutputRequiredFilesCommand.cxx | 1 + Source/cmParseArgumentsCommand.cxx | 1 + Source/cmPolicies.cxx | 1 + Source/cmProperty.cxx | 1 + Source/cmPropertyDefinition.cxx | 1 + Source/cmPropertyDefinitionMap.cxx | 1 + Source/cmPropertyMap.cxx | 1 + Source/cmQtAutoGenerators.cxx | 4 ++-- Source/cmQtAutoGenerators.h | 2 ++ Source/cmSearchPath.cxx | 2 +- Source/cmSetPropertyCommand.cxx | 1 + Source/cmSetTargetPropertiesCommand.cxx | 1 + Source/cmSourceFile.h | 1 + Source/cmSourceGroup.h | 1 + Source/cmStandardIncludes.h | 1 + Source/cmState.h | 1 + Source/cmStringCommand.cxx | 1 + Source/cmSystemTools.cxx | 3 ++- Source/cmTarget.cxx | 1 + Source/cmTarget.h | 2 ++ Source/cmTest.cxx | 1 + Source/cmTest.h | 2 ++ Source/cmTimestamp.h | 2 ++ Source/cmTryRunCommand.cxx | 1 + Source/cmUseMangledMesaCommand.cxx | 1 + Source/cmVariableRequiresCommand.cxx | 1 + Source/cmVisualStudio10TargetGenerator.cxx | 3 ++- Source/cmVisualStudio10TargetGenerator.h | 1 + Source/cmVisualStudioGeneratorOptions.cxx | 1 + Source/cmVisualStudioWCEPlatformParser.cxx | 1 + Source/cmVisualStudioWCEPlatformParser.h | 1 + Source/cmWhileCommand.cxx | 1 + Source/cmWhileCommand.h | 1 + Source/cmWriteFileCommand.cxx | 1 + Source/cmXCode21Object.cxx | 1 + Source/cmXCodeObject.cxx | 1 + Source/cmXCodeObject.h | 1 + Source/cmXMLParser.cxx | 1 + Source/cmXMLSafe.h | 1 + Source/cmXMLWriter.cxx | 1 + Source/cmXMLWriter.h | 1 + Source/cmake.cxx | 1 + Source/cmake.h | 2 ++ Source/cmakexbuild.cxx | 3 ++- Source/cmcldeps.cxx | 4 ++-- Source/cmcmd.cxx | 1 + 254 files changed, 322 insertions(+), 114 deletions(-) diff --git a/Source/CPack/WiX/cmCPackWIXGenerator.h b/Source/CPack/WiX/cmCPackWIXGenerator.h index 3f66b2c02..8372cd6bb 100644 --- a/Source/CPack/WiX/cmCPackWIXGenerator.h +++ b/Source/CPack/WiX/cmCPackWIXGenerator.h @@ -13,11 +13,11 @@ #ifndef cmCPackWIXGenerator_h #define cmCPackWIXGenerator_h +#include + #include "cmWIXPatch.h" #include "cmWIXShortcut.h" -#include - #include #include diff --git a/Source/CPack/WiX/cmWIXAccessControlList.h b/Source/CPack/WiX/cmWIXAccessControlList.h index 20902f768..54c2c19b4 100644 --- a/Source/CPack/WiX/cmWIXAccessControlList.h +++ b/Source/CPack/WiX/cmWIXAccessControlList.h @@ -13,11 +13,11 @@ #ifndef cmWIXAccessControlList_h #define cmWIXAccessControlList_h +#include "cmWIXSourceWriter.h" + #include #include -#include "cmWIXSourceWriter.h" - class cmWIXAccessControlList { public: diff --git a/Source/CPack/WiX/cmWIXFeaturesSourceWriter.h b/Source/CPack/WiX/cmWIXFeaturesSourceWriter.h index 767041755..ff12e6c4a 100644 --- a/Source/CPack/WiX/cmWIXFeaturesSourceWriter.h +++ b/Source/CPack/WiX/cmWIXFeaturesSourceWriter.h @@ -14,6 +14,7 @@ #define cmWIXFeaturesSourceWriter_h #include "cmWIXSourceWriter.h" + #include /** \class cmWIXFeaturesSourceWriter diff --git a/Source/CPack/WiX/cmWIXFilesSourceWriter.cxx b/Source/CPack/WiX/cmWIXFilesSourceWriter.cxx index d4698a764..446ce9639 100644 --- a/Source/CPack/WiX/cmWIXFilesSourceWriter.cxx +++ b/Source/CPack/WiX/cmWIXFilesSourceWriter.cxx @@ -11,6 +11,7 @@ ============================================================================*/ #include "cmWIXFilesSourceWriter.h" + #include "cmWIXAccessControlList.h" #include diff --git a/Source/CPack/WiX/cmWIXFilesSourceWriter.h b/Source/CPack/WiX/cmWIXFilesSourceWriter.h index c48bc15ba..9df955ba9 100644 --- a/Source/CPack/WiX/cmWIXFilesSourceWriter.h +++ b/Source/CPack/WiX/cmWIXFilesSourceWriter.h @@ -14,6 +14,7 @@ #define cmWIXFilesSourceWriter_h #include "cmWIXSourceWriter.h" + #include "cmWIXShortcut.h" #include "cmWIXPatch.h" diff --git a/Source/CPack/WiX/cmWIXPatchParser.h b/Source/CPack/WiX/cmWIXPatchParser.h index acaeae364..42c0787f8 100644 --- a/Source/CPack/WiX/cmWIXPatchParser.h +++ b/Source/CPack/WiX/cmWIXPatchParser.h @@ -13,10 +13,10 @@ #ifndef cmCPackWIXPatchParser_h #define cmCPackWIXPatchParser_h -#include - #include +#include + #include #include diff --git a/Source/CPack/WiX/cmWIXRichTextFormatWriter.h b/Source/CPack/WiX/cmWIXRichTextFormatWriter.h index f6327fbd5..acf1fa6f4 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 /** \class cmWIXRichtTextFormatWriter diff --git a/Source/CPack/WiX/cmWIXShortcut.h b/Source/CPack/WiX/cmWIXShortcut.h index 5945e4367..2a72394c5 100644 --- a/Source/CPack/WiX/cmWIXShortcut.h +++ b/Source/CPack/WiX/cmWIXShortcut.h @@ -13,13 +13,13 @@ #ifndef cmWIXShortcut_h #define cmWIXShortcut_h +#include + #include #include #include #include -#include - class cmWIXFilesSourceWriter; struct cmWIXShortcut diff --git a/Source/CPack/WiX/cmWIXSourceWriter.cxx b/Source/CPack/WiX/cmWIXSourceWriter.cxx index 63acb278f..2e5194c20 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 diff --git a/Source/CPack/WiX/cmWIXSourceWriter.h b/Source/CPack/WiX/cmWIXSourceWriter.h index 9e303f0d8..be0c169e3 100644 --- a/Source/CPack/WiX/cmWIXSourceWriter.h +++ b/Source/CPack/WiX/cmWIXSourceWriter.h @@ -13,11 +13,12 @@ #ifndef cmWIXSourceWriter_h #define cmWIXSourceWriter_h -#include -#include +#include + #include -#include +#include +#include /** \class cmWIXSourceWriter * \brief Helper class to generate XML WiX source files diff --git a/Source/CPack/cmCPackArchiveGenerator.h b/Source/CPack/cmCPackArchiveGenerator.h index 16e7632de..8b0733959 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 b2d701944..e86667d5d 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 fd20e9b20..2d41e59e7 100644 --- a/Source/CPack/cmCPackComponentGroup.cxx +++ b/Source/CPack/cmCPackComponentGroup.cxx @@ -11,7 +11,9 @@ ============================================================================*/ #include "cmCPackComponentGroup.h" + #include "cmSystemTools.h" + #include #include diff --git a/Source/CPack/cmCPackDebGenerator.cxx b/Source/CPack/cmCPackDebGenerator.cxx index 13c8d8f6c..96739427e 100644 --- a/Source/CPack/cmCPackDebGenerator.cxx +++ b/Source/CPack/cmCPackDebGenerator.cxx @@ -9,6 +9,7 @@ implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License for more information. ============================================================================*/ + #include "cmCPackDebGenerator.h" #include "cmSystemTools.h" diff --git a/Source/CPack/cmCPackDebGenerator.h b/Source/CPack/cmCPackDebGenerator.h index d678cfacf..3d945dd2a 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 d6de77df9..eccc5cf56 100644 --- a/Source/CPack/cmCPackDragNDropGenerator.cxx +++ b/Source/CPack/cmCPackDragNDropGenerator.cxx @@ -11,6 +11,7 @@ ============================================================================*/ #include "cmCPackDragNDropGenerator.h" + #include "cmCPackLog.h" #include "cmSystemTools.h" #include "cmGeneratedFileStream.h" diff --git a/Source/CPack/cmCPackGenerator.h b/Source/CPack/cmCPackGenerator.h index 907bb1ee1..3a53d0522 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 #include diff --git a/Source/CPack/cmCPackNSISGenerator.h b/Source/CPack/cmCPackNSISGenerator.h index c7b2ce108..ab8ece472 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 /** \class cmCPackNSISGenerator diff --git a/Source/CPack/cmCPackOSXX11Generator.cxx b/Source/CPack/cmCPackOSXX11Generator.cxx index 8940f5415..cde08b10d 100644 --- a/Source/CPack/cmCPackOSXX11Generator.cxx +++ b/Source/CPack/cmCPackOSXX11Generator.cxx @@ -9,6 +9,7 @@ implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License for more information. ============================================================================*/ + #include "cmCPackOSXX11Generator.h" #include "cmake.h" diff --git a/Source/CPack/cmCPackPackageMakerGenerator.h b/Source/CPack/cmCPackPackageMakerGenerator.h index 7d349c662..4e8ff03b4 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 71ab3a0d5..706f43a68 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 a7722bc58..a4a1ba87a 100644 --- a/Source/CPack/cmCPackRPMGenerator.h +++ b/Source/CPack/cmCPackRPMGenerator.h @@ -13,7 +13,6 @@ #ifndef cmCPackRPMGenerator_h #define cmCPackRPMGenerator_h - #include "cmCPackGenerator.h" /** \class cmCPackRPMGenerator diff --git a/Source/CPack/cmCPackSTGZGenerator.h b/Source/CPack/cmCPackSTGZGenerator.h index ccceec806..08152b5b2 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 9ff588b3f..da16737d4 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/CTest/cmCTestBatchTestHandler.cxx b/Source/CTest/cmCTestBatchTestHandler.cxx index d62c260d6..e462d4aab 100644 --- a/Source/CTest/cmCTestBatchTestHandler.cxx +++ b/Source/CTest/cmCTestBatchTestHandler.cxx @@ -11,6 +11,7 @@ ============================================================================*/ #include "cmCTestBatchTestHandler.h" + #include "cmProcess.h" #include "cmStandardIncludes.h" #include "cmCTest.h" diff --git a/Source/CTest/cmCTestBatchTestHandler.h b/Source/CTest/cmCTestBatchTestHandler.h index e0c6e48d5..5ff002583 100644 --- a/Source/CTest/cmCTestBatchTestHandler.h +++ b/Source/CTest/cmCTestBatchTestHandler.h @@ -14,6 +14,7 @@ #define cmCTestBatchTestHandler_h #include + #include #include #include diff --git a/Source/CTest/cmCTestBuildHandler.h b/Source/CTest/cmCTestBuildHandler.h index 2e9b92a70..923117021 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 diff --git a/Source/CTest/cmCTestConfigureHandler.h b/Source/CTest/cmCTestConfigureHandler.h index d880bd7df..4c1a96b02 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 fd6269670..b05496add 100644 --- a/Source/CTest/cmCTestCoverageHandler.cxx +++ b/Source/CTest/cmCTestCoverageHandler.cxx @@ -10,6 +10,7 @@ See the License for more information. ============================================================================*/ #include "cmCTestCoverageHandler.h" + #include "cmParsePHPCoverage.h" #include "cmParseCoberturaCoverage.h" #include "cmParseGTMCoverage.h" diff --git a/Source/CTest/cmCTestCoverageHandler.h b/Source/CTest/cmCTestCoverageHandler.h index 7102d1e67..c91a2d7db 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 diff --git a/Source/CTest/cmCTestGenericHandler.cxx b/Source/CTest/cmCTestGenericHandler.cxx index ad79ba2b1..7eccb9c43 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 4b7ae7901..7a7e03431 100644 --- a/Source/CTest/cmCTestGenericHandler.h +++ b/Source/CTest/cmCTestGenericHandler.h @@ -13,8 +13,8 @@ #ifndef cmCTestGenericHandler_h #define cmCTestGenericHandler_h - #include "cmObject.h" + #include "cmCTest.h" #include "cmSystemTools.h" //OutputOption diff --git a/Source/CTest/cmCTestLaunch.h b/Source/CTest/cmCTestLaunch.h index b13e4847b..1a908a3fd 100644 --- a/Source/CTest/cmCTestLaunch.h +++ b/Source/CTest/cmCTestLaunch.h @@ -13,6 +13,7 @@ #define cmCTestLaunch_h #include "cmStandardIncludes.h" + #include class cmXMLWriter; diff --git a/Source/CTest/cmCTestMemCheckHandler.cxx b/Source/CTest/cmCTestMemCheckHandler.cxx index acf527acd..3d0f16add 100644 --- a/Source/CTest/cmCTestMemCheckHandler.cxx +++ b/Source/CTest/cmCTestMemCheckHandler.cxx @@ -11,6 +11,7 @@ ============================================================================*/ #include "cmCTestMemCheckHandler.h" + #include "cmXMLParser.h" #include "cmCTest.h" #include "cmake.h" diff --git a/Source/CTest/cmCTestMemCheckHandler.h b/Source/CTest/cmCTestMemCheckHandler.h index f1ac794dc..01311b634 100644 --- a/Source/CTest/cmCTestMemCheckHandler.h +++ b/Source/CTest/cmCTestMemCheckHandler.h @@ -13,9 +13,8 @@ #ifndef cmCTestMemCheckHandler_h #define cmCTestMemCheckHandler_h - #include "cmCTestTestHandler.h" -#include "cmStandardIncludes.h" + #include "cmListFileCache.h" #include #include diff --git a/Source/CTest/cmCTestMultiProcessHandler.cxx b/Source/CTest/cmCTestMultiProcessHandler.cxx index 7c7f5dfe2..df6aff1c8 100644 --- a/Source/CTest/cmCTestMultiProcessHandler.cxx +++ b/Source/CTest/cmCTestMultiProcessHandler.cxx @@ -10,6 +10,7 @@ See the License for more information. ============================================================================*/ #include "cmCTestMultiProcessHandler.h" + #include "cmProcess.h" #include "cmStandardIncludes.h" #include "cmCTest.h" diff --git a/Source/CTest/cmCTestMultiProcessHandler.h b/Source/CTest/cmCTestMultiProcessHandler.h index ed3e155a0..64e56e605 100644 --- a/Source/CTest/cmCTestMultiProcessHandler.h +++ b/Source/CTest/cmCTestMultiProcessHandler.h @@ -12,8 +12,8 @@ #ifndef cmCTestMultiProcessHandler_h #define cmCTestMultiProcessHandler_h -#include #include + #include /** \class cmCTestMultiProcessHandler diff --git a/Source/CTest/cmCTestP4.h b/Source/CTest/cmCTestP4.h index 7a53475fd..6f907d10b 100644 --- a/Source/CTest/cmCTestP4.h +++ b/Source/CTest/cmCTestP4.h @@ -13,6 +13,7 @@ #define cmCTestP4_h #include "cmCTestGlobalVC.h" + #include #include diff --git a/Source/CTest/cmCTestReadCustomFilesCommand.cxx b/Source/CTest/cmCTestReadCustomFilesCommand.cxx index 3b9d5527a..5db01f98d 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 f329e7719..34ad2d023 100644 --- a/Source/CTest/cmCTestRunTest.cxx +++ b/Source/CTest/cmCTestRunTest.cxx @@ -11,6 +11,7 @@ ============================================================================*/ #include "cmCTestRunTest.h" + #include "cmCTestMemCheckHandler.h" #include "cmCTest.h" #include "cmSystemTools.h" diff --git a/Source/CTest/cmCTestRunTest.h b/Source/CTest/cmCTestRunTest.h index 3b5c83160..5f3467a87 100644 --- a/Source/CTest/cmCTestRunTest.h +++ b/Source/CTest/cmCTestRunTest.h @@ -12,8 +12,8 @@ #ifndef cmCTestRunTest_h #define cmCTestRunTest_h -#include #include + #include /** \class cmRunTest diff --git a/Source/CTest/cmCTestScriptHandler.h b/Source/CTest/cmCTestScriptHandler.h index c9d0b6a3c..2b66f7049 100644 --- a/Source/CTest/cmCTestScriptHandler.h +++ b/Source/CTest/cmCTestScriptHandler.h @@ -13,8 +13,8 @@ #ifndef cmCTestScriptHandler_h #define cmCTestScriptHandler_h - #include "cmCTestGenericHandler.h" + #include "cmListFileCache.h" class cmMakefile; diff --git a/Source/CTest/cmCTestSubmitCommand.h b/Source/CTest/cmCTestSubmitCommand.h index 19e8eafb5..ebc8c3641 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 833cad6f0..3b682e39a 100644 --- a/Source/CTest/cmCTestSubmitHandler.cxx +++ b/Source/CTest/cmCTestSubmitHandler.cxx @@ -10,6 +10,7 @@ See the License for more information. ============================================================================*/ #include "cmCTestSubmitHandler.h" + #include "cmCTestScriptHandler.h" #include "cmake.h" #include "cmSystemTools.h" diff --git a/Source/CTest/cmCTestTestHandler.cxx b/Source/CTest/cmCTestTestHandler.cxx index 59ed98eb0..f91fa5fe1 100644 --- a/Source/CTest/cmCTestTestHandler.cxx +++ b/Source/CTest/cmCTestTestHandler.cxx @@ -11,6 +11,7 @@ ============================================================================*/ #include "cmCTestTestHandler.h" + #include "cmCTestMultiProcessHandler.h" #include "cmCTestBatchTestHandler.h" #include "cmCTest.h" diff --git a/Source/CTest/cmCTestTestHandler.h b/Source/CTest/cmCTestTestHandler.h index d12c2b643..28338dd63 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 class cmMakefile; diff --git a/Source/CTest/cmCTestUpdateHandler.h b/Source/CTest/cmCTestUpdateHandler.h index d2423c0d5..463703c3d 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 4a07608d2..18022543c 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 1edd01f48..26dd425f7 100644 --- a/Source/CTest/cmParseBlanketJSCoverage.cxx +++ b/Source/CTest/cmParseBlanketJSCoverage.cxx @@ -9,11 +9,11 @@ implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License for more information. ============================================================================*/ -#include "cmStandardIncludes.h" +#include "cmParseBlanketJSCoverage.h" + #include #include #include "cmSystemTools.h" -#include "cmParseBlanketJSCoverage.h" #include #include #include diff --git a/Source/CTest/cmParseBlanketJSCoverage.h b/Source/CTest/cmParseBlanketJSCoverage.h index fc1d47747..d34492d84 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 92bf88eaf..38e0ac226 100644 --- a/Source/CTest/cmParseCacheCoverage.cxx +++ b/Source/CTest/cmParseCacheCoverage.cxx @@ -1,8 +1,8 @@ -#include "cmStandardIncludes.h" +#include "cmParseCacheCoverage.h" + #include #include #include "cmSystemTools.h" -#include "cmParseCacheCoverage.h" #include #include #include diff --git a/Source/CTest/cmParseCoberturaCoverage.cxx b/Source/CTest/cmParseCoberturaCoverage.cxx index 515d041f0..5b4a37660 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 #include diff --git a/Source/CTest/cmParseCoberturaCoverage.h b/Source/CTest/cmParseCoberturaCoverage.h index ff5954dd1..c3e3ec98e 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 e453fe167..ed526263a 100644 --- a/Source/CTest/cmParseDelphiCoverage.cxx +++ b/Source/CTest/cmParseDelphiCoverage.cxx @@ -1,9 +1,9 @@ -#include "cmStandardIncludes.h" +#include "cmParseDelphiCoverage.h" + #include #include #include "cmSystemTools.h" #include "cmXMLParser.h" -#include "cmParseDelphiCoverage.h" #include #include #include diff --git a/Source/CTest/cmParseDelphiCoverage.h b/Source/CTest/cmParseDelphiCoverage.h index 018340b2e..2c3f3b31f 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 f3f80084d..56922468f 100644 --- a/Source/CTest/cmParseGTMCoverage.cxx +++ b/Source/CTest/cmParseGTMCoverage.cxx @@ -1,8 +1,8 @@ -#include "cmStandardIncludes.h" +#include "cmParseGTMCoverage.h" + #include #include #include "cmSystemTools.h" -#include "cmParseGTMCoverage.h" #include #include #include diff --git a/Source/CTest/cmParseJacocoCoverage.cxx b/Source/CTest/cmParseJacocoCoverage.cxx index 47e3b3267..f5386c952 100644 --- a/Source/CTest/cmParseJacocoCoverage.cxx +++ b/Source/CTest/cmParseJacocoCoverage.cxx @@ -1,9 +1,9 @@ -#include "cmStandardIncludes.h" +#include "cmParseJacocoCoverage.h" + #include #include #include "cmSystemTools.h" #include "cmXMLParser.h" -#include "cmParseJacocoCoverage.h" #include #include #include diff --git a/Source/CTest/cmParseJacocoCoverage.h b/Source/CTest/cmParseJacocoCoverage.h index dad05a32e..cf86508fd 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 225e704d9..65679064a 100644 --- a/Source/CTest/cmParseMumpsCoverage.cxx +++ b/Source/CTest/cmParseMumpsCoverage.cxx @@ -1,8 +1,8 @@ -#include "cmStandardIncludes.h" +#include "cmParseGTMCoverage.h" + #include #include #include "cmSystemTools.h" -#include "cmParseGTMCoverage.h" #include #include #include diff --git a/Source/CTest/cmParseMumpsCoverage.h b/Source/CTest/cmParseMumpsCoverage.h index bc7189168..ab957b88b 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 c7f5a684d..7c2901ed2 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 #include diff --git a/Source/CTest/cmParsePHPCoverage.h b/Source/CTest/cmParsePHPCoverage.h index 92a76347f..706d0366f 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 644188648..c9a461845 100644 --- a/Source/CTest/cmProcess.cxx +++ b/Source/CTest/cmProcess.cxx @@ -11,6 +11,7 @@ ============================================================================*/ #include + #include cmProcess::cmProcess() diff --git a/Source/CTest/cmProcess.h b/Source/CTest/cmProcess.h index c9fd85999..326456e66 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 diff --git a/Source/CursesDialog/ccmake.cxx b/Source/CursesDialog/ccmake.cxx index 5236e57d5..7bff0f086 100644 --- a/Source/CursesDialog/ccmake.cxx +++ b/Source/CursesDialog/ccmake.cxx @@ -9,6 +9,8 @@ implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License for more information. ============================================================================*/ +#include "cmCursesStandardIncludes.h" + #include "../cmSystemTools.h" #include "../cmake.h" #include "../cmDocumentation.h" @@ -17,7 +19,6 @@ #include #include "cmCursesMainForm.h" -#include "cmCursesStandardIncludes.h" #include #include diff --git a/Source/CursesDialog/cmCursesBoolWidget.cxx b/Source/CursesDialog/cmCursesBoolWidget.cxx index 29d9cb23b..0529b7823 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 8a57c73da..65a8ddb85 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 7e0924212..ace5c435c 100644 --- a/Source/CursesDialog/cmCursesCacheEntryComposite.cxx +++ b/Source/CursesDialog/cmCursesCacheEntryComposite.cxx @@ -10,6 +10,7 @@ See the License for more information. ============================================================================*/ #include "cmCursesCacheEntryComposite.h" + #include "cmCursesOptionsWidget.h" #include "cmCursesStringWidget.h" #include "cmCursesLabelWidget.h" diff --git a/Source/CursesDialog/cmCursesForm.h b/Source/CursesDialog/cmCursesForm.h index 9837f5aa3..2c4549451 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 class cmCursesForm diff --git a/Source/CursesDialog/cmCursesLabelWidget.h b/Source/CursesDialog/cmCursesLabelWidget.h index 98170f581..c31a58cac 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 6144ddc2b..cd8f3f163 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 "cmCursesMainForm.h" inline int ctrl(int z) diff --git a/Source/CursesDialog/cmCursesLongMessageForm.h b/Source/CursesDialog/cmCursesLongMessageForm.h index 6e37eeade..e9bd542c4 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 a2fc2c0ca..8c2a8b46b 100644 --- a/Source/CursesDialog/cmCursesMainForm.cxx +++ b/Source/CursesDialog/cmCursesMainForm.cxx @@ -9,10 +9,11 @@ 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 "cmCursesBoolWidget.h" diff --git a/Source/CursesDialog/cmCursesMainForm.h b/Source/CursesDialog/cmCursesMainForm.h index d19416852..9a80ba20c 100644 --- a/Source/CursesDialog/cmCursesMainForm.h +++ b/Source/CursesDialog/cmCursesMainForm.h @@ -12,10 +12,10 @@ #ifndef cmCursesMainForm_h #define cmCursesMainForm_h -#include "../cmStandardIncludes.h" +#include "cmCursesStandardIncludes.h" + #include "../cmState.h" #include "cmCursesForm.h" -#include "cmCursesStandardIncludes.h" class cmCursesCacheEntryComposite; class cmCursesWidget; diff --git a/Source/CursesDialog/cmCursesOptionsWidget.cxx b/Source/CursesDialog/cmCursesOptionsWidget.cxx index 30110a496..05aeab1cd 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 324014eae..ba359d3bb 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 6047ec579..69a05b2ee 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 1c832ddfd..6bd7b4500 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 7bbdff109..1f53786e0 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 3881045bd..b575f757e 100644 --- a/Source/QtDialog/AddCacheEntry.cxx +++ b/Source/QtDialog/AddCacheEntry.cxx @@ -11,6 +11,7 @@ ============================================================================*/ #include "AddCacheEntry.h" + #include #include diff --git a/Source/QtDialog/AddCacheEntry.h b/Source/QtDialog/AddCacheEntry.h index 38c3a7444..c327915b0 100644 --- a/Source/QtDialog/AddCacheEntry.h +++ b/Source/QtDialog/AddCacheEntry.h @@ -13,11 +13,12 @@ #ifndef AddCacheEntry_h #define AddCacheEntry_h +#include "QCMake.h" + #include #include #include -#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 cff4f6f53..72adb8d75 100644 --- a/Source/QtDialog/CMakeSetup.cxx +++ b/Source/QtDialog/CMakeSetup.cxx @@ -10,6 +10,7 @@ See the License for more information. ============================================================================*/ #include "QCMake.h" // include to disable MS warnings + #include #include #include diff --git a/Source/QtDialog/CMakeSetupDialog.cxx b/Source/QtDialog/CMakeSetupDialog.cxx index 2fc4fafdc..f25f40232 100644 --- a/Source/QtDialog/CMakeSetupDialog.cxx +++ b/Source/QtDialog/CMakeSetupDialog.cxx @@ -11,6 +11,7 @@ ============================================================================*/ #include "CMakeSetupDialog.h" + #include #include #include diff --git a/Source/QtDialog/CMakeSetupDialog.h b/Source/QtDialog/CMakeSetupDialog.h index 4b53b1cbd..eaac61c6a 100644 --- a/Source/QtDialog/CMakeSetupDialog.h +++ b/Source/QtDialog/CMakeSetupDialog.h @@ -14,6 +14,7 @@ #define CMakeSetupDialog_h #include "QCMake.h" + #include #include #include diff --git a/Source/QtDialog/Compilers.h b/Source/QtDialog/Compilers.h index 3f7b83411..ee898861b 100644 --- a/Source/QtDialog/Compilers.h +++ b/Source/QtDialog/Compilers.h @@ -4,6 +4,7 @@ #define COMPILERS_HPP #include + #include class Compilers : public QWidget, public Ui::Compilers diff --git a/Source/QtDialog/FirstConfigure.cxx b/Source/QtDialog/FirstConfigure.cxx index 61aad72e0..64fe67605 100644 --- a/Source/QtDialog/FirstConfigure.cxx +++ b/Source/QtDialog/FirstConfigure.cxx @@ -1,5 +1,6 @@ #include "FirstConfigure.h" + #include "Compilers.h" #include diff --git a/Source/QtDialog/FirstConfigure.h b/Source/QtDialog/FirstConfigure.h index 09952b650..3c574d4f0 100644 --- a/Source/QtDialog/FirstConfigure.h +++ b/Source/QtDialog/FirstConfigure.h @@ -4,7 +4,9 @@ #include #include + #include "cmake.h" + #include "ui_Compilers.h" #include "ui_CrossCompiler.h" diff --git a/Source/QtDialog/QCMake.h b/Source/QtDialog/QCMake.h index 8942e7c90..ca6f0f4a1 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 ) @@ -27,8 +30,6 @@ #include #include -#include "cmake.h" - /// struct to represent cmake properties in Qt /// Value is of type String or Bool struct QCMakeProperty diff --git a/Source/QtDialog/QCMakeCacheView.h b/Source/QtDialog/QCMakeCacheView.h index 41f0bd87c..5ac09665c 100644 --- a/Source/QtDialog/QCMakeCacheView.h +++ b/Source/QtDialog/QCMakeCacheView.h @@ -14,6 +14,7 @@ #define QCMakeCacheView_h #include "QCMake.h" + #include #include #include diff --git a/Source/QtDialog/QCMakeWidgets.h b/Source/QtDialog/QCMakeWidgets.h index 8f58df2bb..22072827e 100644 --- a/Source/QtDialog/QCMakeWidgets.h +++ b/Source/QtDialog/QCMakeWidgets.h @@ -16,6 +16,7 @@ #include #include #include + class QToolButton; // common widgets for Qt based CMake diff --git a/Source/cmAddDependenciesCommand.cxx b/Source/cmAddDependenciesCommand.cxx index 01e525311..3b2835948 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/cmAuxSourceDirectoryCommand.cxx b/Source/cmAuxSourceDirectoryCommand.cxx index 92ac07dfd..07cb295b5 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 diff --git a/Source/cmCPluginAPI.cxx b/Source/cmCPluginAPI.cxx index fb78446dc..b203a226d 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 f3e7121f7..4ba15ac10 100644 --- a/Source/cmCTest.cxx +++ b/Source/cmCTest.cxx @@ -12,6 +12,7 @@ #include "cmCurl.h" // include before anything that includes windows.h #include "cmCTest.h" + #include "cmake.h" #include "cmMakefile.h" #include "cmGlobalGenerator.h" diff --git a/Source/cmCTest.h b/Source/cmCTest.h index 73c280752..07081fc9c 100644 --- a/Source/cmCTest.h +++ b/Source/cmCTest.h @@ -14,6 +14,7 @@ #define cmCTest_h #include "cmStandardIncludes.h" + #include "cmListFileCache.h" #include diff --git a/Source/cmCacheManager.cxx b/Source/cmCacheManager.cxx index 7466c299a..2cda0184c 100644 --- a/Source/cmCacheManager.cxx +++ b/Source/cmCacheManager.cxx @@ -9,8 +9,8 @@ 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" diff --git a/Source/cmCacheManager.h b/Source/cmCacheManager.h index 6f063ebbc..614ff69de 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 0e0483892..636a82737 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 59bc396f3..d7f5c9910 100644 --- a/Source/cmCommand.h +++ b/Source/cmCommand.h @@ -13,6 +13,7 @@ #define cmCommand_h #include "cmObject.h" + #include "cmListFileCache.h" #include "cmMakefile.h" #include "cmCommandArgumentsHelper.h" diff --git a/Source/cmCommands.h b/Source/cmCommands.h index 7a94423a4..0786a6427 100644 --- a/Source/cmCommands.h +++ b/Source/cmCommands.h @@ -11,6 +11,7 @@ ============================================================================*/ #ifndef cmCommands_h #define cmCommands_h + #include "cmStandardIncludes.h" #include diff --git a/Source/cmComputeLinkDepends.h b/Source/cmComputeLinkDepends.h index f10e4e435..9b0bfaa8f 100644 --- a/Source/cmComputeLinkDepends.h +++ b/Source/cmComputeLinkDepends.h @@ -13,8 +13,8 @@ #define cmComputeLinkDepends_h #include "cmStandardIncludes.h" -#include "cmLinkItem.h" +#include "cmLinkItem.h" #include "cmGraphAdjacencyList.h" #include diff --git a/Source/cmConditionEvaluator.cxx b/Source/cmConditionEvaluator.cxx index 07c9dd620..c43ec4739 100644 --- a/Source/cmConditionEvaluator.cxx +++ b/Source/cmConditionEvaluator.cxx @@ -11,6 +11,7 @@ ============================================================================*/ #include "cmConditionEvaluator.h" + #include "cmOutputConverter.h" #include "cmAlgorithms.h" diff --git a/Source/cmCoreTryCompile.cxx b/Source/cmCoreTryCompile.cxx index cfd31b261..c38429ff5 100644 --- a/Source/cmCoreTryCompile.cxx +++ b/Source/cmCoreTryCompile.cxx @@ -10,6 +10,7 @@ See the License for more information. ============================================================================*/ #include "cmCoreTryCompile.h" + #include "cmake.h" #include "cmOutputConverter.h" #include "cmGlobalGenerator.h" diff --git a/Source/cmCreateTestSourceList.cxx b/Source/cmCreateTestSourceList.cxx index e67099193..65eee3474 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/cmCurl.cxx b/Source/cmCurl.cxx index 4f3d89083..35a68c0d9 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 0c5609ca7..2bc54cd60 100644 --- a/Source/cmCurl.h +++ b/Source/cmCurl.h @@ -12,10 +12,10 @@ #ifndef cmCurl_h #define cmCurl_h -#include -#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 f9b38c3c4..037049734 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/cmDefinePropertyCommand.cxx b/Source/cmDefinePropertyCommand.cxx index 0efc7fcf5..0334948b4 100644 --- a/Source/cmDefinePropertyCommand.cxx +++ b/Source/cmDefinePropertyCommand.cxx @@ -10,6 +10,7 @@ See the License for more information. ============================================================================*/ #include "cmDefinePropertyCommand.h" + #include "cmake.h" #include "cmState.h" diff --git a/Source/cmDependsC.h b/Source/cmDependsC.h index 07d3c21f3..cf0a4231a 100644 --- a/Source/cmDependsC.h +++ b/Source/cmDependsC.h @@ -13,6 +13,7 @@ #define cmDependsC_h #include "cmDepends.h" + #include #include diff --git a/Source/cmDocumentation.h b/Source/cmDocumentation.h index b6c5fde7e..a1d73f5a6 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 d796da84b..66b94c24b 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 b480cd53b..8d8e39662 100644 --- a/Source/cmELF.cxx +++ b/Source/cmELF.cxx @@ -10,6 +10,7 @@ See the License for more information. ============================================================================*/ #include "cmStandardIncludes.h" // to get CMAKE_USE_ELF_PARSER first + #include "cmELF.h" #include diff --git a/Source/cmEndIfCommand.cxx b/Source/cmEndIfCommand.cxx index 0ac09de72..05f23c4f1 100644 --- a/Source/cmEndIfCommand.cxx +++ b/Source/cmEndIfCommand.cxx @@ -10,6 +10,7 @@ See the License for more information. ============================================================================*/ #include "cmEndIfCommand.h" + #include // required for atof bool cmEndIfCommand::InitialPass(std::vector const&, cmExecutionStatus &) diff --git a/Source/cmExecProgramCommand.cxx b/Source/cmExecProgramCommand.cxx index 41785c2b0..110973754 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 diff --git a/Source/cmExecuteProcessCommand.cxx b/Source/cmExecuteProcessCommand.cxx index a37139051..1731b910e 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 diff --git a/Source/cmExportCommand.cxx b/Source/cmExportCommand.cxx index 4eec66a33..94e1d928b 100644 --- a/Source/cmExportCommand.cxx +++ b/Source/cmExportCommand.cxx @@ -10,6 +10,7 @@ See the License for more information. ============================================================================*/ #include "cmExportCommand.h" + #include "cmGlobalGenerator.h" #include "cmGeneratedFileStream.h" #include "cmake.h" diff --git a/Source/cmExportLibraryDependenciesCommand.cxx b/Source/cmExportLibraryDependenciesCommand.cxx index 21d961fbc..132df74d5 100644 --- a/Source/cmExportLibraryDependenciesCommand.cxx +++ b/Source/cmExportLibraryDependenciesCommand.cxx @@ -10,6 +10,7 @@ See the License for more information. ============================================================================*/ #include "cmExportLibraryDependenciesCommand.h" + #include "cmGlobalGenerator.h" #include "cmGeneratedFileStream.h" #include "cmake.h" diff --git a/Source/cmExportSet.cxx b/Source/cmExportSet.cxx index 0059b6400..e7739fb94 100644 --- a/Source/cmExportSet.cxx +++ b/Source/cmExportSet.cxx @@ -11,6 +11,7 @@ ============================================================================*/ #include "cmExportSet.h" + #include "cmTargetExport.h" #include "cmAlgorithms.h" #include "cmLocalGenerator.h" diff --git a/Source/cmExportSet.h b/Source/cmExportSet.h index d780a228c..a3359ace0 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 cf431c60c..b0021e770 100644 --- a/Source/cmExportSetMap.cxx +++ b/Source/cmExportSetMap.cxx @@ -11,6 +11,7 @@ ============================================================================*/ #include "cmExportSetMap.h" + #include "cmExportSet.h" #include "cmAlgorithms.h" diff --git a/Source/cmExportSetMap.h b/Source/cmExportSetMap.h index 965046cef..87f206084 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/cmExternalMakefileProjectGenerator.cxx b/Source/cmExternalMakefileProjectGenerator.cxx index 9264671a3..cdf02927f 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 #include "cmExternalMakefileProjectGenerator.h" +#include + void cmExternalMakefileProjectGenerator ::EnableLanguage(std::vector const&, cmMakefile *, bool) diff --git a/Source/cmExtraCodeBlocksGenerator.cxx b/Source/cmExtraCodeBlocksGenerator.cxx index 52512a811..2d26cc3b5 100644 --- a/Source/cmExtraCodeBlocksGenerator.cxx +++ b/Source/cmExtraCodeBlocksGenerator.cxx @@ -11,6 +11,7 @@ See the License for more information. ============================================================================*/ #include "cmExtraCodeBlocksGenerator.h" + #include "cmGlobalUnixMakefileGenerator3.h" #include "cmLocalUnixMakefileGenerator3.h" #include "cmMakefile.h" diff --git a/Source/cmExtraCodeLiteGenerator.cxx b/Source/cmExtraCodeLiteGenerator.cxx index 9fc7b1eec..e2b84c6f4 100644 --- a/Source/cmExtraCodeLiteGenerator.cxx +++ b/Source/cmExtraCodeLiteGenerator.cxx @@ -12,6 +12,7 @@ See the License for more information. ============================================================================*/ #include "cmExtraCodeLiteGenerator.h" + #include "cmGlobalUnixMakefileGenerator3.h" #include "cmLocalUnixMakefileGenerator3.h" #include "cmMakefile.h" diff --git a/Source/cmExtraEclipseCDT4Generator.cxx b/Source/cmExtraEclipseCDT4Generator.cxx index 9e67301fd..22b2f91fb 100644 --- a/Source/cmExtraEclipseCDT4Generator.cxx +++ b/Source/cmExtraEclipseCDT4Generator.cxx @@ -12,6 +12,7 @@ See the License for more information. ============================================================================*/ #include "cmExtraEclipseCDT4Generator.h" + #include "cmGlobalUnixMakefileGenerator3.h" #include "cmLocalUnixMakefileGenerator3.h" #include "cmMakefile.h" diff --git a/Source/cmExtraKateGenerator.cxx b/Source/cmExtraKateGenerator.cxx index ff5d3ab5f..8e60d5053 100644 --- a/Source/cmExtraKateGenerator.cxx +++ b/Source/cmExtraKateGenerator.cxx @@ -11,6 +11,7 @@ See the License for more information. ============================================================================*/ #include "cmExtraKateGenerator.h" + #include "cmGlobalUnixMakefileGenerator3.h" #include "cmLocalUnixMakefileGenerator3.h" #include "cmMakefile.h" diff --git a/Source/cmExtraSublimeTextGenerator.cxx b/Source/cmExtraSublimeTextGenerator.cxx index 92d38b95c..f84eeb018 100644 --- a/Source/cmExtraSublimeTextGenerator.cxx +++ b/Source/cmExtraSublimeTextGenerator.cxx @@ -11,6 +11,7 @@ See the License for more information. ============================================================================*/ #include "cmExtraSublimeTextGenerator.h" + #include "cmake.h" #include "cmGeneratedFileStream.h" #include "cmGeneratorTarget.h" diff --git a/Source/cmFileCommand.cxx b/Source/cmFileCommand.cxx index b0a61b2c3..42922e192 100644 --- a/Source/cmFileCommand.cxx +++ b/Source/cmFileCommand.cxx @@ -10,6 +10,7 @@ See the License for more information. ============================================================================*/ #include "cmFileCommand.h" + #include "cmCryptoHash.h" #include "cmake.h" #include "cmHexFileConverter.h" diff --git a/Source/cmFindCommon.cxx b/Source/cmFindCommon.cxx index 913985fdb..1286a00b0 100644 --- a/Source/cmFindCommon.cxx +++ b/Source/cmFindCommon.cxx @@ -10,6 +10,7 @@ See the License for more information. ============================================================================*/ #include "cmFindCommon.h" + #include #include diff --git a/Source/cmFindFileCommand.cxx b/Source/cmFindFileCommand.cxx index 615e7c1d2..a6666ba85 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 e7696af40..91c7b5cdf 100644 --- a/Source/cmFindLibraryCommand.cxx +++ b/Source/cmFindLibraryCommand.cxx @@ -10,6 +10,7 @@ See the License for more information. ============================================================================*/ #include "cmFindLibraryCommand.h" + #include cmFindLibraryCommand::cmFindLibraryCommand() diff --git a/Source/cmFindProgramCommand.cxx b/Source/cmFindProgramCommand.cxx index 219ad48b5..1734c0130 100644 --- a/Source/cmFindProgramCommand.cxx +++ b/Source/cmFindProgramCommand.cxx @@ -10,6 +10,7 @@ See the License for more information. ============================================================================*/ #include "cmFindProgramCommand.h" + #include #if defined(__APPLE__) diff --git a/Source/cmForEachCommand.h b/Source/cmForEachCommand.h index 36e88088f..027b8cb9c 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 a3b80781d..d0d52ceda 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 2df435e71..1a5ce5903 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 8df3e1a98..cb397c146 100644 --- a/Source/cmGeneratedFileStream.h +++ b/Source/cmGeneratedFileStream.h @@ -13,6 +13,7 @@ #define cmGeneratedFileStream_h #include "cmStandardIncludes.h" + #include // This is the first base class of cmGeneratedFileStream. It will be diff --git a/Source/cmGeneratorExpression.h b/Source/cmGeneratorExpression.h index efd381b53..001f2dfb3 100644 --- a/Source/cmGeneratorExpression.h +++ b/Source/cmGeneratorExpression.h @@ -14,6 +14,7 @@ #define cmGeneratorExpression_h #include "cmStandardIncludes.h" + #include "cmListFileCache.h" #include diff --git a/Source/cmGeneratorExpressionContext.cxx b/Source/cmGeneratorExpressionContext.cxx index 5c9462f0c..b3bcb50c8 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/cmGeneratorExpressionEvaluationFile.h b/Source/cmGeneratorExpressionEvaluationFile.h index ad41274ca..f34dadc66 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 #include -#include "cmGeneratorExpression.h" - class cmLocalGenerator; //---------------------------------------------------------------------------- diff --git a/Source/cmGeneratorExpressionEvaluator.cxx b/Source/cmGeneratorExpressionEvaluator.cxx index af94bcc69..0fe864c72 100644 --- a/Source/cmGeneratorExpressionEvaluator.cxx +++ b/Source/cmGeneratorExpressionEvaluator.cxx @@ -9,9 +9,9 @@ implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License for more information. ============================================================================*/ -#include "cmMakefile.h" - #include "cmGeneratorExpressionEvaluator.h" + +#include "cmMakefile.h" #include "cmGeneratorExpressionParser.h" #include "cmGeneratorExpressionDAGChecker.h" #include "cmGeneratorExpression.h" diff --git a/Source/cmGeneratorExpressionEvaluator.h b/Source/cmGeneratorExpressionEvaluator.h index 407f83f19..ba27e5a03 100644 --- a/Source/cmGeneratorExpressionEvaluator.h +++ b/Source/cmGeneratorExpressionEvaluator.h @@ -12,9 +12,10 @@ #ifndef cmGeneratorExpressionEvaluator_h #define cmGeneratorExpressionEvaluator_h -#include "cmListFileCache.h" #include "cmGeneratorExpressionContext.h" +#include "cmListFileCache.h" + #include #include diff --git a/Source/cmGeneratorExpressionNode.cxx b/Source/cmGeneratorExpressionNode.cxx index 32b2f8251..7f3d7d689 100644 --- a/Source/cmGeneratorExpressionNode.cxx +++ b/Source/cmGeneratorExpressionNode.cxx @@ -11,6 +11,7 @@ ============================================================================*/ #include "cmGeneratorExpressionNode.h" + #include "cmGlobalGenerator.h" #include "cmAlgorithms.h" #include "cmOutputConverter.h" diff --git a/Source/cmGeneratorExpressionNode.h b/Source/cmGeneratorExpressionNode.h index 854811b99..b803d1237 100644 --- a/Source/cmGeneratorExpressionNode.h +++ b/Source/cmGeneratorExpressionNode.h @@ -12,10 +12,11 @@ #ifndef cmGeneratorExpressionNode_h #define cmGeneratorExpressionNode_h +#include "cmGeneratorExpression.h" + #include "cmGeneratorExpressionEvaluator.h" #include "cmGeneratorExpressionParser.h" #include "cmGeneratorExpressionDAGChecker.h" -#include "cmGeneratorExpression.h" #include "cmLocalGenerator.h" #include "cmSourceFile.h" diff --git a/Source/cmGetFilenameComponentCommand.cxx b/Source/cmGetFilenameComponentCommand.cxx index 0f56c8e8f..2026a4547 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/cmGhsMultiGpj.h b/Source/cmGhsMultiGpj.h index 91ff0f4a5..862b63c82 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 12e2eee01..b7b122ca1 100644 --- a/Source/cmGhsMultiTargetGenerator.cxx +++ b/Source/cmGhsMultiTargetGenerator.cxx @@ -10,6 +10,7 @@ See the License for more information. ============================================================================*/ #include "cmGhsMultiTargetGenerator.h" + #include "cmGlobalGhsMultiGenerator.h" #include "cmLocalGhsMultiGenerator.h" #include "cmMakefile.h" diff --git a/Source/cmGhsMultiTargetGenerator.h b/Source/cmGhsMultiTargetGenerator.h index 3a1360051..93761f2d9 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 40e8d2901..374cc8824 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 1d0ade47b..5040cfd8a 100644 --- a/Source/cmGlobalGenerator.cxx +++ b/Source/cmGlobalGenerator.cxx @@ -17,6 +17,7 @@ #endif #include "cmGlobalGenerator.h" + #include "cmLocalGenerator.h" #include "cmExternalMakefileProjectGenerator.h" #include "cmake.h" diff --git a/Source/cmGlobalGhsMultiGenerator.cxx b/Source/cmGlobalGhsMultiGenerator.cxx index 1bcbd26ad..e9a48c892 100644 --- a/Source/cmGlobalGhsMultiGenerator.cxx +++ b/Source/cmGlobalGhsMultiGenerator.cxx @@ -10,6 +10,7 @@ See the License for more information. ============================================================================*/ #include "cmGlobalGhsMultiGenerator.h" + #include "cmLocalGhsMultiGenerator.h" #include "cmMakefile.h" #include "cmVersion.h" diff --git a/Source/cmGlobalGhsMultiGenerator.h b/Source/cmGlobalGhsMultiGenerator.h index 6f86c5d4e..b8d6ade8d 100644 --- a/Source/cmGlobalGhsMultiGenerator.h +++ b/Source/cmGlobalGhsMultiGenerator.h @@ -12,8 +12,9 @@ #ifndef cmGhsMultiGenerator_h #define cmGhsMultiGenerator_h -#include "cmGlobalGeneratorFactory.h" #include "cmGlobalGenerator.h" + +#include "cmGlobalGeneratorFactory.h" #include "cmGhsMultiGpj.h" class cmGeneratedFileStream; diff --git a/Source/cmGlobalJOMMakefileGenerator.cxx b/Source/cmGlobalJOMMakefileGenerator.cxx index 3f33f91fc..31cd2d356 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 b4f767084..758caaedf 100644 --- a/Source/cmGlobalKdevelopGenerator.cxx +++ b/Source/cmGlobalKdevelopGenerator.cxx @@ -11,6 +11,7 @@ See the License for more information. ============================================================================*/ #include "cmGlobalKdevelopGenerator.h" + #include "cmGlobalUnixMakefileGenerator3.h" #include "cmLocalUnixMakefileGenerator3.h" #include "cmMakefile.h" diff --git a/Source/cmGlobalMSYSMakefileGenerator.cxx b/Source/cmGlobalMSYSMakefileGenerator.cxx index 9a6f3ba45..a2b0bd10a 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 b6e52d7bc..c965f57dc 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 7c570a627..0a9f64424 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 fadb0cf82..88766fe62 100644 --- a/Source/cmGlobalNinjaGenerator.cxx +++ b/Source/cmGlobalNinjaGenerator.cxx @@ -10,10 +10,11 @@ implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License for more information. ============================================================================*/ +#include "cmGlobalNinjaGenerator.h" + #include "cmGeneratedFileStream.h" #include "cmGeneratorExpressionEvaluationFile.h" #include "cmGeneratorTarget.h" -#include "cmGlobalNinjaGenerator.h" #include "cmLocalNinjaGenerator.h" #include "cmMakefile.h" #include "cmVersion.h" diff --git a/Source/cmGlobalNinjaGenerator.h b/Source/cmGlobalNinjaGenerator.h index 3093a1113..56e2bdbd5 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 ce7815d7d..e35aa2e73 100644 --- a/Source/cmGlobalUnixMakefileGenerator3.cxx +++ b/Source/cmGlobalUnixMakefileGenerator3.cxx @@ -10,6 +10,7 @@ See the License for more information. ============================================================================*/ #include "cmGlobalUnixMakefileGenerator3.h" + #include "cmLocalUnixMakefileGenerator3.h" #include "cmMakefileTargetGenerator.h" #include "cmMakefile.h" diff --git a/Source/cmGlobalUnixMakefileGenerator3.h b/Source/cmGlobalUnixMakefileGenerator3.h index 0591a5a59..b035df442 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 c24e7f510..ee5e60592 100644 --- a/Source/cmGlobalVisualStudio10Generator.cxx +++ b/Source/cmGlobalVisualStudio10Generator.cxx @@ -10,7 +10,9 @@ See the License for more information. ============================================================================*/ #include "windows.h" // this must be first to define GetCurrentDirectory + #include "cmGlobalVisualStudio10Generator.h" + #include "cmLocalVisualStudio10Generator.h" #include "cmMakefile.h" #include "cmSourceFile.h" diff --git a/Source/cmGlobalVisualStudio11Generator.cxx b/Source/cmGlobalVisualStudio11Generator.cxx index 9b0035775..5eafe8ad9 100644 --- a/Source/cmGlobalVisualStudio11Generator.cxx +++ b/Source/cmGlobalVisualStudio11Generator.cxx @@ -10,6 +10,7 @@ See the License for more information. ============================================================================*/ #include "cmGlobalVisualStudio11Generator.h" + #include "cmLocalVisualStudio10Generator.h" #include "cmMakefile.h" #include "cmAlgorithms.h" diff --git a/Source/cmGlobalVisualStudio12Generator.cxx b/Source/cmGlobalVisualStudio12Generator.cxx index 568d4d7ff..e92ab5b9e 100644 --- a/Source/cmGlobalVisualStudio12Generator.cxx +++ b/Source/cmGlobalVisualStudio12Generator.cxx @@ -10,6 +10,7 @@ See the License for more information. ============================================================================*/ #include "cmGlobalVisualStudio12Generator.h" + #include "cmLocalVisualStudio10Generator.h" #include "cmMakefile.h" #include "cmAlgorithms.h" diff --git a/Source/cmGlobalVisualStudio14Generator.cxx b/Source/cmGlobalVisualStudio14Generator.cxx index c058f8ce4..df61503c5 100644 --- a/Source/cmGlobalVisualStudio14Generator.cxx +++ b/Source/cmGlobalVisualStudio14Generator.cxx @@ -10,6 +10,7 @@ See the License for more information. ============================================================================*/ #include "cmGlobalVisualStudio14Generator.h" + #include "cmLocalVisualStudio10Generator.h" #include "cmMakefile.h" #include "cmAlgorithms.h" diff --git a/Source/cmGlobalVisualStudio71Generator.cxx b/Source/cmGlobalVisualStudio71Generator.cxx index 7b51fdf49..bf5992520 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 c1c8c77e5..f8fe0747d 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 + #include "cmGlobalVisualStudio7Generator.h" + #include "cmGeneratedFileStream.h" #include "cmLocalVisualStudio7Generator.h" #include "cmMakefile.h" @@ -19,6 +20,8 @@ #include "cmake.h" #include +#include + //---------------------------------------------------------------------------- static cmVS7FlagTable cmVS7ExtraFlagTable[] = { diff --git a/Source/cmGlobalVisualStudio7Generator.h b/Source/cmGlobalVisualStudio7Generator.h index 02f9809d7..a360bd96c 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 5c5053045..506d1a9d6 100644 --- a/Source/cmGlobalVisualStudio8Generator.cxx +++ b/Source/cmGlobalVisualStudio8Generator.cxx @@ -10,7 +10,9 @@ See the License for more information. ============================================================================*/ #include "windows.h" // this must be first to define GetCurrentDirectory + #include "cmGlobalVisualStudio8Generator.h" + #include "cmLocalVisualStudio7Generator.h" #include "cmMakefile.h" #include "cmVisualStudioWCEPlatformParser.h" diff --git a/Source/cmGlobalVisualStudio9Generator.cxx b/Source/cmGlobalVisualStudio9Generator.cxx index da6ffaeba..c2ef332b4 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/cmGlobalWatcomWMakeGenerator.cxx b/Source/cmGlobalWatcomWMakeGenerator.cxx index 153773fcb..63f82bbb2 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 755c8a68c..62583410d 100644 --- a/Source/cmGlobalXCodeGenerator.cxx +++ b/Source/cmGlobalXCodeGenerator.cxx @@ -10,6 +10,7 @@ See the License for more information. ============================================================================*/ #include "cmGlobalXCodeGenerator.h" + #include "cmLocalXCodeGenerator.h" #include "cmMakefile.h" #include "cmXCodeObject.h" diff --git a/Source/cmGlobalXCodeGenerator.h b/Source/cmGlobalXCodeGenerator.h index f7bfb26c4..2a48ac8b6 100644 --- a/Source/cmGlobalXCodeGenerator.h +++ b/Source/cmGlobalXCodeGenerator.h @@ -13,6 +13,7 @@ #define cmGlobalXCodeGenerator_h #include "cmGlobalGenerator.h" + #include "cmXCodeObject.h" #include "cmCustomCommand.h" class cmGlobalGeneratorFactory; diff --git a/Source/cmGraphVizWriter.cxx b/Source/cmGraphVizWriter.cxx index 448306fe4..5b7d229b6 100644 --- a/Source/cmGraphVizWriter.cxx +++ b/Source/cmGraphVizWriter.cxx @@ -10,6 +10,7 @@ See the License for more information. ============================================================================*/ #include "cmGraphVizWriter.h" + #include "cmMakefile.h" #include "cmLocalGenerator.h" #include "cmGlobalGenerator.h" diff --git a/Source/cmGraphVizWriter.h b/Source/cmGraphVizWriter.h index 90d31d3be..8b1438e9f 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,7 +9,11 @@ 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 diff --git a/Source/cmHexFileConverter.h b/Source/cmHexFileConverter.h index e11d74a2f..89b853375 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 73860164d..8c985c78b 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 fc54ca5aa..1b8ba0bd3 100644 --- a/Source/cmIfCommand.cxx +++ b/Source/cmIfCommand.cxx @@ -10,6 +10,7 @@ See the License for more information. ============================================================================*/ #include "cmIfCommand.h" + #include "cmStringCommand.h" #include "cmOutputConverter.h" diff --git a/Source/cmIfCommand.h b/Source/cmIfCommand.h index 689efce65..9054a0bf3 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/cmInstallCommandArguments.cxx b/Source/cmInstallCommandArguments.cxx index 6ded365ac..57f5f3158 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 694f1ed52..e83a39753 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/cmInstallProgramsCommand.cxx b/Source/cmInstallProgramsCommand.cxx index b6d0c453c..790215dc3 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/cmInstalledFile.cxx b/Source/cmInstalledFile.cxx index fa5e81528..7025d0f43 100644 --- a/Source/cmInstalledFile.cxx +++ b/Source/cmInstalledFile.cxx @@ -10,6 +10,7 @@ See the License for more information. ============================================================================*/ #include "cmInstalledFile.h" + #include "cmSystemTools.h" #include "cmMakefile.h" #include "cmAlgorithms.h" diff --git a/Source/cmListCommand.cxx b/Source/cmListCommand.cxx index 15a1af560..514bc05c5 100644 --- a/Source/cmListCommand.cxx +++ b/Source/cmListCommand.cxx @@ -10,6 +10,7 @@ See the License for more information. ============================================================================*/ #include "cmListCommand.h" + #include #include #include "cmAlgorithms.h" diff --git a/Source/cmLoadCommandCommand.cxx b/Source/cmLoadCommandCommand.cxx index 403f7fcc8..ed1adc0b6 100644 --- a/Source/cmLoadCommandCommand.cxx +++ b/Source/cmLoadCommandCommand.cxx @@ -10,6 +10,7 @@ See the License for more information. ============================================================================*/ #include "cmLoadCommandCommand.h" + #include "cmCPluginAPI.h" #include "cmCPluginAPI.cxx" #include "cmDynamicLoader.h" diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h index b673a85cc..d9c68f9ce 100644 --- a/Source/cmLocalGenerator.h +++ b/Source/cmLocalGenerator.h @@ -13,6 +13,7 @@ #define cmLocalGenerator_h #include "cmStandardIncludes.h" + #include "cmState.h" #include "cmake.h" #include "cmOutputConverter.h" diff --git a/Source/cmLocalGhsMultiGenerator.cxx b/Source/cmLocalGhsMultiGenerator.cxx index a77a75e02..91e75d326 100644 --- a/Source/cmLocalGhsMultiGenerator.cxx +++ b/Source/cmLocalGhsMultiGenerator.cxx @@ -10,6 +10,7 @@ See the License for more information. ============================================================================*/ #include "cmLocalGhsMultiGenerator.h" + #include "cmGlobalGhsMultiGenerator.h" #include "cmGeneratorTarget.h" #include "cmMakefile.h" diff --git a/Source/cmLocalNinjaGenerator.cxx b/Source/cmLocalNinjaGenerator.cxx index 030b094e1..143c14e28 100644 --- a/Source/cmLocalNinjaGenerator.cxx +++ b/Source/cmLocalNinjaGenerator.cxx @@ -11,6 +11,7 @@ See the License for more information. ============================================================================*/ #include "cmLocalNinjaGenerator.h" + #include "cmCustomCommandGenerator.h" #include "cmMakefile.h" #include "cmGlobalNinjaGenerator.h" diff --git a/Source/cmLocalNinjaGenerator.h b/Source/cmLocalNinjaGenerator.h index 5e1d6f20d..9746a3c7a 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/cmLocalVisualStudio10Generator.cxx b/Source/cmLocalVisualStudio10Generator.cxx index d0784add2..ce20c97cb 100644 --- a/Source/cmLocalVisualStudio10Generator.cxx +++ b/Source/cmLocalVisualStudio10Generator.cxx @@ -10,11 +10,13 @@ See the License for more information. ============================================================================*/ #include "cmLocalVisualStudio10Generator.h" + #include "cmMakefile.h" #include "cmVisualStudio10TargetGenerator.h" #include "cmGlobalVisualStudio10Generator.h" #include #include "cmXMLParser.h" + class cmVS10XMLParser : public cmXMLParser { public: diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx index 2f66517ea..de974c213 100644 --- a/Source/cmLocalVisualStudio7Generator.cxx +++ b/Source/cmLocalVisualStudio7Generator.cxx @@ -9,8 +9,9 @@ implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License for more information. ============================================================================*/ -#include "cmGlobalVisualStudio7Generator.h" #include "cmLocalVisualStudio7Generator.h" + +#include "cmGlobalVisualStudio7Generator.h" #include "cmXMLParser.h" #include #include "cmMakefile.h" diff --git a/Source/cmLocalVisualStudio7Generator.h b/Source/cmLocalVisualStudio7Generator.h index 562f4852b..5d9a6340c 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 561f9a136..a5b8f99b0 100644 --- a/Source/cmLocalVisualStudioGenerator.cxx +++ b/Source/cmLocalVisualStudioGenerator.cxx @@ -10,6 +10,7 @@ See the License for more information. ============================================================================*/ #include "cmLocalVisualStudioGenerator.h" + #include "cmGlobalGenerator.h" #include "cmMakefile.h" #include "cmSourceFile.h" diff --git a/Source/cmLocalVisualStudioGenerator.h b/Source/cmLocalVisualStudioGenerator.h index f95eefaed..caffff704 100644 --- a/Source/cmLocalVisualStudioGenerator.h +++ b/Source/cmLocalVisualStudioGenerator.h @@ -13,6 +13,7 @@ #define cmLocalVisualStudioGenerator_h #include "cmLocalGenerator.h" + #include "cmGlobalVisualStudioGenerator.h" #include diff --git a/Source/cmLocalXCodeGenerator.cxx b/Source/cmLocalXCodeGenerator.cxx index aec260366..c837445c1 100644 --- a/Source/cmLocalXCodeGenerator.cxx +++ b/Source/cmLocalXCodeGenerator.cxx @@ -10,6 +10,7 @@ See the License for more information. ============================================================================*/ #include "cmLocalXCodeGenerator.h" + #include "cmGlobalXCodeGenerator.h" #include "cmSourceFile.h" #include "cmMakefile.h" diff --git a/Source/cmLocale.h b/Source/cmLocale.h index 727f0f5d4..69640f6c5 100644 --- a/Source/cmLocale.h +++ b/Source/cmLocale.h @@ -12,6 +12,8 @@ #ifndef cmLocale_h #define cmLocale_h +#include "cmStandardIncludes.h" + #include class cmLocaleRAII diff --git a/Source/cmMachO.cxx b/Source/cmMachO.cxx index 1607845d7..6210da35e 100644 --- a/Source/cmMachO.cxx +++ b/Source/cmMachO.cxx @@ -10,6 +10,7 @@ See the License for more information. ============================================================================*/ #include "cmStandardIncludes.h" // to get CMAKE_USE_MACH_PARSER first + #include "cmMachO.h" #include diff --git a/Source/cmMacroCommand.h b/Source/cmMacroCommand.h index 5c1cc000a..6f1ae9e4b 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 f01ff74bc..29b947c30 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -10,6 +10,7 @@ See the License for more information. ============================================================================*/ #include "cmMakefile.h" + #include "cmVersion.h" #include "cmCommand.h" #include "cmSourceFile.h" diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h index 089a83d12..0300d3f01 100644 --- a/Source/cmMakefile.h +++ b/Source/cmMakefile.h @@ -12,6 +12,8 @@ #ifndef cmMakefile_h #define cmMakefile_h +#include "cmStandardIncludes.h" + #include "cmExecutionStatus.h" #include "cmListFileCache.h" #include "cmSystemTools.h" diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx index 322f37d2f..351940019 100644 --- a/Source/cmNinjaNormalTargetGenerator.cxx +++ b/Source/cmNinjaNormalTargetGenerator.cxx @@ -11,6 +11,7 @@ See the License for more information. ============================================================================*/ #include "cmNinjaNormalTargetGenerator.h" + #include "cmLocalNinjaGenerator.h" #include "cmGlobalNinjaGenerator.h" #include "cmSourceFile.h" diff --git a/Source/cmNinjaNormalTargetGenerator.h b/Source/cmNinjaNormalTargetGenerator.h index 556ed5e13..300618ce3 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 +#include "cmNinjaTypes.h" + +#include class cmSourceFile; class cmOSXBundleGenerator; diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx index fd1d16dc5..97ef00d1b 100644 --- a/Source/cmNinjaTargetGenerator.cxx +++ b/Source/cmNinjaTargetGenerator.cxx @@ -11,6 +11,7 @@ See the License for more information. ============================================================================*/ #include "cmNinjaTargetGenerator.h" + #include "cmGlobalNinjaGenerator.h" #include "cmLocalNinjaGenerator.h" #include "cmGeneratedFileStream.h" diff --git a/Source/cmNinjaTargetGenerator.h b/Source/cmNinjaTargetGenerator.h index 371bc3cc6..40f96b47a 100644 --- a/Source/cmNinjaTargetGenerator.h +++ b/Source/cmNinjaTargetGenerator.h @@ -15,7 +15,6 @@ #include "cmCommonTargetGenerator.h" -#include "cmStandardIncludes.h" #include "cmNinjaTypes.h" #include "cmGlobalNinjaGenerator.h" #include "cmLocalNinjaGenerator.h" diff --git a/Source/cmNinjaTypes.h b/Source/cmNinjaTypes.h index 498f6b639..82a52202f 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 cmNinjaDeps; typedef std::map cmNinjaVars; diff --git a/Source/cmNinjaUtilityTargetGenerator.cxx b/Source/cmNinjaUtilityTargetGenerator.cxx index ac66fcd00..c2162ce09 100644 --- a/Source/cmNinjaUtilityTargetGenerator.cxx +++ b/Source/cmNinjaUtilityTargetGenerator.cxx @@ -11,6 +11,7 @@ See the License for more information. ============================================================================*/ #include "cmNinjaUtilityTargetGenerator.h" + #include "cmCustomCommand.h" #include "cmGeneratedFileStream.h" #include "cmGlobalNinjaGenerator.h" diff --git a/Source/cmNinjaUtilityTargetGenerator.h b/Source/cmNinjaUtilityTargetGenerator.h index add0291a5..fec294696 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 934e1986a..6991d7b65 100644 --- a/Source/cmOSXBundleGenerator.cxx +++ b/Source/cmOSXBundleGenerator.cxx @@ -10,6 +10,7 @@ See the License for more information. ============================================================================*/ #include "cmOSXBundleGenerator.h" + #include "cmMakefile.h" #include "cmTarget.h" #include "cmLocalGenerator.h" diff --git a/Source/cmOSXBundleGenerator.h b/Source/cmOSXBundleGenerator.h index f945c15a8..240026237 100644 --- a/Source/cmOSXBundleGenerator.h +++ b/Source/cmOSXBundleGenerator.h @@ -13,6 +13,7 @@ #define cmOSXBundleGenerator_h #include "cmStandardIncludes.h" + #include "cmSourceFile.h" #include diff --git a/Source/cmOutputRequiredFilesCommand.cxx b/Source/cmOutputRequiredFilesCommand.cxx index 54208acbe..3b98c8772 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 diff --git a/Source/cmParseArgumentsCommand.cxx b/Source/cmParseArgumentsCommand.cxx index ca76c889d..7fc8ae417 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 bce69c56b..68a908507 100644 --- a/Source/cmPolicies.cxx +++ b/Source/cmPolicies.cxx @@ -1,4 +1,5 @@ #include "cmPolicies.h" + #include "cmake.h" #include "cmMakefile.h" #include "cmVersion.h" diff --git a/Source/cmProperty.cxx b/Source/cmProperty.cxx index ef57068ad..4cdf650f1 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 1af967c94..9bb812e99 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 776fad1dc..cfc4bc390 100644 --- a/Source/cmPropertyDefinitionMap.cxx +++ b/Source/cmPropertyDefinitionMap.cxx @@ -10,6 +10,7 @@ See the License for more information. ============================================================================*/ #include "cmPropertyDefinitionMap.h" + #include "cmSystemTools.h" #include "cmDocumentationSection.h" diff --git a/Source/cmPropertyMap.cxx b/Source/cmPropertyMap.cxx index ef09dbcf0..e6b1529cb 100644 --- a/Source/cmPropertyMap.cxx +++ b/Source/cmPropertyMap.cxx @@ -10,6 +10,7 @@ See the License for more information. ============================================================================*/ #include "cmPropertyMap.h" + #include "cmSystemTools.h" #include "cmake.h" #include "cmState.h" diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx index 07fc239cf..f376caa77 100644 --- a/Source/cmQtAutoGenerators.cxx +++ b/Source/cmQtAutoGenerators.cxx @@ -11,6 +11,8 @@ See the License for more information. ============================================================================*/ +#include "cmQtAutoGenerators.h" + #include "cmGlobalGenerator.h" #include "cmOutputConverter.h" #include "cmMakefile.h" @@ -29,8 +31,6 @@ #include #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 e46e0fc36..04d286008 100644 --- a/Source/cmQtAutoGenerators.h +++ b/Source/cmQtAutoGenerators.h @@ -14,6 +14,8 @@ #ifndef cmQtAutoGenerators_h #define cmQtAutoGenerators_h +#include "cmStandardIncludes.h" + #include #include #include diff --git a/Source/cmSearchPath.cxx b/Source/cmSearchPath.cxx index c9cc81737..01781b29e 100644 --- a/Source/cmSearchPath.cxx +++ b/Source/cmSearchPath.cxx @@ -9,8 +9,8 @@ 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" diff --git a/Source/cmSetPropertyCommand.cxx b/Source/cmSetPropertyCommand.cxx index 17ad475bf..fc5c95aab 100644 --- a/Source/cmSetPropertyCommand.cxx +++ b/Source/cmSetPropertyCommand.cxx @@ -10,6 +10,7 @@ See the License for more information. ============================================================================*/ #include "cmSetPropertyCommand.h" + #include "cmSetTargetPropertiesCommand.h" #include "cmSetTestsPropertiesCommand.h" #include "cmSetSourceFilesPropertiesCommand.h" diff --git a/Source/cmSetTargetPropertiesCommand.cxx b/Source/cmSetTargetPropertiesCommand.cxx index b1c13ac96..b4c58d45d 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/cmSourceFile.h b/Source/cmSourceFile.h index 1433b54f0..e5e2ab935 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/cmSourceGroup.h b/Source/cmSourceGroup.h index e8cf519d4..316d72533 100644 --- a/Source/cmSourceGroup.h +++ b/Source/cmSourceGroup.h @@ -13,6 +13,7 @@ #define cmSourceGroup_h #include "cmStandardIncludes.h" + #include class cmSourceFile; diff --git a/Source/cmStandardIncludes.h b/Source/cmStandardIncludes.h index 272c1361d..83cbf677f 100644 --- a/Source/cmStandardIncludes.h +++ b/Source/cmStandardIncludes.h @@ -17,6 +17,7 @@ #define cmStandardIncludes_h #include + #include #ifdef _MSC_VER diff --git a/Source/cmState.h b/Source/cmState.h index 7ead7e02e..7b110347d 100644 --- a/Source/cmState.h +++ b/Source/cmState.h @@ -13,6 +13,7 @@ #define cmState_h #include "cmStandardIncludes.h" + #include "cmPropertyDefinitionMap.h" #include "cmPropertyMap.h" #include "cmLinkedTree.h" diff --git a/Source/cmStringCommand.cxx b/Source/cmStringCommand.cxx index 3c027a0f4..82c530ce6 100644 --- a/Source/cmStringCommand.cxx +++ b/Source/cmStringCommand.cxx @@ -10,6 +10,7 @@ See the License for more information. ============================================================================*/ #include "cmStringCommand.h" + #include "cmCryptoHash.h" #include diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx index 9af54bffc..2cf254630 100644 --- a/Source/cmSystemTools.cxx +++ b/Source/cmSystemTools.cxx @@ -9,8 +9,8 @@ implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License for more information. ============================================================================*/ - #include "cmSystemTools.h" + #include "cmAlgorithms.h" #include #include @@ -39,6 +39,7 @@ #if defined(_WIN32) # include + // include wincrypt.h after windows.h # include #else # include diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx index e11835683..275dd6f99 100644 --- a/Source/cmTarget.cxx +++ b/Source/cmTarget.cxx @@ -10,6 +10,7 @@ See the License for more information. ============================================================================*/ #include "cmTarget.h" + #include "cmake.h" #include "cmMakefile.h" #include "cmSourceFile.h" diff --git a/Source/cmTarget.h b/Source/cmTarget.h index 4e97c2c0e..b39804347 100644 --- a/Source/cmTarget.h +++ b/Source/cmTarget.h @@ -12,6 +12,8 @@ #ifndef cmTarget_h #define cmTarget_h +#include "cmStandardIncludes.h" + #include "cmCustomCommand.h" #include "cmPropertyMap.h" #include "cmPolicies.h" diff --git a/Source/cmTest.cxx b/Source/cmTest.cxx index 6fcd0dc95..812e4d395 100644 --- a/Source/cmTest.cxx +++ b/Source/cmTest.cxx @@ -10,6 +10,7 @@ See the License for more information. ============================================================================*/ #include "cmTest.h" + #include "cmSystemTools.h" #include "cmake.h" diff --git a/Source/cmTest.h b/Source/cmTest.h index ca88afecd..44a2d00d0 100644 --- a/Source/cmTest.h +++ b/Source/cmTest.h @@ -12,6 +12,8 @@ #ifndef cmTest_h #define cmTest_h +#include "cmStandardIncludes.h" + #include "cmCustomCommand.h" #include "cmPropertyMap.h" #include "cmListFileCache.h" diff --git a/Source/cmTimestamp.h b/Source/cmTimestamp.h index 7c4b2166e..72d5cc2ee 100644 --- a/Source/cmTimestamp.h +++ b/Source/cmTimestamp.h @@ -12,6 +12,8 @@ #ifndef cmTimestamp_h #define cmTimestamp_h +#include "cmStandardIncludes.h" + #include #include diff --git a/Source/cmTryRunCommand.cxx b/Source/cmTryRunCommand.cxx index d4a36c982..fdc914201 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 diff --git a/Source/cmUseMangledMesaCommand.cxx b/Source/cmUseMangledMesaCommand.cxx index 2ee664fd1..057b67e5d 100644 --- a/Source/cmUseMangledMesaCommand.cxx +++ b/Source/cmUseMangledMesaCommand.cxx @@ -10,6 +10,7 @@ See the License for more information. ============================================================================*/ #include "cmUseMangledMesaCommand.h" + #include "cmSystemTools.h" #include diff --git a/Source/cmVariableRequiresCommand.cxx b/Source/cmVariableRequiresCommand.cxx index 1d33db13c..a830842aa 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 31873b5cc..7ff9f04f1 100644 --- a/Source/cmVisualStudio10TargetGenerator.cxx +++ b/Source/cmVisualStudio10TargetGenerator.cxx @@ -9,8 +9,9 @@ implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License for more information. ============================================================================*/ -#include "windows.h" #include "cmVisualStudio10TargetGenerator.h" + +#include "windows.h" #include "cmGlobalVisualStudio10Generator.h" #include "cmGeneratorTarget.h" #include "cmComputeLinkInformation.h" diff --git a/Source/cmVisualStudio10TargetGenerator.h b/Source/cmVisualStudio10TargetGenerator.h index 044e0ddee..6c946c9e8 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 bd4eb6986..142e36f9d 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 ca226fb50..b6ee7546a 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 042df0142..14f8df8eb 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 7bb78bf8a..5fdccaa1c 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 85a0bd327..902c55ac0 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 cc9f22003..d52d6b5d6 100644 --- a/Source/cmWriteFileCommand.cxx +++ b/Source/cmWriteFileCommand.cxx @@ -10,6 +10,7 @@ See the License for more information. ============================================================================*/ #include "cmWriteFileCommand.h" + #include #include diff --git a/Source/cmXCode21Object.cxx b/Source/cmXCode21Object.cxx index 3973540bf..bd055e58e 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 911e15499..87b2e8942 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 // CFUUIDCreate diff --git a/Source/cmXCodeObject.h b/Source/cmXCodeObject.h index 2d876da8f..d00cf0fbd 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 1d3e0e937..6a24faa33 100644 --- a/Source/cmXMLParser.cxx +++ b/Source/cmXMLParser.cxx @@ -10,6 +10,7 @@ See the License for more information. ============================================================================*/ #include "cmXMLParser.h" + #include #include diff --git a/Source/cmXMLSafe.h b/Source/cmXMLSafe.h index ead2e014c..981359acf 100644 --- a/Source/cmXMLSafe.h +++ b/Source/cmXMLSafe.h @@ -13,6 +13,7 @@ #define cmXMLSafe_h #include + #include #include diff --git a/Source/cmXMLWriter.cxx b/Source/cmXMLWriter.cxx index 6a9172ac7..ec2646759 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 diff --git a/Source/cmXMLWriter.h b/Source/cmXMLWriter.h index 308305960..8fedcd432 100644 --- a/Source/cmXMLWriter.h +++ b/Source/cmXMLWriter.h @@ -13,6 +13,7 @@ #define cmXMLWiter_h #include "cmStandardIncludes.h" + #include "cmXMLSafe.h" #include diff --git a/Source/cmake.cxx b/Source/cmake.cxx index 8e3380f56..f3363840c 100644 --- a/Source/cmake.cxx +++ b/Source/cmake.cxx @@ -10,6 +10,7 @@ See the License for more information. ============================================================================*/ #include "cmake.h" + #include "cmMakefile.h" #include "cmLocalGenerator.h" #include "cmExternalMakefileProjectGenerator.h" diff --git a/Source/cmake.h b/Source/cmake.h index 8644dda1c..8fb41957a 100644 --- a/Source/cmake.h +++ b/Source/cmake.h @@ -13,6 +13,8 @@ #ifndef cmake_h #define cmake_h +#include "cmStandardIncludes.h" + #include "cmListFileCache.h" #include "cmSystemTools.h" #include "cmInstalledFile.h" diff --git a/Source/cmakexbuild.cxx b/Source/cmakexbuild.cxx index 9aaeeaa4d..03059f5b9 100644 --- a/Source/cmakexbuild.cxx +++ b/Source/cmakexbuild.cxx @@ -9,8 +9,9 @@ implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License for more information. ============================================================================*/ -#include #include "cmStandardIncludes.h" + +#include #include "cmSystemTools.h" // This is a wrapper program for xcodebuild diff --git a/Source/cmcldeps.cxx b/Source/cmcldeps.cxx index f3c6059b1..3f3ec4de8 100644 --- a/Source/cmcldeps.cxx +++ b/Source/cmcldeps.cxx @@ -19,11 +19,11 @@ // /showIncludes is equivalent to -MD, not -MMD, that is, system headers are // included. +#include +#include #include #include -#include -#include // We don't want any wildcard expansion. // See http://msdn.microsoft.com/en-us/library/zay8tzh6(v=vs.85).aspx diff --git a/Source/cmcmd.cxx b/Source/cmcmd.cxx index 0b9518c93..2b153bd69 100644 --- a/Source/cmcmd.cxx +++ b/Source/cmcmd.cxx @@ -10,6 +10,7 @@ See the License for more information. ============================================================================*/ #include "cmcmd.h" + #include "cmMakefile.h" #include "cmLocalGenerator.h" #include "cmGlobalGenerator.h" From e1c7747253ac71a5215dd32a910b62a1fd8c561a Mon Sep 17 00:00:00 2001 From: Brad King Date: Fri, 29 Apr 2016 10:53:13 -0400 Subject: [PATCH 7/7] Format include directive blocks and ordering with clang-format Sort include directives within each block (separated by a blank line) in lexicographic order (except to prioritize `sys/types.h` first). First run `clang-format` with the config file: --- SortIncludes: false ... Commit the result temporarily. Then run `clang-format` again with: --- SortIncludes: true IncludeCategories: - Regex: 'sys/types.h' Priority: -1 ... Commit the result temporarily. Start a new branch and cherry-pick the second commit. Manually resolve conflicts to preserve indentation of re-ordered includes. This cleans up the include ordering without changing any other style. Use the following command to run `clang-format`: $ git ls-files -z -- \ '*.c' '*.cc' '*.cpp' '*.cxx' '*.h' '*.hh' '*.hpp' '*.hxx' | egrep -z -v '(Lexer|Parser|ParserHelper)\.' | egrep -z -v '^Source/cm_sha2' | egrep -z -v '^Source/(kwsys|CursesDialog/form)/' | egrep -z -v '^Utilities/(KW|cm).*/' | egrep -z -v '^Tests/Module/GenerateExportHeader' | egrep -z -v '^Tests/RunCMake/CommandLine/cmake_depends/test_UTF-16LE.h' | xargs -0 clang-format -i This selects source files that do not come from a third-party. Inspired-by: Daniel Pfeifer --- Modules/CheckForPthreads.c | 2 +- Source/CPack/IFW/cmCPackIFWGenerator.cxx | 18 ++++----- Source/CPack/IFW/cmCPackIFWGenerator.h | 2 +- Source/CPack/OSXScriptLauncher.cxx | 4 +- Source/CPack/WiX/cmCPackWIXGenerator.cxx | 14 +++---- Source/CPack/WiX/cmCPackWIXGenerator.h | 2 +- Source/CPack/WiX/cmWIXAccessControlList.h | 2 +- Source/CPack/WiX/cmWIXFilesSourceWriter.h | 2 +- Source/CPack/WiX/cmWIXPatch.h | 2 +- Source/CPack/WiX/cmWIXShortcut.h | 2 +- Source/CPack/WiX/cmWIXSourceWriter.h | 2 +- Source/CPack/cmCPackArchiveGenerator.cxx | 14 +++---- Source/CPack/cmCPackComponentGroup.cxx | 2 +- Source/CPack/cmCPackCygwinBinaryGenerator.cxx | 10 ++--- Source/CPack/cmCPackCygwinSourceGenerator.cxx | 12 +++--- Source/CPack/cmCPackDebGenerator.cxx | 12 +++--- Source/CPack/cmCPackDragNDropGenerator.cxx | 4 +- Source/CPack/cmCPackGenerator.cxx | 16 ++++---- Source/CPack/cmCPackGeneratorFactory.cxx | 18 ++++----- Source/CPack/cmCPackNSISGenerator.cxx | 14 +++---- Source/CPack/cmCPackOSXX11Generator.cxx | 12 +++--- Source/CPack/cmCPackPackageMakerGenerator.cxx | 14 +++---- Source/CPack/cmCPackSTGZGenerator.cxx | 10 ++--- Source/CPack/cpack.cxx | 10 ++--- Source/CTest/cmCTestBatchTestHandler.cxx | 2 +- Source/CTest/cmCTestBatchTestHandler.h | 2 +- Source/CTest/cmCTestBuildAndTestHandler.cxx | 8 ++-- Source/CTest/cmCTestBuildCommand.cxx | 4 +- Source/CTest/cmCTestBuildHandler.cxx | 20 +++++----- Source/CTest/cmCTestCVS.cxx | 2 +- Source/CTest/cmCTestConfigureCommand.cxx | 2 +- Source/CTest/cmCTestConfigureHandler.cxx | 2 +- Source/CTest/cmCTestCoverageHandler.cxx | 28 +++++++------- Source/CTest/cmCTestCurl.cxx | 2 +- Source/CTest/cmCTestGIT.cxx | 8 ++-- Source/CTest/cmCTestLaunch.cxx | 4 +- Source/CTest/cmCTestMemCheckHandler.cxx | 18 ++++----- Source/CTest/cmCTestMemCheckHandler.h | 2 +- Source/CTest/cmCTestMultiProcessHandler.cxx | 14 +++---- Source/CTest/cmCTestP4.cxx | 4 +- Source/CTest/cmCTestP4.h | 2 +- Source/CTest/cmCTestRunTest.cxx | 2 +- Source/CTest/cmCTestScriptHandler.cxx | 12 +++--- Source/CTest/cmCTestStartCommand.cxx | 2 +- Source/CTest/cmCTestSubmitHandler.cxx | 12 +++--- Source/CTest/cmCTestTestHandler.cxx | 26 ++++++------- Source/CTest/cmCTestUpdateHandler.cxx | 20 +++++----- Source/CTest/cmParseBlanketJSCoverage.cxx | 6 +-- Source/CTest/cmParseCacheCoverage.cxx | 6 +-- Source/CTest/cmParseDelphiCoverage.cxx | 6 +-- Source/CTest/cmParseGTMCoverage.cxx | 6 +-- Source/CTest/cmParseJacocoCoverage.cxx | 6 +-- Source/CTest/cmParseMumpsCoverage.cxx | 6 +-- Source/CursesDialog/ccmake.cxx | 2 +- .../cmCursesCacheEntryComposite.cxx | 16 ++++---- .../CursesDialog/cmCursesLongMessageForm.cxx | 2 +- Source/CursesDialog/cmCursesMainForm.cxx | 16 ++++---- Source/QtDialog/AddCacheEntry.cxx | 2 +- Source/QtDialog/AddCacheEntry.h | 2 +- Source/QtDialog/CMakeSetup.cxx | 14 +++---- Source/QtDialog/CMakeSetupDialog.cxx | 26 ++++++------- Source/QtDialog/CMakeSetupDialog.h | 4 +- Source/QtDialog/FirstConfigure.cxx | 4 +- Source/QtDialog/QCMake.cxx | 4 +- Source/QtDialog/QCMake.h | 8 ++-- Source/QtDialog/QCMakeCacheView.cxx | 8 ++-- Source/QtDialog/QCMakeCacheView.h | 4 +- Source/QtDialog/QCMakeWidgets.cxx | 4 +- Source/QtDialog/QCMakeWidgets.h | 2 +- Source/QtDialog/RegexExplorer.h | 4 +- Source/QtDialog/WarningMessagesDialog.h | 2 +- Source/bindexplib.cxx | 6 +-- Source/cmAddLibraryCommand.cxx | 2 +- Source/cmArchiveWrite.cxx | 6 +-- Source/cmBootstrapCommands1.cxx | 6 +-- Source/cmBootstrapCommands2.cxx | 6 +-- Source/cmCPackPropertiesGenerator.cxx | 2 +- Source/cmCPackPropertiesGenerator.h | 2 +- Source/cmCTest.cxx | 34 ++++++++--------- Source/cmCacheManager.cxx | 6 +-- Source/cmCommand.h | 2 +- Source/cmComputeLinkDepends.cxx | 4 +- Source/cmComputeLinkDepends.h | 2 +- Source/cmComputeLinkInformation.cxx | 14 +++---- Source/cmComputeTargetDepends.cxx | 2 +- Source/cmConditionEvaluator.cxx | 2 +- Source/cmCoreTryCompile.cxx | 6 +-- Source/cmCryptoHash.cxx | 4 +- Source/cmCustomCommandGenerator.cxx | 6 +-- Source/cmDefinePropertyCommand.cxx | 2 +- Source/cmDepends.cxx | 6 +-- Source/cmDependsC.cxx | 2 +- Source/cmDependsFortran.cxx | 6 +-- Source/cmDocumentation.cxx | 6 +-- Source/cmELF.cxx | 4 +- Source/cmExportBuildFileGenerator.cxx | 4 +- Source/cmExportCommand.cxx | 4 +- Source/cmExportFileGenerator.cxx | 10 ++--- Source/cmExportFileGenerator.h | 2 +- Source/cmExportInstallFileGenerator.cxx | 4 +- Source/cmExportLibraryDependenciesCommand.cxx | 4 +- Source/cmExportSet.cxx | 2 +- Source/cmExportSetMap.cxx | 2 +- Source/cmExportTryCompileFileGenerator.cxx | 2 +- Source/cmExtraCodeBlocksGenerator.cxx | 4 +- Source/cmExtraCodeLiteGenerator.cxx | 10 ++--- Source/cmExtraEclipseCDT4Generator.cxx | 6 +-- Source/cmExtraKateGenerator.cxx | 4 +- Source/cmExtraSublimeTextGenerator.cxx | 2 +- Source/cmFileCommand.cxx | 18 ++++----- Source/cmFileLock.cxx | 2 +- Source/cmFileLockPool.cxx | 2 +- Source/cmFileLockUnix.cxx | 8 ++-- Source/cmFileLockWin32.cxx | 2 +- Source/cmFindCommon.cxx | 2 +- Source/cmFindCommon.h | 2 +- Source/cmFindPackageCommand.cxx | 8 ++-- Source/cmGeneratorExpression.cxx | 2 +- Source/cmGeneratorExpressionContext.h | 2 +- Source/cmGeneratorExpressionDAGChecker.cxx | 2 +- .../cmGeneratorExpressionEvaluationFile.cxx | 8 ++-- Source/cmGeneratorExpressionEvaluator.cxx | 14 +++---- Source/cmGeneratorExpressionEvaluator.h | 2 +- Source/cmGeneratorExpressionNode.cxx | 4 +- Source/cmGeneratorExpressionNode.h | 2 +- Source/cmGeneratorTarget.cxx | 18 ++++----- Source/cmGetCMakePropertyCommand.cxx | 6 +-- Source/cmGetPropertyCommand.cxx | 8 ++-- Source/cmGetTestPropertyCommand.cxx | 2 +- Source/cmGhsMultiTargetGenerator.cxx | 4 +- Source/cmGlobalGenerator.cxx | 26 ++++++------- Source/cmGlobalGenerator.h | 8 ++-- Source/cmGlobalGhsMultiGenerator.cxx | 6 +-- Source/cmGlobalGhsMultiGenerator.h | 2 +- Source/cmGlobalKdevelopGenerator.cxx | 6 +-- Source/cmGlobalNinjaGenerator.cxx | 2 +- Source/cmGlobalUnixMakefileGenerator3.cxx | 10 ++--- Source/cmGlobalVisualStudio10Generator.cxx | 2 +- Source/cmGlobalVisualStudio11Generator.cxx | 2 +- Source/cmGlobalVisualStudio12Generator.cxx | 2 +- Source/cmGlobalVisualStudio14Generator.cxx | 2 +- Source/cmGlobalVisualStudio8Generator.cxx | 4 +- Source/cmGlobalVisualStudioGenerator.cxx | 2 +- Source/cmGlobalXCodeGenerator.cxx | 16 ++++---- Source/cmGlobalXCodeGenerator.h | 2 +- Source/cmGraphVizWriter.cxx | 6 +-- Source/cmGraphVizWriter.h | 2 +- Source/cmIfCommand.cxx | 6 +-- Source/cmInstallCommand.cxx | 6 +-- Source/cmInstallExportGenerator.cxx | 8 ++-- Source/cmInstallFilesGenerator.cxx | 2 +- Source/cmInstallTargetGenerator.cxx | 4 +- Source/cmInstalledFile.cxx | 4 +- Source/cmListCommand.cxx | 6 +-- Source/cmListFileCache.cxx | 2 +- Source/cmLoadCacheCommand.cxx | 2 +- Source/cmLoadCommandCommand.cxx | 2 +- Source/cmLocalGenerator.cxx | 10 ++--- Source/cmLocalGenerator.h | 2 +- Source/cmLocalGhsMultiGenerator.cxx | 8 ++-- Source/cmLocalNinjaGenerator.cxx | 8 ++-- Source/cmLocalUnixMakefileGenerator3.cxx | 12 +++--- Source/cmLocalVisualStudio10Generator.cxx | 4 +- Source/cmLocalVisualStudio7Generator.cxx | 14 +++---- Source/cmLocalVisualStudioGenerator.cxx | 2 +- Source/cmLocalXCodeGenerator.cxx | 2 +- Source/cmMachO.cxx | 2 +- Source/cmMacroCommand.cxx | 2 +- Source/cmMakefile.cxx | 28 +++++++------- Source/cmMakefile.h | 10 ++--- Source/cmMakefileLibraryTargetGenerator.cxx | 2 +- Source/cmMakefileTargetGenerator.cxx | 12 +++--- Source/cmNinjaNormalTargetGenerator.cxx | 14 +++---- Source/cmNinjaTargetGenerator.cxx | 14 +++---- Source/cmNinjaTargetGenerator.h | 2 +- Source/cmNinjaUtilityTargetGenerator.cxx | 2 +- Source/cmOSXBundleGenerator.cxx | 2 +- Source/cmOSXBundleGenerator.h | 2 +- Source/cmOrderDirectories.cxx | 2 +- Source/cmOutputConverter.cxx | 2 +- Source/cmPolicies.cxx | 8 ++-- Source/cmPropertyDefinitionMap.cxx | 2 +- Source/cmPropertyMap.cxx | 2 +- Source/cmQtAutoGeneratorInitializer.h | 2 +- Source/cmQtAutoGenerators.cxx | 14 +++---- Source/cmQtAutoGenerators.h | 4 +- Source/cmRST.cxx | 2 +- Source/cmSearchPath.cxx | 2 +- Source/cmSetPropertyCommand.cxx | 2 +- Source/cmSetTestsPropertiesCommand.cxx | 2 +- Source/cmSourceFileLocation.cxx | 6 +-- Source/cmStandardIncludes.h | 10 ++--- Source/cmState.cxx | 6 +-- Source/cmState.h | 6 +-- Source/cmStringCommand.cxx | 2 +- Source/cmSystemTools.cxx | 14 +++---- Source/cmSystemTools.h | 2 +- Source/cmTarget.cxx | 18 ++++----- Source/cmTarget.h | 4 +- Source/cmTest.cxx | 2 +- Source/cmTest.h | 2 +- Source/cmTestGenerator.cxx | 2 +- Source/cmTimestamp.cxx | 4 +- Source/cmUseMangledMesaCommand.cxx | 2 +- Source/cmUuid.cxx | 2 +- Source/cmVisualStudio10TargetGenerator.cxx | 28 +++++++------- Source/cmXMLSafe.cxx | 2 +- Source/cmXMLSafe.h | 2 +- Source/cmake.cxx | 38 +++++++++---------- Source/cmake.h | 6 +-- Source/cmakemain.cxx | 14 +++---- Source/cmakexbuild.cxx | 2 +- Source/cmcldeps.cxx | 2 +- Source/cmcmd.cxx | 8 ++-- Source/ctest.cxx | 4 +- Tests/BuildDepends/Project/bar.cxx | 4 +- Tests/BuildDepends/Project/ninjadep.cpp | 2 +- Tests/BuildDepends/Project/zot.cxx | 2 +- Tests/BundleTest/BundleLib.cxx | 2 +- Tests/BundleUtilities/module.cpp | 2 +- .../target_include_directories/consumer.cpp | 8 ++-- .../target_link_libraries/targetC.cpp | 2 +- Tests/CMakeLib/testUTF8.cxx | 2 +- Tests/CompileDefinitions/runtest.c | 4 +- Tests/Complex/Executable/complex.cxx | 8 ++-- Tests/ComplexOneConfig/Executable/complex.cxx | 8 ++-- .../Export/testSharedLibDepends.h | 2 +- .../Import/A/deps_shared_iface.cpp | 2 +- Tests/FindGSL/rng/main.cc | 2 +- Tests/FindGTK2/cairomm/main.cpp | 6 +-- Tests/FindGTK2/gtkmm/main.cpp | 2 +- Tests/FindGTK2/sigc++/main.cpp | 3 +- Tests/FindLTTngUST/Test/main.c | 4 +- Tests/FindPNG/Test/main.c | 2 +- Tests/FindPackageModeMakefileTest/main.cpp | 2 +- Tests/FindXalanC/Test/main.cxx | 2 +- .../TargetIncludeDirectories/main.cpp | 14 +++---- .../LoadCommand/CMakeCommands/cmTestCommand.c | 4 +- .../CMakeCommands/cmTestCommand.c | 4 +- Tests/MFC/mfc1/mfc1.cpp | 2 +- Tests/MFC/mfc1/stdafx.h | 6 +-- .../OutOfSource/OutOfSourceSubdir/simple.cxx | 2 +- Tests/Plugin/src/example_exe.cxx | 2 +- Tests/Preprocess/preprocess.c | 2 +- Tests/Preprocess/preprocess.cxx | 2 +- Tests/Qt4Deploy/testdeploy.cpp | 4 +- Tests/QtAutogen/Bdir/libB.h | 2 +- Tests/QtAutogen/calwidget.cpp | 12 +++--- Tests/QtAutogen/codeeditor.h | 2 +- Tests/QtAutogen/libC.h | 2 +- Tests/QtAutogen/main.cpp | 14 +++---- Tests/QtAutogen/resourcetester.cpp | 2 +- Tests/QtAutogen/same_name/ccc/item.cpp | 2 +- Tests/QtAutogen/same_name/main.cpp | 4 +- Tests/RunCMake/AutoExportDll/hello.cxx | 2 +- Tests/RunCMake/AutoExportDll/say.cxx | 2 +- Tests/StagingPrefix/Consumer/main.cpp | 2 +- Tests/TestsWorkingDirectory/main.c | 2 +- Tests/Tutorial/Step1/tutorial.cxx | 4 +- Tests/Tutorial/Step2/MathFunctions/mysqrt.cxx | 2 +- Tests/Tutorial/Step2/tutorial.cxx | 4 +- Tests/Tutorial/Step3/MathFunctions/mysqrt.cxx | 2 +- Tests/Tutorial/Step3/tutorial.cxx | 4 +- Tests/Tutorial/Step4/MathFunctions/mysqrt.cxx | 2 +- Tests/Tutorial/Step4/tutorial.cxx | 4 +- .../Step5/MathFunctions/MakeTable.cxx | 2 +- Tests/Tutorial/Step5/MathFunctions/mysqrt.cxx | 2 +- Tests/Tutorial/Step5/tutorial.cxx | 4 +- .../Step6/MathFunctions/MakeTable.cxx | 2 +- Tests/Tutorial/Step6/MathFunctions/mysqrt.cxx | 2 +- Tests/Tutorial/Step6/tutorial.cxx | 4 +- .../Step7/MathFunctions/MakeTable.cxx | 2 +- Tests/Tutorial/Step7/MathFunctions/mysqrt.cxx | 2 +- Tests/Tutorial/Step7/tutorial.cxx | 4 +- Tests/VSResource/main.cpp | 2 +- .../Direct3DApp1/Direct3DApp1.cpp | 2 +- .../Direct3DApp1/DirectXHelper.h | 2 +- Tests/VSWinStorePhone/Direct3DApp1/pch.h | 6 +-- Tests/Wrapping/qtwrappingmain.cxx | 4 +- Tests/X11/HelloWorldX11.cxx | 2 +- 280 files changed, 813 insertions(+), 814 deletions(-) diff --git a/Modules/CheckForPthreads.c b/Modules/CheckForPthreads.c index 344c81bee..9629a66f0 100644 --- a/Modules/CheckForPthreads.c +++ b/Modules/CheckForPthreads.c @@ -1,5 +1,5 @@ -#include #include +#include #include void* runner(void*); diff --git a/Source/CPack/IFW/cmCPackIFWGenerator.cxx b/Source/CPack/IFW/cmCPackIFWGenerator.cxx index 50ac971d1..c10803cc5 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 #include +#include -#include -#include #include +#include #include +#include -#include -#include -#include #include -#include -#include +#include +#include +#include #include +#include +#include //---------------------------------------------------------------------------- cmCPackIFWGenerator::cmCPackIFWGenerator() diff --git a/Source/CPack/IFW/cmCPackIFWGenerator.h b/Source/CPack/IFW/cmCPackIFWGenerator.h index 5770451ee..001c8c782 100644 --- a/Source/CPack/IFW/cmCPackIFWGenerator.h +++ b/Source/CPack/IFW/cmCPackIFWGenerator.h @@ -15,8 +15,8 @@ #include -#include "cmCPackIFWPackage.h" #include "cmCPackIFWInstaller.h" +#include "cmCPackIFWPackage.h" class cmXMLWriter; diff --git a/Source/CPack/OSXScriptLauncher.cxx b/Source/CPack/OSXScriptLauncher.cxx index c271517f1..b3ddeee35 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 -#include #include +#include +#include #include diff --git a/Source/CPack/WiX/cmCPackWIXGenerator.cxx b/Source/CPack/WiX/cmCPackWIXGenerator.cxx index ece327a41..a98c68406 100644 --- a/Source/CPack/WiX/cmCPackWIXGenerator.cxx +++ b/Source/CPack/WiX/cmCPackWIXGenerator.cxx @@ -12,23 +12,23 @@ #include "cmCPackWIXGenerator.h" -#include -#include -#include -#include -#include #include +#include +#include +#include +#include +#include -#include "cmWIXSourceWriter.h" #include "cmWIXDirectoriesSourceWriter.h" #include "cmWIXFeaturesSourceWriter.h" #include "cmWIXFilesSourceWriter.h" #include "cmWIXRichTextFormatWriter.h" +#include "cmWIXSourceWriter.h" -#include #include #include #include +#include #include // for GUID generation diff --git a/Source/CPack/WiX/cmCPackWIXGenerator.h b/Source/CPack/WiX/cmCPackWIXGenerator.h index 8372cd6bb..871527b83 100644 --- a/Source/CPack/WiX/cmCPackWIXGenerator.h +++ b/Source/CPack/WiX/cmCPackWIXGenerator.h @@ -18,8 +18,8 @@ #include "cmWIXPatch.h" #include "cmWIXShortcut.h" -#include #include +#include class cmWIXSourceWriter; class cmWIXDirectoriesSourceWriter; diff --git a/Source/CPack/WiX/cmWIXAccessControlList.h b/Source/CPack/WiX/cmWIXAccessControlList.h index 54c2c19b4..72939958b 100644 --- a/Source/CPack/WiX/cmWIXAccessControlList.h +++ b/Source/CPack/WiX/cmWIXAccessControlList.h @@ -15,8 +15,8 @@ #include "cmWIXSourceWriter.h" -#include #include +#include class cmWIXAccessControlList { diff --git a/Source/CPack/WiX/cmWIXFilesSourceWriter.h b/Source/CPack/WiX/cmWIXFilesSourceWriter.h index 9df955ba9..734f9011e 100644 --- a/Source/CPack/WiX/cmWIXFilesSourceWriter.h +++ b/Source/CPack/WiX/cmWIXFilesSourceWriter.h @@ -15,8 +15,8 @@ #include "cmWIXSourceWriter.h" -#include "cmWIXShortcut.h" #include "cmWIXPatch.h" +#include "cmWIXShortcut.h" #include diff --git a/Source/CPack/WiX/cmWIXPatch.h b/Source/CPack/WiX/cmWIXPatch.h index 2f31a013e..5b0eb3b7c 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 diff --git a/Source/CPack/WiX/cmWIXShortcut.h b/Source/CPack/WiX/cmWIXShortcut.h index 2a72394c5..598aa0d32 100644 --- a/Source/CPack/WiX/cmWIXShortcut.h +++ b/Source/CPack/WiX/cmWIXShortcut.h @@ -15,9 +15,9 @@ #include -#include #include #include +#include #include class cmWIXFilesSourceWriter; diff --git a/Source/CPack/WiX/cmWIXSourceWriter.h b/Source/CPack/WiX/cmWIXSourceWriter.h index be0c169e3..2bf96746b 100644 --- a/Source/CPack/WiX/cmWIXSourceWriter.h +++ b/Source/CPack/WiX/cmWIXSourceWriter.h @@ -17,8 +17,8 @@ #include -#include #include +#include /** \class cmWIXSourceWriter * \brief Helper class to generate XML WiX source files diff --git a/Source/CPack/cmCPackArchiveGenerator.cxx b/Source/CPack/cmCPackArchiveGenerator.cxx index db985db81..37e8bf02e 100644 --- a/Source/CPack/cmCPackArchiveGenerator.cxx +++ b/Source/CPack/cmCPackArchiveGenerator.cxx @@ -12,17 +12,17 @@ #include "cmCPackArchiveGenerator.h" -#include "cmake.h" -#include "cmGlobalGenerator.h" -#include "cmSystemTools.h" -#include "cmMakefile.h" -#include "cmGeneratedFileStream.h" #include "cmCPackLog.h" +#include "cmGeneratedFileStream.h" +#include "cmGlobalGenerator.h" +#include "cmMakefile.h" +#include "cmSystemTools.h" +#include "cmake.h" #include -#include -#include #include +#include +#include //---------------------------------------------------------------------- cmCPackArchiveGenerator::cmCPackArchiveGenerator(cmArchiveWrite::Compress t, diff --git a/Source/CPack/cmCPackComponentGroup.cxx b/Source/CPack/cmCPackComponentGroup.cxx index 2d41e59e7..b84758956 100644 --- a/Source/CPack/cmCPackComponentGroup.cxx +++ b/Source/CPack/cmCPackComponentGroup.cxx @@ -14,8 +14,8 @@ #include "cmSystemTools.h" -#include #include +#include //---------------------------------------------------------------------- unsigned long cmCPackComponent::GetInstalledSize( diff --git a/Source/CPack/cmCPackCygwinBinaryGenerator.cxx b/Source/CPack/cmCPackCygwinBinaryGenerator.cxx index 1f905c030..687689c20 100644 --- a/Source/CPack/cmCPackCygwinBinaryGenerator.cxx +++ b/Source/CPack/cmCPackCygwinBinaryGenerator.cxx @@ -12,12 +12,12 @@ #include "cmCPackCygwinBinaryGenerator.h" -#include "cmake.h" -#include "cmGlobalGenerator.h" -#include "cmSystemTools.h" -#include "cmMakefile.h" -#include "cmGeneratedFileStream.h" #include "cmCPackLog.h" +#include "cmGeneratedFileStream.h" +#include "cmGlobalGenerator.h" +#include "cmMakefile.h" +#include "cmSystemTools.h" +#include "cmake.h" #include diff --git a/Source/CPack/cmCPackCygwinSourceGenerator.cxx b/Source/CPack/cmCPackCygwinSourceGenerator.cxx index f5cb53cc9..d84b1eede 100644 --- a/Source/CPack/cmCPackCygwinSourceGenerator.cxx +++ b/Source/CPack/cmCPackCygwinSourceGenerator.cxx @@ -12,12 +12,12 @@ #include "cmCPackCygwinSourceGenerator.h" -#include "cmake.h" -#include "cmGlobalGenerator.h" -#include "cmSystemTools.h" -#include "cmMakefile.h" -#include "cmGeneratedFileStream.h" #include "cmCPackLog.h" +#include "cmGeneratedFileStream.h" +#include "cmGlobalGenerator.h" +#include "cmMakefile.h" +#include "cmSystemTools.h" +#include "cmake.h" #include @@ -25,8 +25,8 @@ // system tools because it is not implemented robustly enough to move // files across directories. #ifdef _WIN32 -# include # include +# include #endif //---------------------------------------------------------------------- diff --git a/Source/CPack/cmCPackDebGenerator.cxx b/Source/CPack/cmCPackDebGenerator.cxx index 96739427e..9e17bc836 100644 --- a/Source/CPack/cmCPackDebGenerator.cxx +++ b/Source/CPack/cmCPackDebGenerator.cxx @@ -12,14 +12,14 @@ #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 #include +#include #include // USHRT_MAX #include @@ -764,8 +764,8 @@ std::string cmCPackDebGenerator::GetComponentInstallDirNameSuffix( #include #include -#include #include +#include #define ARMAG "!\n" /* ar "magic number" */ #define SARMAG 8 /* strlen(ARMAG); */ diff --git a/Source/CPack/cmCPackDragNDropGenerator.cxx b/Source/CPack/cmCPackDragNDropGenerator.cxx index eccc5cf56..b9c9c85be 100644 --- a/Source/CPack/cmCPackDragNDropGenerator.cxx +++ b/Source/CPack/cmCPackDragNDropGenerator.cxx @@ -13,11 +13,11 @@ #include "cmCPackDragNDropGenerator.h" #include "cmCPackLog.h" -#include "cmSystemTools.h" #include "cmGeneratedFileStream.h" +#include "cmSystemTools.h" -#include #include +#include #include diff --git a/Source/CPack/cmCPackGenerator.cxx b/Source/CPack/cmCPackGenerator.cxx index 3eca280cc..6cc67e7fe 100644 --- a/Source/CPack/cmCPackGenerator.cxx +++ b/Source/CPack/cmCPackGenerator.cxx @@ -12,18 +12,18 @@ #include "cmCPackGenerator.h" -#include "cmMakefile.h" -#include "cmCPackLog.h" -#include "cmake.h" -#include "cmGlobalGenerator.h" -#include "cmGeneratedFileStream.h" #include "cmCPackComponentGroup.h" +#include "cmCPackLog.h" +#include "cmGeneratedFileStream.h" +#include "cmGlobalGenerator.h" +#include "cmMakefile.h" #include "cmXMLSafe.h" +#include "cmake.h" -#include -#include -#include #include +#include +#include +#include #include #if defined(__HAIKU__) diff --git a/Source/CPack/cmCPackGeneratorFactory.cxx b/Source/CPack/cmCPackGeneratorFactory.cxx index 46261427d..669964da9 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 5ba639fee..eeb46fdff 100644 --- a/Source/CPack/cmCPackNSISGenerator.cxx +++ b/Source/CPack/cmCPackNSISGenerator.cxx @@ -12,17 +12,17 @@ #include "cmCPackNSISGenerator.h" -#include "cmGlobalGenerator.h" -#include "cmSystemTools.h" -#include "cmMakefile.h" -#include "cmGeneratedFileStream.h" -#include "cmCPackLog.h" #include "cmCPackComponentGroup.h" +#include "cmCPackLog.h" +#include "cmGeneratedFileStream.h" +#include "cmGlobalGenerator.h" +#include "cmMakefile.h" +#include "cmSystemTools.h" -#include -#include #include +#include #include +#include /* NSIS uses different command line syntax on Windows and others */ #ifdef _WIN32 diff --git a/Source/CPack/cmCPackOSXX11Generator.cxx b/Source/CPack/cmCPackOSXX11Generator.cxx index cde08b10d..1d7ef69b5 100644 --- a/Source/CPack/cmCPackOSXX11Generator.cxx +++ b/Source/CPack/cmCPackOSXX11Generator.cxx @@ -12,15 +12,15 @@ #include "cmCPackOSXX11Generator.h" -#include "cmake.h" -#include "cmGlobalGenerator.h" -#include "cmSystemTools.h" -#include "cmMakefile.h" -#include "cmGeneratedFileStream.h" #include "cmCPackLog.h" +#include "cmGeneratedFileStream.h" +#include "cmGlobalGenerator.h" +#include "cmMakefile.h" +#include "cmSystemTools.h" +#include "cmake.h" -#include #include +#include #include //---------------------------------------------------------------------- diff --git a/Source/CPack/cmCPackPackageMakerGenerator.cxx b/Source/CPack/cmCPackPackageMakerGenerator.cxx index 8fdc03660..4f6238e36 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 -#include #include +#include +#include #include diff --git a/Source/CPack/cmCPackSTGZGenerator.cxx b/Source/CPack/cmCPackSTGZGenerator.cxx index 68b893f6f..8a83666fa 100644 --- a/Source/CPack/cmCPackSTGZGenerator.cxx +++ b/Source/CPack/cmCPackSTGZGenerator.cxx @@ -12,14 +12,14 @@ #include "cmCPackSTGZGenerator.h" -#include "cmake.h" -#include "cmGlobalGenerator.h" -#include "cmSystemTools.h" -#include "cmMakefile.h" #include "cmCPackLog.h" +#include "cmGlobalGenerator.h" +#include "cmMakefile.h" +#include "cmSystemTools.h" +#include "cmake.h" -#include #include +#include #include //---------------------------------------------------------------------- diff --git a/Source/CPack/cpack.cxx b/Source/CPack/cpack.cxx index c08897fa4..813fb0159 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 -#include #include +#include //---------------------------------------------------------------------------- static const char * cmDocumentationName[][2] = diff --git a/Source/CTest/cmCTestBatchTestHandler.cxx b/Source/CTest/cmCTestBatchTestHandler.cxx index e462d4aab..41f4f1254 100644 --- a/Source/CTest/cmCTestBatchTestHandler.cxx +++ b/Source/CTest/cmCTestBatchTestHandler.cxx @@ -12,9 +12,9 @@ #include "cmCTestBatchTestHandler.h" +#include "cmCTest.h" #include "cmProcess.h" #include "cmStandardIncludes.h" -#include "cmCTest.h" #include "cmSystemTools.h" #include diff --git a/Source/CTest/cmCTestBatchTestHandler.h b/Source/CTest/cmCTestBatchTestHandler.h index 5ff002583..b0fc8d56a 100644 --- a/Source/CTest/cmCTestBatchTestHandler.h +++ b/Source/CTest/cmCTestBatchTestHandler.h @@ -15,9 +15,9 @@ #include -#include #include #include +#include #include /** \class cmCTestBatchTestHandler diff --git a/Source/CTest/cmCTestBuildAndTestHandler.cxx b/Source/CTest/cmCTestBuildAndTestHandler.cxx index 20d303d82..52433da6e 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 "cmGlobalGenerator.h" -#include #include "cmCTestTestHandler.h" +#include "cmGlobalGenerator.h" +#include "cmSystemTools.h" +#include "cmake.h" +#include //---------------------------------------------------------------------- cmCTestBuildAndTestHandler::cmCTestBuildAndTestHandler() diff --git a/Source/CTest/cmCTestBuildCommand.cxx b/Source/CTest/cmCTestBuildCommand.cxx index 27e22c4c7..0cfcc64b2 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 0d74f48f2..1b31533d8 100644 --- a/Source/CTest/cmCTestBuildHandler.cxx +++ b/Source/CTest/cmCTestBuildHandler.cxx @@ -12,29 +12,29 @@ #include "cmCTestBuildHandler.h" -#include "cmCTest.h" -#include "cmake.h" -#include "cmMakefile.h" -#include "cmGlobalGenerator.h" -#include "cmGeneratedFileStream.h" -#include "cmXMLWriter.h" -#include "cmFileTimeComparison.h" #include "cmAlgorithms.h" +#include "cmCTest.h" +#include "cmFileTimeComparison.h" +#include "cmGeneratedFileStream.h" +#include "cmGlobalGenerator.h" +#include "cmMakefile.h" +#include "cmXMLWriter.h" +#include "cmake.h" //#include -#include #include #include +#include // used for sleep #ifdef _WIN32 #include "windows.h" #endif +#include +#include #include #include -#include -#include static const char* cmCTestErrorMatches[] = { diff --git a/Source/CTest/cmCTestCVS.cxx b/Source/CTest/cmCTestCVS.cxx index 0fb3fec57..58d86891e 100644 --- a/Source/CTest/cmCTestCVS.cxx +++ b/Source/CTest/cmCTestCVS.cxx @@ -15,8 +15,8 @@ #include "cmSystemTools.h" #include "cmXMLWriter.h" -#include #include +#include //---------------------------------------------------------------------------- cmCTestCVS::cmCTestCVS(cmCTest* ct, std::ostream& log): cmCTestVC(ct, log) diff --git a/Source/CTest/cmCTestConfigureCommand.cxx b/Source/CTest/cmCTestConfigureCommand.cxx index ba4dab235..8f15c6d2e 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 2e8aeb956..e9f8f3928 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 diff --git a/Source/CTest/cmCTestCoverageHandler.cxx b/Source/CTest/cmCTestCoverageHandler.cxx index b05496add..79eb3460a 100644 --- a/Source/CTest/cmCTestCoverageHandler.cxx +++ b/Source/CTest/cmCTestCoverageHandler.cxx @@ -11,28 +11,28 @@ ============================================================================*/ #include "cmCTestCoverageHandler.h" -#include "cmParsePHPCoverage.h" -#include "cmParseCoberturaCoverage.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 "cmSystemTools.h" #include "cmGeneratedFileStream.h" +#include "cmMakefile.h" +#include "cmParseBlanketJSCoverage.h" +#include "cmParseCacheCoverage.h" +#include "cmParseCoberturaCoverage.h" +#include "cmParseDelphiCoverage.h" +#include "cmParseGTMCoverage.h" +#include "cmParseJacocoCoverage.h" +#include "cmParsePHPCoverage.h" +#include "cmSystemTools.h" #include "cmXMLWriter.h" +#include "cmake.h" +#include +#include #include #include -#include -#include -#include -#include #include +#include +#include #define SAFEDIV(x,y) (((y)!=0)?((x)/(y)):(0)) diff --git a/Source/CTest/cmCTestCurl.cxx b/Source/CTest/cmCTestCurl.cxx index fb6cc007f..0367d7d95 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 1d6bdcea1..3ff12c18f 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 -#include #include +#include +#include #include -#include #include +#include //---------------------------------------------------------------------------- static unsigned int cmCTestGITVersion(unsigned int epic, unsigned int major, diff --git a/Source/CTest/cmCTestLaunch.cxx b/Source/CTest/cmCTestLaunch.cxx index 749a5beec..03b06f87c 100644 --- a/Source/CTest/cmCTestLaunch.cxx +++ b/Source/CTest/cmCTestLaunch.cxx @@ -16,14 +16,14 @@ #include "cmXMLWriter.h" #include "cmake.h" +#include #include #include #include -#include #ifdef _WIN32 -#include // for _setmode #include // for _O_BINARY +#include // for _setmode #include // for std{out,err} and fileno #endif diff --git a/Source/CTest/cmCTestMemCheckHandler.cxx b/Source/CTest/cmCTestMemCheckHandler.cxx index 3d0f16add..9e3ba576b 100644 --- a/Source/CTest/cmCTestMemCheckHandler.cxx +++ b/Source/CTest/cmCTestMemCheckHandler.cxx @@ -12,21 +12,21 @@ #include "cmCTestMemCheckHandler.h" -#include "cmXMLParser.h" #include "cmCTest.h" -#include "cmake.h" #include "cmGeneratedFileStream.h" +#include "cmMakefile.h" +#include "cmXMLParser.h" +#include "cmXMLWriter.h" +#include "cmake.h" +#include +#include +#include #include #include -#include -#include -#include -#include "cmMakefile.h" -#include "cmXMLWriter.h" -#include -#include #include +#include +#include struct CatToErrorType { diff --git a/Source/CTest/cmCTestMemCheckHandler.h b/Source/CTest/cmCTestMemCheckHandler.h index 01311b634..62329245c 100644 --- a/Source/CTest/cmCTestMemCheckHandler.h +++ b/Source/CTest/cmCTestMemCheckHandler.h @@ -16,8 +16,8 @@ #include "cmCTestTestHandler.h" #include "cmListFileCache.h" -#include #include +#include class cmMakefile; class cmXMLWriter; diff --git a/Source/CTest/cmCTestMultiProcessHandler.cxx b/Source/CTest/cmCTestMultiProcessHandler.cxx index df6aff1c8..143451842 100644 --- a/Source/CTest/cmCTestMultiProcessHandler.cxx +++ b/Source/CTest/cmCTestMultiProcessHandler.cxx @@ -11,18 +11,18 @@ ============================================================================*/ #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 -#include -#include -#include -#include #include #include +#include +#include +#include +#include +#include class TestComparator { diff --git a/Source/CTest/cmCTestP4.cxx b/Source/CTest/cmCTestP4.cxx index 5e0c54a3f..f7c960c53 100644 --- a/Source/CTest/cmCTestP4.cxx +++ b/Source/CTest/cmCTestP4.cxx @@ -14,12 +14,12 @@ #include "cmCTest.h" #include "cmSystemTools.h" -#include #include +#include #include -#include #include +#include //---------------------------------------------------------------------------- cmCTestP4::cmCTestP4(cmCTest* ct, std::ostream& log): diff --git a/Source/CTest/cmCTestP4.h b/Source/CTest/cmCTestP4.h index 6f907d10b..d666bd813 100644 --- a/Source/CTest/cmCTestP4.h +++ b/Source/CTest/cmCTestP4.h @@ -14,8 +14,8 @@ #include "cmCTestGlobalVC.h" -#include #include +#include /** \class cmCTestP4 * \brief Interaction with the Perforce command-line tool diff --git a/Source/CTest/cmCTestRunTest.cxx b/Source/CTest/cmCTestRunTest.cxx index 34ad2d023..5d159c19f 100644 --- a/Source/CTest/cmCTestRunTest.cxx +++ b/Source/CTest/cmCTestRunTest.cxx @@ -12,8 +12,8 @@ #include "cmCTestRunTest.h" -#include "cmCTestMemCheckHandler.h" #include "cmCTest.h" +#include "cmCTestMemCheckHandler.h" #include "cmSystemTools.h" #include "cm_curl.h" diff --git a/Source/CTest/cmCTestScriptHandler.cxx b/Source/CTest/cmCTestScriptHandler.cxx index ee15271a0..4485d34b9 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 -#include #include +#include // used for sleep #ifdef _WIN32 #include "windows.h" #endif +#include +#include #include #include -#include -#include // needed for sleep #if !defined(_WIN32) diff --git a/Source/CTest/cmCTestStartCommand.cxx b/Source/CTest/cmCTestStartCommand.cxx index 36576c540..4a38dc67c 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/cmCTestSubmitHandler.cxx b/Source/CTest/cmCTestSubmitHandler.cxx index 3b682e39a..6a65839f8 100644 --- a/Source/CTest/cmCTestSubmitHandler.cxx +++ b/Source/CTest/cmCTestSubmitHandler.cxx @@ -11,25 +11,25 @@ ============================================================================*/ #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 #include +#include // For XML-RPC submission #include "cm_xmlrpc.h" #include // For curl submission -#include "cmCurl.h" #include "cmCTestCurl.h" +#include "cmCurl.h" #include diff --git a/Source/CTest/cmCTestTestHandler.cxx b/Source/CTest/cmCTestTestHandler.cxx index f91fa5fe1..d8229da76 100644 --- a/Source/CTest/cmCTestTestHandler.cxx +++ b/Source/CTest/cmCTestTestHandler.cxx @@ -12,27 +12,27 @@ #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 "cmGeneratedFileStream.h" -#include -#include -#include -#include -#include -#include "cmMakefile.h" -#include "cmGlobalGenerator.h" #include "cmCommand.h" +#include "cmGeneratedFileStream.h" +#include "cmGlobalGenerator.h" +#include "cmMakefile.h" #include "cmSystemTools.h" #include "cmXMLWriter.h" #include "cm_utf8.h" +#include "cmake.h" +#include +#include +#include +#include +#include -#include -#include #include +#include +#include #include diff --git a/Source/CTest/cmCTestUpdateHandler.cxx b/Source/CTest/cmCTestUpdateHandler.cxx index bf2f34ac7..b1b0a21f9 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 "cmGlobalGenerator.h" -#include "cmVersion.h" #include "cmGeneratedFileStream.h" +#include "cmGlobalGenerator.h" +#include "cmMakefile.h" +#include "cmVersion.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 @@ -40,9 +40,9 @@ #include "windows.h" #endif -#include -#include #include +#include +#include //---------------------------------------------------------------------- static const char* cmCTestUpdateHandlerUpdateStrings[] = diff --git a/Source/CTest/cmParseBlanketJSCoverage.cxx b/Source/CTest/cmParseBlanketJSCoverage.cxx index 26dd425f7..1f1db3eaf 100644 --- a/Source/CTest/cmParseBlanketJSCoverage.cxx +++ b/Source/CTest/cmParseBlanketJSCoverage.cxx @@ -11,12 +11,12 @@ ============================================================================*/ #include "cmParseBlanketJSCoverage.h" -#include -#include #include "cmSystemTools.h" #include -#include #include +#include +#include +#include class cmParseBlanketJSCoverage::JSONParser diff --git a/Source/CTest/cmParseCacheCoverage.cxx b/Source/CTest/cmParseCacheCoverage.cxx index 38e0ac226..f8380871f 100644 --- a/Source/CTest/cmParseCacheCoverage.cxx +++ b/Source/CTest/cmParseCacheCoverage.cxx @@ -1,11 +1,11 @@ #include "cmParseCacheCoverage.h" -#include -#include #include "cmSystemTools.h" #include -#include #include +#include +#include +#include cmParseCacheCoverage::cmParseCacheCoverage( diff --git a/Source/CTest/cmParseDelphiCoverage.cxx b/Source/CTest/cmParseDelphiCoverage.cxx index ed526263a..09c4f02b0 100644 --- a/Source/CTest/cmParseDelphiCoverage.cxx +++ b/Source/CTest/cmParseDelphiCoverage.cxx @@ -1,12 +1,12 @@ #include "cmParseDelphiCoverage.h" -#include -#include #include "cmSystemTools.h" #include "cmXMLParser.h" #include -#include #include +#include +#include +#include class cmParseDelphiCoverage::HTMLParser diff --git a/Source/CTest/cmParseGTMCoverage.cxx b/Source/CTest/cmParseGTMCoverage.cxx index 56922468f..ae7dedbfa 100644 --- a/Source/CTest/cmParseGTMCoverage.cxx +++ b/Source/CTest/cmParseGTMCoverage.cxx @@ -1,11 +1,11 @@ #include "cmParseGTMCoverage.h" -#include -#include #include "cmSystemTools.h" #include -#include #include +#include +#include +#include cmParseGTMCoverage::cmParseGTMCoverage(cmCTestCoverageHandlerContainer& cont, diff --git a/Source/CTest/cmParseJacocoCoverage.cxx b/Source/CTest/cmParseJacocoCoverage.cxx index f5386c952..d9c4ffb41 100644 --- a/Source/CTest/cmParseJacocoCoverage.cxx +++ b/Source/CTest/cmParseJacocoCoverage.cxx @@ -1,12 +1,12 @@ #include "cmParseJacocoCoverage.h" -#include -#include #include "cmSystemTools.h" #include "cmXMLParser.h" #include -#include #include +#include +#include +#include class cmParseJacocoCoverage::XMLParser: public cmXMLParser diff --git a/Source/CTest/cmParseMumpsCoverage.cxx b/Source/CTest/cmParseMumpsCoverage.cxx index 65679064a..d0c7599d2 100644 --- a/Source/CTest/cmParseMumpsCoverage.cxx +++ b/Source/CTest/cmParseMumpsCoverage.cxx @@ -1,11 +1,11 @@ #include "cmParseGTMCoverage.h" -#include -#include #include "cmSystemTools.h" #include -#include #include +#include +#include +#include cmParseMumpsCoverage::cmParseMumpsCoverage( diff --git a/Source/CursesDialog/ccmake.cxx b/Source/CursesDialog/ccmake.cxx index 7bff0f086..b7c22b109 100644 --- a/Source/CursesDialog/ccmake.cxx +++ b/Source/CursesDialog/ccmake.cxx @@ -11,9 +11,9 @@ ============================================================================*/ #include "cmCursesStandardIncludes.h" +#include "../cmDocumentation.h" #include "../cmSystemTools.h" #include "../cmake.h" -#include "../cmDocumentation.h" #include #include diff --git a/Source/CursesDialog/cmCursesCacheEntryComposite.cxx b/Source/CursesDialog/cmCursesCacheEntryComposite.cxx index ace5c435c..40c0eb6ef 100644 --- a/Source/CursesDialog/cmCursesCacheEntryComposite.cxx +++ b/Source/CursesDialog/cmCursesCacheEntryComposite.cxx @@ -11,16 +11,16 @@ ============================================================================*/ #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 diff --git a/Source/CursesDialog/cmCursesLongMessageForm.cxx b/Source/CursesDialog/cmCursesLongMessageForm.cxx index cd8f3f163..776d828a9 100644 --- a/Source/CursesDialog/cmCursesLongMessageForm.cxx +++ b/Source/CursesDialog/cmCursesLongMessageForm.cxx @@ -12,8 +12,8 @@ #include "cmCursesLongMessageForm.h" #include "../cmSystemTools.h" -#include "../cmake.h" #include "../cmVersion.h" +#include "../cmake.h" #include "cmCursesMainForm.h" inline int ctrl(int z) diff --git a/Source/CursesDialog/cmCursesMainForm.cxx b/Source/CursesDialog/cmCursesMainForm.cxx index 8c2a8b46b..2aafc8b34 100644 --- a/Source/CursesDialog/cmCursesMainForm.cxx +++ b/Source/CursesDialog/cmCursesMainForm.cxx @@ -14,15 +14,15 @@ #include "../cmSystemTools.h" #include "../cmVersion.h" #include "../cmake.h" -#include "cmCursesStringWidget.h" -#include "cmCursesLabelWidget.h" -#include "cmCursesBoolWidget.h" -#include "cmCursesPathWidget.h" -#include "cmCursesFilePathWidget.h" -#include "cmCursesDummyWidget.h" -#include "cmCursesCacheEntryComposite.h" -#include "cmCursesLongMessageForm.h" #include "cmAlgorithms.h" +#include "cmCursesBoolWidget.h" +#include "cmCursesCacheEntryComposite.h" +#include "cmCursesDummyWidget.h" +#include "cmCursesFilePathWidget.h" +#include "cmCursesLabelWidget.h" +#include "cmCursesLongMessageForm.h" +#include "cmCursesPathWidget.h" +#include "cmCursesStringWidget.h" #include "cmState.h" diff --git a/Source/QtDialog/AddCacheEntry.cxx b/Source/QtDialog/AddCacheEntry.cxx index b575f757e..efb2b6555 100644 --- a/Source/QtDialog/AddCacheEntry.cxx +++ b/Source/QtDialog/AddCacheEntry.cxx @@ -12,8 +12,8 @@ #include "AddCacheEntry.h" -#include #include +#include static const int NumTypes = 4; static const int DefaultTypeIndex = 0; diff --git a/Source/QtDialog/AddCacheEntry.h b/Source/QtDialog/AddCacheEntry.h index c327915b0..7c08af6a8 100644 --- a/Source/QtDialog/AddCacheEntry.h +++ b/Source/QtDialog/AddCacheEntry.h @@ -15,9 +15,9 @@ #include "QCMake.h" -#include #include #include +#include #include "ui_AddCacheEntry.h" diff --git a/Source/QtDialog/CMakeSetup.cxx b/Source/QtDialog/CMakeSetup.cxx index 72adb8d75..b44219fdd 100644 --- a/Source/QtDialog/CMakeSetup.cxx +++ b/Source/QtDialog/CMakeSetup.cxx @@ -11,19 +11,19 @@ ============================================================================*/ #include "QCMake.h" // include to disable MS warnings +#include "CMakeSetupDialog.h" +#include "cmAlgorithms.h" +#include "cmDocumentation.h" +#include "cmVersion.h" +#include "cmake.h" #include #include -#include #include #include -#include "CMakeSetupDialog.h" -#include "cmDocumentation.h" -#include "cmake.h" -#include "cmVersion.h" -#include "cmAlgorithms.h" +#include #include -#include #include +#include //---------------------------------------------------------------------------- static const char * cmDocumentationName[][2] = diff --git a/Source/QtDialog/CMakeSetupDialog.cxx b/Source/QtDialog/CMakeSetupDialog.cxx index f25f40232..945739d8f 100644 --- a/Source/QtDialog/CMakeSetupDialog.cxx +++ b/Source/QtDialog/CMakeSetupDialog.cxx @@ -12,28 +12,28 @@ #include "CMakeSetupDialog.h" -#include -#include -#include -#include -#include -#include #include #include -#include +#include +#include +#include +#include +#include #include #include -#include +#include #include -#include +#include +#include #include -#include -#include +#include +#include +#include -#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 eaac61c6a..f9624d1d9 100644 --- a/Source/QtDialog/CMakeSetupDialog.h +++ b/Source/QtDialog/CMakeSetupDialog.h @@ -15,10 +15,10 @@ #include "QCMake.h" +#include "ui_CMakeSetupDialog.h" +#include #include #include -#include -#include "ui_CMakeSetupDialog.h" class QCMakeThread; class CMakeCacheModel; diff --git a/Source/QtDialog/FirstConfigure.cxx b/Source/QtDialog/FirstConfigure.cxx index 64fe67605..5c0af2b36 100644 --- a/Source/QtDialog/FirstConfigure.cxx +++ b/Source/QtDialog/FirstConfigure.cxx @@ -3,9 +3,9 @@ #include "Compilers.h" -#include -#include #include +#include +#include #include diff --git a/Source/QtDialog/QCMake.cxx b/Source/QtDialog/QCMake.cxx index dd7c1387a..28be34166 100644 --- a/Source/QtDialog/QCMake.cxx +++ b/Source/QtDialog/QCMake.cxx @@ -12,12 +12,12 @@ #include "QCMake.h" -#include #include +#include +#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 ca6f0f4a1..5cae06d4a 100644 --- a/Source/QtDialog/QCMake.h +++ b/Source/QtDialog/QCMake.h @@ -22,13 +22,13 @@ #include +#include +#include +#include #include #include -#include -#include #include -#include -#include +#include /// 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 bae6a30a7..f64a78a29 100644 --- a/Source/QtDialog/QCMakeCacheView.cxx +++ b/Source/QtDialog/QCMakeCacheView.cxx @@ -12,14 +12,14 @@ #include "QCMakeCacheView.h" +#include +#include #include #include -#include -#include #include -#include #include -#include +#include +#include #include "QCMakeWidgets.h" diff --git a/Source/QtDialog/QCMakeCacheView.h b/Source/QtDialog/QCMakeCacheView.h index 5ac09665c..5631b8615 100644 --- a/Source/QtDialog/QCMakeCacheView.h +++ b/Source/QtDialog/QCMakeCacheView.h @@ -15,10 +15,10 @@ #include "QCMake.h" -#include +#include #include #include -#include +#include class QSortFilterProxyModel; class QCMakeCacheModel; diff --git a/Source/QtDialog/QCMakeWidgets.cxx b/Source/QtDialog/QCMakeWidgets.cxx index 41f98b5d2..7803ef307 100644 --- a/Source/QtDialog/QCMakeWidgets.cxx +++ b/Source/QtDialog/QCMakeWidgets.cxx @@ -13,10 +13,10 @@ #include "QCMakeWidgets.h" #include -#include #include -#include +#include #include +#include QCMakeFileEditor::QCMakeFileEditor(QWidget* p, const QString& var) : QLineEdit(p), Variable(var) diff --git a/Source/QtDialog/QCMakeWidgets.h b/Source/QtDialog/QCMakeWidgets.h index 22072827e..759b635be 100644 --- a/Source/QtDialog/QCMakeWidgets.h +++ b/Source/QtDialog/QCMakeWidgets.h @@ -13,9 +13,9 @@ #ifndef QCMakeWidgets_h #define QCMakeWidgets_h -#include #include #include +#include class QToolButton; diff --git a/Source/QtDialog/RegexExplorer.h b/Source/QtDialog/RegexExplorer.h index 2ac9c3e2e..3ac8a2495 100644 --- a/Source/QtDialog/RegexExplorer.h +++ b/Source/QtDialog/RegexExplorer.h @@ -13,9 +13,9 @@ #ifndef RegexExplorer_h #define RegexExplorer_h -#include -#include #include +#include +#include #include "ui_RegexExplorer.h" diff --git a/Source/QtDialog/WarningMessagesDialog.h b/Source/QtDialog/WarningMessagesDialog.h index 6c274a71d..4bb739c48 100644 --- a/Source/QtDialog/WarningMessagesDialog.h +++ b/Source/QtDialog/WarningMessagesDialog.h @@ -16,8 +16,8 @@ #include #include -#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 e7263aead..b179f8348 100644 --- a/Source/bindexplib.cxx +++ b/Source/bindexplib.cxx @@ -72,11 +72,11 @@ */ #include "bindexplib.h" #include -#include -#include -#include #include #include +#include +#include +#include typedef struct cmANON_OBJECT_HEADER_BIGOBJ { /* same as ANON_OBJECT_HEADER_V2 */ diff --git a/Source/cmAddLibraryCommand.cxx b/Source/cmAddLibraryCommand.cxx index 5296cbb36..e40ecf4ff 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 e62a2ed11..b06b2f5f0 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 #include #include -#include -#include "cm_get_date.h" #ifndef __LA_SSIZE_T # define __LA_SSIZE_T la_ssize_t diff --git a/Source/cmBootstrapCommands1.cxx b/Source/cmBootstrapCommands1.cxx index 0782b3ba7..2de877014 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& commands) { diff --git a/Source/cmBootstrapCommands2.cxx b/Source/cmBootstrapCommands2.cxx index e522d8c79..38d008d28 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 35b3d59dc..3eef55a8a 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 eec3df092..e54bcab35 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/cmCTest.cxx b/Source/cmCTest.cxx index 4ba15ac10..1f07a07c9 100644 --- a/Source/cmCTest.cxx +++ b/Source/cmCTest.cxx @@ -13,24 +13,24 @@ #include "cmCTest.h" -#include "cmake.h" -#include "cmMakefile.h" -#include "cmGlobalGenerator.h" -#include -#include -#include -#include -#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 +#include +#include +#include -#include "cmCTestBuildHandler.h" #include "cmCTestBuildAndTestHandler.h" +#include "cmCTestBuildHandler.h" #include "cmCTestConfigureHandler.h" #include "cmCTestCoverageHandler.h" #include "cmCTestMemCheckHandler.h" @@ -42,14 +42,14 @@ #include "cmVersion.h" -#include -#include #include +#include +#include -#include -#include -#include #include +#include +#include +#include #include diff --git a/Source/cmCacheManager.cxx b/Source/cmCacheManager.cxx index 2cda0184c..afa2ba75b 100644 --- a/Source/cmCacheManager.cxx +++ b/Source/cmCacheManager.cxx @@ -11,14 +11,14 @@ ============================================================================*/ #include "cmCacheManager.h" -#include "cmSystemTools.h" #include "cmGeneratedFileStream.h" -#include "cmake.h" +#include "cmSystemTools.h" #include "cmVersion.h" +#include "cmake.h" #include -#include #include +#include #include cmCacheManager::cmCacheManager() diff --git a/Source/cmCommand.h b/Source/cmCommand.h index d7f5c9910..d5e394d5e 100644 --- a/Source/cmCommand.h +++ b/Source/cmCommand.h @@ -14,9 +14,9 @@ #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/cmComputeLinkDepends.cxx b/Source/cmComputeLinkDepends.cxx index 2796fdf66..f546fc803 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 diff --git a/Source/cmComputeLinkDepends.h b/Source/cmComputeLinkDepends.h index 9b0bfaa8f..ea23308d2 100644 --- a/Source/cmComputeLinkDepends.h +++ b/Source/cmComputeLinkDepends.h @@ -14,8 +14,8 @@ #include "cmStandardIncludes.h" -#include "cmLinkItem.h" #include "cmGraphAdjacencyList.h" +#include "cmLinkItem.h" #include diff --git a/Source/cmComputeLinkInformation.cxx b/Source/cmComputeLinkInformation.cxx index 50d832438..f88d58ce5 100644 --- a/Source/cmComputeLinkInformation.cxx +++ b/Source/cmComputeLinkInformation.cxx @@ -14,14 +14,14 @@ #include "cmComputeLinkDepends.h" #include "cmOrderDirectories.h" -#include "cmLocalGenerator.h" -#include "cmGlobalGenerator.h" -#include "cmState.h" -#include "cmOutputConverter.h" -#include "cmMakefile.h" -#include "cmGeneratorTarget.h" -#include "cmake.h" #include "cmAlgorithms.h" +#include "cmGeneratorTarget.h" +#include "cmGlobalGenerator.h" +#include "cmLocalGenerator.h" +#include "cmMakefile.h" +#include "cmOutputConverter.h" +#include "cmState.h" +#include "cmake.h" #include diff --git a/Source/cmComputeTargetDepends.cxx b/Source/cmComputeTargetDepends.cxx index 586b5bfb1..7f12006f5 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 c43ec4739..3711b9bed 100644 --- a/Source/cmConditionEvaluator.cxx +++ b/Source/cmConditionEvaluator.cxx @@ -12,8 +12,8 @@ #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 c38429ff5..231c260c2 100644 --- a/Source/cmCoreTryCompile.cxx +++ b/Source/cmCoreTryCompile.cxx @@ -11,11 +11,11 @@ ============================================================================*/ #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 #include diff --git a/Source/cmCryptoHash.cxx b/Source/cmCryptoHash.cxx index 66162181e..d1112f2f7 100644 --- a/Source/cmCryptoHash.cxx +++ b/Source/cmCryptoHash.cxx @@ -11,9 +11,9 @@ ============================================================================*/ #include "cmCryptoHash.h" -#include -#include #include "cm_sha2.h" +#include +#include //---------------------------------------------------------------------------- cmsys::auto_ptr cmCryptoHash::New(const char* algo) diff --git a/Source/cmCustomCommandGenerator.cxx b/Source/cmCustomCommandGenerator.cxx index dc06678cf..5d3a1cecc 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 0334948b4..47fc22e01 100644 --- a/Source/cmDefinePropertyCommand.cxx +++ b/Source/cmDefinePropertyCommand.cxx @@ -11,8 +11,8 @@ ============================================================================*/ #include "cmDefinePropertyCommand.h" -#include "cmake.h" #include "cmState.h" +#include "cmake.h" bool cmDefinePropertyCommand ::InitialPass(std::vector const& args, cmExecutionStatus &) diff --git a/Source/cmDepends.cxx b/Source/cmDepends.cxx index d4190112d..40b552b98 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 #include +#include //---------------------------------------------------------------------------- cmDepends::cmDepends(cmLocalGenerator* lg, const char* targetDir): diff --git a/Source/cmDependsC.cxx b/Source/cmDependsC.cxx index 6cdd4c13d..6bf815ec2 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 #include // isspace diff --git a/Source/cmDependsFortran.cxx b/Source/cmDependsFortran.cxx index 80f560f31..a7909b264 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 #include +#include // 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 4f3475536..81e67962e 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 -#include #include +#include #include diff --git a/Source/cmELF.cxx b/Source/cmELF.cxx index 8d8e39662..0e6f577af 100644 --- a/Source/cmELF.cxx +++ b/Source/cmELF.cxx @@ -13,13 +13,13 @@ #include "cmELF.h" -#include #include +#include // Include the ELF format information system header. #if defined(__OpenBSD__) -# include # include +# include #elif defined(__HAIKU__) # include # include diff --git a/Source/cmExportBuildFileGenerator.cxx b/Source/cmExportBuildFileGenerator.cxx index dcb21876c..87ea2c234 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 94e1d928b..bbd07db78 100644 --- a/Source/cmExportCommand.cxx +++ b/Source/cmExportCommand.cxx @@ -11,12 +11,12 @@ ============================================================================*/ #include "cmExportCommand.h" -#include "cmGlobalGenerator.h" #include "cmGeneratedFileStream.h" +#include "cmGlobalGenerator.h" #include "cmake.h" -#include #include +#include #include "cmExportBuildFileGenerator.h" diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx index c005995f7..2b3ce148c 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 -#include #include +#include +#include //---------------------------------------------------------------------------- static std::string cmExportFileGeneratorEscape(std::string const& str) diff --git a/Source/cmExportFileGenerator.h b/Source/cmExportFileGenerator.h index 18f0b009a..9fc02a486 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 71418e825..0ea24c1ac 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 132df74d5..a71507020 100644 --- a/Source/cmExportLibraryDependenciesCommand.cxx +++ b/Source/cmExportLibraryDependenciesCommand.cxx @@ -11,10 +11,10 @@ ============================================================================*/ #include "cmExportLibraryDependenciesCommand.h" -#include "cmGlobalGenerator.h" #include "cmGeneratedFileStream.h" -#include "cmake.h" +#include "cmGlobalGenerator.h" #include "cmVersion.h" +#include "cmake.h" #include diff --git a/Source/cmExportSet.cxx b/Source/cmExportSet.cxx index e7739fb94..83c4fdc12 100644 --- a/Source/cmExportSet.cxx +++ b/Source/cmExportSet.cxx @@ -12,9 +12,9 @@ #include "cmExportSet.h" -#include "cmTargetExport.h" #include "cmAlgorithms.h" #include "cmLocalGenerator.h" +#include "cmTargetExport.h" cmExportSet::~cmExportSet() { diff --git a/Source/cmExportSetMap.cxx b/Source/cmExportSetMap.cxx index b0021e770..d267cd364 100644 --- a/Source/cmExportSetMap.cxx +++ b/Source/cmExportSetMap.cxx @@ -12,8 +12,8 @@ #include "cmExportSetMap.h" -#include "cmExportSet.h" #include "cmAlgorithms.h" +#include "cmExportSet.h" cmExportSet* cmExportSetMap::operator[](const std::string &name) { diff --git a/Source/cmExportTryCompileFileGenerator.cxx b/Source/cmExportTryCompileFileGenerator.cxx index 83127e7ed..5bafa1cb6 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/cmExtraCodeBlocksGenerator.cxx b/Source/cmExtraCodeBlocksGenerator.cxx index 2d26cc3b5..f6be583cc 100644 --- a/Source/cmExtraCodeBlocksGenerator.cxx +++ b/Source/cmExtraCodeBlocksGenerator.cxx @@ -12,14 +12,14 @@ ============================================================================*/ #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 diff --git a/Source/cmExtraCodeLiteGenerator.cxx b/Source/cmExtraCodeLiteGenerator.cxx index e2b84c6f4..6c7d5f6e6 100644 --- a/Source/cmExtraCodeLiteGenerator.cxx +++ b/Source/cmExtraCodeLiteGenerator.cxx @@ -13,19 +13,19 @@ ============================================================================*/ #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 -#include -#include #include "cmStandardIncludes.h" #include "cmXMLWriter.h" +#include +#include +#include //---------------------------------------------------------------------------- void cmExtraCodeLiteGenerator::GetDocumentation(cmDocumentationEntry& entry, diff --git a/Source/cmExtraEclipseCDT4Generator.cxx b/Source/cmExtraEclipseCDT4Generator.cxx index 22b2f91fb..40cc90466 100644 --- a/Source/cmExtraEclipseCDT4Generator.cxx +++ b/Source/cmExtraEclipseCDT4Generator.cxx @@ -13,18 +13,18 @@ ============================================================================*/ #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 #include +#include static void AppendAttribute(cmXMLWriter& xml, const char* keyval) { diff --git a/Source/cmExtraKateGenerator.cxx b/Source/cmExtraKateGenerator.cxx index 8e60d5053..4b779d813 100644 --- a/Source/cmExtraKateGenerator.cxx +++ b/Source/cmExtraKateGenerator.cxx @@ -12,13 +12,13 @@ ============================================================================*/ #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 diff --git a/Source/cmExtraSublimeTextGenerator.cxx b/Source/cmExtraSublimeTextGenerator.cxx index f84eeb018..a8367c4f9 100644 --- a/Source/cmExtraSublimeTextGenerator.cxx +++ b/Source/cmExtraSublimeTextGenerator.cxx @@ -12,7 +12,6 @@ ============================================================================*/ #include "cmExtraSublimeTextGenerator.h" -#include "cmake.h" #include "cmGeneratedFileStream.h" #include "cmGeneratorTarget.h" #include "cmGlobalUnixMakefileGenerator3.h" @@ -21,6 +20,7 @@ #include "cmMakefile.h" #include "cmSourceFile.h" #include "cmSystemTools.h" +#include "cmake.h" #include diff --git a/Source/cmFileCommand.cxx b/Source/cmFileCommand.cxx index 42922e192..035b97ff9 100644 --- a/Source/cmFileCommand.cxx +++ b/Source/cmFileCommand.cxx @@ -11,14 +11,14 @@ ============================================================================*/ #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" @@ -28,16 +28,16 @@ #endif #undef GetCurrentDirectory -#include #include +#include #include -#include #include +#include +#include #include #include -#include -#include +#include // Table of permissions flags. #if defined(_WIN32) && !defined(__CYGWIN__) diff --git a/Source/cmFileLock.cxx b/Source/cmFileLock.cxx index e6aa5f49d..0d41c53c5 100644 --- a/Source/cmFileLock.cxx +++ b/Source/cmFileLock.cxx @@ -12,8 +12,8 @@ #include "cmFileLock.h" -#include #include "cmFileLockResult.h" +#include // Common implementation diff --git a/Source/cmFileLockPool.cxx b/Source/cmFileLockPool.cxx index 3710eb030..939a8f537 100644 --- a/Source/cmFileLockPool.cxx +++ b/Source/cmFileLockPool.cxx @@ -14,9 +14,9 @@ #include +#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 36a2d7288..f5e77be2e 100644 --- a/Source/cmFileLockUnix.cxx +++ b/Source/cmFileLockUnix.cxx @@ -12,11 +12,11 @@ #include "cmFileLock.h" -#include // errno -#include // SEEK_SET -#include -#include #include "cmSystemTools.h" +#include // errno +#include +#include // SEEK_SET +#include cmFileLock::cmFileLock(): File(-1) { diff --git a/Source/cmFileLockWin32.cxx b/Source/cmFileLockWin32.cxx index dc65948bd..e40ae2c29 100644 --- a/Source/cmFileLockWin32.cxx +++ b/Source/cmFileLockWin32.cxx @@ -12,8 +12,8 @@ #include "cmFileLock.h" -#include // CreateFileW #include "cmSystemTools.h" +#include // CreateFileW cmFileLock::cmFileLock(): File(INVALID_HANDLE_VALUE) { diff --git a/Source/cmFindCommon.cxx b/Source/cmFindCommon.cxx index 1286a00b0..d70fa8924 100644 --- a/Source/cmFindCommon.cxx +++ b/Source/cmFindCommon.cxx @@ -11,8 +11,8 @@ ============================================================================*/ #include "cmFindCommon.h" -#include #include +#include //---------------------------------------------------------------------------- cmFindCommon::PathGroup cmFindCommon::PathGroup::All("ALL"); diff --git a/Source/cmFindCommon.h b/Source/cmFindCommon.h index 3fefc8da5..2b8742722 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/cmFindPackageCommand.cxx b/Source/cmFindPackageCommand.cxx index 64176e7fb..97f156366 100644 --- a/Source/cmFindPackageCommand.cxx +++ b/Source/cmFindPackageCommand.cxx @@ -11,19 +11,19 @@ ============================================================================*/ #include "cmFindPackageCommand.h" -#include -#include -#include #include "cmAlgorithms.h" +#include +#include +#include #ifdef CMAKE_BUILD_WITH_CMAKE #include "cmVariableWatch.h" #endif #if defined(__HAIKU__) -#include #include #include +#include #endif //---------------------------------------------------------------------------- diff --git a/Source/cmGeneratorExpression.cxx b/Source/cmGeneratorExpression.cxx index 6796a011f..d0ed28dba 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/cmGeneratorExpressionContext.h b/Source/cmGeneratorExpressionContext.h index e802138bc..68cdf4926 100644 --- a/Source/cmGeneratorExpressionContext.h +++ b/Source/cmGeneratorExpressionContext.h @@ -14,8 +14,8 @@ #include "cmListFileCache.h" -#include #include +#include #include class cmGeneratorTarget; diff --git a/Source/cmGeneratorExpressionDAGChecker.cxx b/Source/cmGeneratorExpressionDAGChecker.cxx index c3b0272ed..00a497c70 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 4ac2a0d0e..5d8050b83 100644 --- a/Source/cmGeneratorExpressionEvaluationFile.cxx +++ b/Source/cmGeneratorExpressionEvaluationFile.cxx @@ -12,11 +12,11 @@ #include "cmGeneratorExpressionEvaluationFile.h" -#include "cmMakefile.h" -#include "cmLocalGenerator.h" -#include "cmGlobalGenerator.h" -#include "cmSourceFile.h" #include "cmGeneratedFileStream.h" +#include "cmGlobalGenerator.h" +#include "cmLocalGenerator.h" +#include "cmMakefile.h" +#include "cmSourceFile.h" #include #include diff --git a/Source/cmGeneratorExpressionEvaluator.cxx b/Source/cmGeneratorExpressionEvaluator.cxx index 0fe864c72..d9dd3b16a 100644 --- a/Source/cmGeneratorExpressionEvaluator.cxx +++ b/Source/cmGeneratorExpressionEvaluator.cxx @@ -11,14 +11,14 @@ ============================================================================*/ #include "cmGeneratorExpressionEvaluator.h" -#include "cmMakefile.h" -#include "cmGeneratorExpressionParser.h" -#include "cmGeneratorExpressionDAGChecker.h" -#include "cmGeneratorExpression.h" -#include "cmLocalGenerator.h" -#include "cmGlobalGenerator.h" -#include "cmSourceFile.h" #include "cmAlgorithms.h" +#include "cmGeneratorExpression.h" +#include "cmGeneratorExpressionDAGChecker.h" +#include "cmGeneratorExpressionParser.h" +#include "cmGlobalGenerator.h" +#include "cmLocalGenerator.h" +#include "cmMakefile.h" +#include "cmSourceFile.h" #include diff --git a/Source/cmGeneratorExpressionEvaluator.h b/Source/cmGeneratorExpressionEvaluator.h index ba27e5a03..b60bb5dcf 100644 --- a/Source/cmGeneratorExpressionEvaluator.h +++ b/Source/cmGeneratorExpressionEvaluator.h @@ -16,8 +16,8 @@ #include "cmListFileCache.h" -#include #include +#include struct cmGeneratorExpressionDAGChecker; struct cmGeneratorExpressionNode; diff --git a/Source/cmGeneratorExpressionNode.cxx b/Source/cmGeneratorExpressionNode.cxx index 7f3d7d689..a9227b0cf 100644 --- a/Source/cmGeneratorExpressionNode.cxx +++ b/Source/cmGeneratorExpressionNode.cxx @@ -12,10 +12,10 @@ #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 b803d1237..2d66727f3 100644 --- a/Source/cmGeneratorExpressionNode.h +++ b/Source/cmGeneratorExpressionNode.h @@ -14,9 +14,9 @@ #include "cmGeneratorExpression.h" +#include "cmGeneratorExpressionDAGChecker.h" #include "cmGeneratorExpressionEvaluator.h" #include "cmGeneratorExpressionParser.h" -#include "cmGeneratorExpressionDAGChecker.h" #include "cmLocalGenerator.h" #include "cmSourceFile.h" diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx index d7c278201..f115d83f9 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 -#include #include "assert.h" +#include #if defined(CMAKE_BUILD_WITH_CMAKE) #include diff --git a/Source/cmGetCMakePropertyCommand.cxx b/Source/cmGetCMakePropertyCommand.cxx index 1a91183d4..2be4dec9d 100644 --- a/Source/cmGetCMakePropertyCommand.cxx +++ b/Source/cmGetCMakePropertyCommand.cxx @@ -11,10 +11,10 @@ ============================================================================*/ #include "cmGetCMakePropertyCommand.h" -#include "cmGlobalGenerator.h" -#include "cmake.h" -#include "cmState.h" #include "cmAlgorithms.h" +#include "cmGlobalGenerator.h" +#include "cmState.h" +#include "cmake.h" // cmGetCMakePropertyCommand bool cmGetCMakePropertyCommand diff --git a/Source/cmGetPropertyCommand.cxx b/Source/cmGetPropertyCommand.cxx index 617a8116e..bbeae4beb 100644 --- a/Source/cmGetPropertyCommand.cxx +++ b/Source/cmGetPropertyCommand.cxx @@ -11,12 +11,12 @@ ============================================================================*/ #include "cmGetPropertyCommand.h" -#include "cmake.h" +#include "cmGlobalGenerator.h" +#include "cmPropertyDefinition.h" +#include "cmSourceFile.h" #include "cmState.h" #include "cmTest.h" -#include "cmGlobalGenerator.h" -#include "cmSourceFile.h" -#include "cmPropertyDefinition.h" +#include "cmake.h" //---------------------------------------------------------------------------- cmGetPropertyCommand::cmGetPropertyCommand() diff --git a/Source/cmGetTestPropertyCommand.cxx b/Source/cmGetTestPropertyCommand.cxx index bf34589f4..3d7a013fa 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/cmGhsMultiTargetGenerator.cxx b/Source/cmGhsMultiTargetGenerator.cxx index b7b122ca1..f845c5975 100644 --- a/Source/cmGhsMultiTargetGenerator.cxx +++ b/Source/cmGhsMultiTargetGenerator.cxx @@ -11,12 +11,12 @@ ============================================================================*/ #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 #include diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx index 5040cfd8a..84ade253b 100644 --- a/Source/cmGlobalGenerator.cxx +++ b/Source/cmGlobalGenerator.cxx @@ -18,31 +18,31 @@ #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 #include #if defined(CMAKE_BUILD_WITH_CMAKE) -# include # include "cm_jsoncpp_value.h" # include "cm_jsoncpp_writer.h" +# include #endif #include // required for atof diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h index 14c7d6782..1576f09bd 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 e9a48c892..df7011ccd 100644 --- a/Source/cmGlobalGhsMultiGenerator.cxx +++ b/Source/cmGlobalGhsMultiGenerator.cxx @@ -11,13 +11,13 @@ ============================================================================*/ #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 #include +#include const char *cmGlobalGhsMultiGenerator::FILE_EXTENSION = ".gpj"; const char *cmGlobalGhsMultiGenerator::DEFAULT_MAKE_PROGRAM = "gbuild"; diff --git a/Source/cmGlobalGhsMultiGenerator.h b/Source/cmGlobalGhsMultiGenerator.h index b8d6ade8d..5de9d2bd7 100644 --- a/Source/cmGlobalGhsMultiGenerator.h +++ b/Source/cmGlobalGhsMultiGenerator.h @@ -14,8 +14,8 @@ #include "cmGlobalGenerator.h" -#include "cmGlobalGeneratorFactory.h" #include "cmGhsMultiGpj.h" +#include "cmGlobalGeneratorFactory.h" class cmGeneratedFileStream; diff --git a/Source/cmGlobalKdevelopGenerator.cxx b/Source/cmGlobalKdevelopGenerator.cxx index 758caaedf..e2f1fc560 100644 --- a/Source/cmGlobalKdevelopGenerator.cxx +++ b/Source/cmGlobalKdevelopGenerator.cxx @@ -12,18 +12,18 @@ ============================================================================*/ #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 #include #include +#include //---------------------------------------------------------------------------- void cmGlobalKdevelopGenerator diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx index 88766fe62..a8a7262ae 100644 --- a/Source/cmGlobalNinjaGenerator.cxx +++ b/Source/cmGlobalNinjaGenerator.cxx @@ -12,13 +12,13 @@ ============================================================================*/ #include "cmGlobalNinjaGenerator.h" +#include "cmAlgorithms.h" #include "cmGeneratedFileStream.h" #include "cmGeneratorExpressionEvaluationFile.h" #include "cmGeneratorTarget.h" #include "cmLocalNinjaGenerator.h" #include "cmMakefile.h" #include "cmVersion.h" -#include "cmAlgorithms.h" #include #include diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx index e35aa2e73..0098f1e93 100644 --- a/Source/cmGlobalUnixMakefileGenerator3.cxx +++ b/Source/cmGlobalUnixMakefileGenerator3.cxx @@ -11,13 +11,13 @@ ============================================================================*/ #include "cmGlobalUnixMakefileGenerator3.h" -#include "cmLocalUnixMakefileGenerator3.h" -#include "cmMakefileTargetGenerator.h" -#include "cmMakefile.h" -#include "cmake.h" +#include "cmAlgorithms.h" #include "cmGeneratedFileStream.h" #include "cmGeneratorTarget.h" -#include "cmAlgorithms.h" +#include "cmLocalUnixMakefileGenerator3.h" +#include "cmMakefile.h" +#include "cmMakefileTargetGenerator.h" +#include "cmake.h" cmGlobalUnixMakefileGenerator3::cmGlobalUnixMakefileGenerator3(cmake* cm) : cmGlobalCommonGenerator(cm) diff --git a/Source/cmGlobalVisualStudio10Generator.cxx b/Source/cmGlobalVisualStudio10Generator.cxx index ee5e60592..22ffbcc54 100644 --- a/Source/cmGlobalVisualStudio10Generator.cxx +++ b/Source/cmGlobalVisualStudio10Generator.cxx @@ -13,13 +13,13 @@ #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 5eafe8ad9..de6fc43c8 100644 --- a/Source/cmGlobalVisualStudio11Generator.cxx +++ b/Source/cmGlobalVisualStudio11Generator.cxx @@ -11,9 +11,9 @@ ============================================================================*/ #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 e92ab5b9e..bfd908fd3 100644 --- a/Source/cmGlobalVisualStudio12Generator.cxx +++ b/Source/cmGlobalVisualStudio12Generator.cxx @@ -11,9 +11,9 @@ ============================================================================*/ #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 df61503c5..893cc7b13 100644 --- a/Source/cmGlobalVisualStudio14Generator.cxx +++ b/Source/cmGlobalVisualStudio14Generator.cxx @@ -11,9 +11,9 @@ ============================================================================*/ #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/cmGlobalVisualStudio8Generator.cxx b/Source/cmGlobalVisualStudio8Generator.cxx index 506d1a9d6..47ac66da7 100644 --- a/Source/cmGlobalVisualStudio8Generator.cxx +++ b/Source/cmGlobalVisualStudio8Generator.cxx @@ -13,12 +13,12 @@ #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/cmGlobalVisualStudioGenerator.cxx b/Source/cmGlobalVisualStudioGenerator.cxx index 9817b09df..479b53c8e 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 -#include "cmAlgorithms.h" //---------------------------------------------------------------------------- cmGlobalVisualStudioGenerator::cmGlobalVisualStudioGenerator(cmake* cm) diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx index 62583410d..19f7a7434 100644 --- a/Source/cmGlobalXCodeGenerator.cxx +++ b/Source/cmGlobalXCodeGenerator.cxx @@ -11,18 +11,18 @@ ============================================================================*/ #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 diff --git a/Source/cmGlobalXCodeGenerator.h b/Source/cmGlobalXCodeGenerator.h index 2a48ac8b6..c3b361337 100644 --- a/Source/cmGlobalXCodeGenerator.h +++ b/Source/cmGlobalXCodeGenerator.h @@ -14,8 +14,8 @@ #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 5b7d229b6..76b6430e0 100644 --- a/Source/cmGraphVizWriter.cxx +++ b/Source/cmGraphVizWriter.cxx @@ -11,10 +11,10 @@ ============================================================================*/ #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 8b1438e9f..7914ca350 100644 --- a/Source/cmGraphVizWriter.h +++ b/Source/cmGraphVizWriter.h @@ -14,8 +14,8 @@ #include "cmStandardIncludes.h" -#include "cmLocalGenerator.h" #include "cmGeneratedFileStream.h" +#include "cmLocalGenerator.h" #include class cmGeneratorTarget; diff --git a/Source/cmIfCommand.cxx b/Source/cmIfCommand.cxx index 1b8ba0bd3..37f03c5c6 100644 --- a/Source/cmIfCommand.cxx +++ b/Source/cmIfCommand.cxx @@ -11,14 +11,14 @@ ============================================================================*/ #include "cmIfCommand.h" -#include "cmStringCommand.h" #include "cmOutputConverter.h" +#include "cmStringCommand.h" #include "cmConditionEvaluator.h" -#include // required for atof -#include #include +#include +#include // required for atof static std::string cmIfCommandError( diff --git a/Source/cmInstallCommand.cxx b/Source/cmInstallCommand.cxx index f70f2521a..d287568bd 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 diff --git a/Source/cmInstallExportGenerator.cxx b/Source/cmInstallExportGenerator.cxx index 80fc05460..a31c0c979 100644 --- a/Source/cmInstallExportGenerator.cxx +++ b/Source/cmInstallExportGenerator.cxx @@ -13,12 +13,12 @@ #include -#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 3dd5528af..97035628e 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/cmInstallTargetGenerator.cxx b/Source/cmInstallTargetGenerator.cxx index 6a944bfe2..001033329 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 diff --git a/Source/cmInstalledFile.cxx b/Source/cmInstalledFile.cxx index 7025d0f43..c5ac9eb84 100644 --- a/Source/cmInstalledFile.cxx +++ b/Source/cmInstalledFile.cxx @@ -11,9 +11,9 @@ ============================================================================*/ #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 514bc05c5..05be9e547 100644 --- a/Source/cmListCommand.cxx +++ b/Source/cmListCommand.cxx @@ -11,14 +11,14 @@ ============================================================================*/ #include "cmListCommand.h" +#include "cmAlgorithms.h" #include #include -#include "cmAlgorithms.h" #include -#include // required for atoi -#include #include +#include +#include // required for atoi //---------------------------------------------------------------------------- bool cmListCommand ::InitialPass(std::vector const& args, cmExecutionStatus &) diff --git a/Source/cmListFileCache.cxx b/Source/cmListFileCache.cxx index 1cc66f47a..5a161045d 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 diff --git a/Source/cmLoadCacheCommand.cxx b/Source/cmLoadCacheCommand.cxx index 6ade53542..63fc00ce8 100644 --- a/Source/cmLoadCacheCommand.cxx +++ b/Source/cmLoadCacheCommand.cxx @@ -11,8 +11,8 @@ ============================================================================*/ #include "cmLoadCacheCommand.h" -#include #include +#include // cmLoadCacheCommand bool cmLoadCacheCommand diff --git a/Source/cmLoadCommandCommand.cxx b/Source/cmLoadCommandCommand.cxx index ed1adc0b6..14b70e413 100644 --- a/Source/cmLoadCommandCommand.cxx +++ b/Source/cmLoadCommandCommand.cxx @@ -11,8 +11,8 @@ ============================================================================*/ #include "cmLoadCommandCommand.h" -#include "cmCPluginAPI.h" #include "cmCPluginAPI.cxx" +#include "cmCPluginAPI.h" #include "cmDynamicLoader.h" #include diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx index b93fc21e5..6c2ba0523 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 "cmGlobalGenerator.h" -#include "cmInstallGenerator.h" -#include "cmInstallFilesGenerator.h" #include "cmGeneratorExpressionEvaluationFile.h" +#include "cmGlobalGenerator.h" +#include "cmInstallFilesGenerator.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 d9c68f9ce..0bad0d693 100644 --- a/Source/cmLocalGenerator.h +++ b/Source/cmLocalGenerator.h @@ -14,9 +14,9 @@ #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 91e75d326..f23f27d64 100644 --- a/Source/cmLocalGhsMultiGenerator.cxx +++ b/Source/cmLocalGhsMultiGenerator.cxx @@ -11,11 +11,11 @@ ============================================================================*/ #include "cmLocalGhsMultiGenerator.h" -#include "cmGlobalGhsMultiGenerator.h" -#include "cmGeneratorTarget.h" -#include "cmMakefile.h" -#include "cmGhsMultiTargetGenerator.h" #include "cmGeneratedFileStream.h" +#include "cmGeneratorTarget.h" +#include "cmGhsMultiTargetGenerator.h" +#include "cmGlobalGhsMultiGenerator.h" +#include "cmMakefile.h" cmLocalGhsMultiGenerator::cmLocalGhsMultiGenerator(cmGlobalGenerator* gg, cmMakefile* mf) diff --git a/Source/cmLocalNinjaGenerator.cxx b/Source/cmLocalNinjaGenerator.cxx index 143c14e28..c26065c22 100644 --- a/Source/cmLocalNinjaGenerator.cxx +++ b/Source/cmLocalNinjaGenerator.cxx @@ -13,13 +13,13 @@ #include "cmLocalNinjaGenerator.h" #include "cmCustomCommandGenerator.h" -#include "cmMakefile.h" -#include "cmGlobalNinjaGenerator.h" -#include "cmNinjaTargetGenerator.h" #include "cmGeneratedFileStream.h" +#include "cmGlobalNinjaGenerator.h" +#include "cmMakefile.h" +#include "cmNinjaTargetGenerator.h" #include "cmSourceFile.h" -#include "cmake.h" #include "cmState.h" +#include "cmake.h" #include diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx index afdff337e..2a0e07d31 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 #include +#include -#include #include +#include //---------------------------------------------------------------------------- // Escape special characters in Makefile dependency lines diff --git a/Source/cmLocalVisualStudio10Generator.cxx b/Source/cmLocalVisualStudio10Generator.cxx index ce20c97cb..314fa0fc0 100644 --- a/Source/cmLocalVisualStudio10Generator.cxx +++ b/Source/cmLocalVisualStudio10Generator.cxx @@ -11,11 +11,11 @@ ============================================================================*/ #include "cmLocalVisualStudio10Generator.h" +#include "cmGlobalVisualStudio10Generator.h" #include "cmMakefile.h" #include "cmVisualStudio10TargetGenerator.h" -#include "cmGlobalVisualStudio10Generator.h" -#include #include "cmXMLParser.h" +#include class cmVS10XMLParser : public cmXMLParser { diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx index de974c213..38b7ac339 100644 --- a/Source/cmLocalVisualStudio7Generator.cxx +++ b/Source/cmLocalVisualStudio7Generator.cxx @@ -11,15 +11,15 @@ ============================================================================*/ #include "cmLocalVisualStudio7Generator.h" -#include "cmGlobalVisualStudio7Generator.h" -#include "cmXMLParser.h" -#include -#include "cmMakefile.h" -#include "cmSystemTools.h" -#include "cmSourceFile.h" -#include "cmGeneratorTarget.h" #include "cmCustomCommandGenerator.h" +#include "cmGeneratorTarget.h" +#include "cmGlobalVisualStudio7Generator.h" +#include "cmMakefile.h" +#include "cmSourceFile.h" +#include "cmSystemTools.h" +#include "cmXMLParser.h" #include "cmake.h" +#include #include "cmComputeLinkInformation.h" #include "cmGeneratedFileStream.h" diff --git a/Source/cmLocalVisualStudioGenerator.cxx b/Source/cmLocalVisualStudioGenerator.cxx index a5b8f99b0..23e2bfd17 100644 --- a/Source/cmLocalVisualStudioGenerator.cxx +++ b/Source/cmLocalVisualStudioGenerator.cxx @@ -11,11 +11,11 @@ ============================================================================*/ #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/cmLocalXCodeGenerator.cxx b/Source/cmLocalXCodeGenerator.cxx index c837445c1..d563fe78f 100644 --- a/Source/cmLocalXCodeGenerator.cxx +++ b/Source/cmLocalXCodeGenerator.cxx @@ -12,8 +12,8 @@ #include "cmLocalXCodeGenerator.h" #include "cmGlobalXCodeGenerator.h" -#include "cmSourceFile.h" #include "cmMakefile.h" +#include "cmSourceFile.h" //---------------------------------------------------------------------------- cmLocalXCodeGenerator::cmLocalXCodeGenerator(cmGlobalGenerator* gg, diff --git a/Source/cmMachO.cxx b/Source/cmMachO.cxx index 6210da35e..bb4d4a1cc 100644 --- a/Source/cmMachO.cxx +++ b/Source/cmMachO.cxx @@ -16,8 +16,8 @@ #include // Include the Mach-O format information system header. -#include #include +#include /** diff --git a/Source/cmMacroCommand.cxx b/Source/cmMacroCommand.cxx index 71de7a723..36831fe11 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/cmMakefile.cxx b/Source/cmMakefile.cxx index 29b947c30..3bc118148 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -11,37 +11,37 @@ ============================================================================*/ #include "cmMakefile.h" -#include "cmVersion.h" #include "cmCommand.h" +#include "cmCommandArgumentParserHelper.h" +#include "cmCommands.h" +#include "cmFunctionBlocker.h" +#include "cmGeneratorExpression.h" +#include "cmGeneratorExpressionEvaluationFile.h" +#include "cmGlobalGenerator.h" +#include "cmListFileCache.h" +#include "cmOutputConverter.h" #include "cmSourceFile.h" #include "cmSourceFileLocation.h" -#include "cmSystemTools.h" -#include "cmGlobalGenerator.h" -#include "cmCommands.h" #include "cmState.h" -#include "cmOutputConverter.h" -#include "cmFunctionBlocker.h" -#include "cmGeneratorExpressionEvaluationFile.h" -#include "cmListFileCache.h" -#include "cmCommandArgumentParserHelper.h" -#include "cmGeneratorExpression.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 // required for atoi -#include #include +#include #include -#include -#include // for isspace #include +#include // for isspace +#include // default is not to be building executables cmMakefile::cmMakefile(cmGlobalGenerator* globalGenerator, diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h index 0300d3f01..fa5e9b488 100644 --- a/Source/cmMakefile.h +++ b/Source/cmMakefile.h @@ -14,22 +14,22 @@ #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 #include +#include #if defined(CMAKE_BUILD_WITH_CMAKE) # ifdef CMake_HAVE_CXX11_UNORDERED_MAP # include diff --git a/Source/cmMakefileLibraryTargetGenerator.cxx b/Source/cmMakefileLibraryTargetGenerator.cxx index 435844e31..9ded69f3e 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 29708d95b..e14f828e2 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 351940019..0429421d4 100644 --- a/Source/cmNinjaNormalTargetGenerator.cxx +++ b/Source/cmNinjaNormalTargetGenerator.cxx @@ -12,18 +12,18 @@ ============================================================================*/ #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 #include +#include #include #ifndef _WIN32 diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx index 97ef00d1b..8830b8f3a 100644 --- a/Source/cmNinjaTargetGenerator.cxx +++ b/Source/cmNinjaTargetGenerator.cxx @@ -12,18 +12,18 @@ ============================================================================*/ #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 diff --git a/Source/cmNinjaTargetGenerator.h b/Source/cmNinjaTargetGenerator.h index 40f96b47a..8225a60f4 100644 --- a/Source/cmNinjaTargetGenerator.h +++ b/Source/cmNinjaTargetGenerator.h @@ -15,9 +15,9 @@ #include "cmCommonTargetGenerator.h" -#include "cmNinjaTypes.h" #include "cmGlobalNinjaGenerator.h" #include "cmLocalNinjaGenerator.h" +#include "cmNinjaTypes.h" #include "cmOSXBundleGenerator.h" class cmTarget; diff --git a/Source/cmNinjaUtilityTargetGenerator.cxx b/Source/cmNinjaUtilityTargetGenerator.cxx index c2162ce09..735730e34 100644 --- a/Source/cmNinjaUtilityTargetGenerator.cxx +++ b/Source/cmNinjaUtilityTargetGenerator.cxx @@ -13,11 +13,11 @@ #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/cmOSXBundleGenerator.cxx b/Source/cmOSXBundleGenerator.cxx index 6991d7b65..985072800 100644 --- a/Source/cmOSXBundleGenerator.cxx +++ b/Source/cmOSXBundleGenerator.cxx @@ -11,9 +11,9 @@ ============================================================================*/ #include "cmOSXBundleGenerator.h" +#include "cmLocalGenerator.h" #include "cmMakefile.h" #include "cmTarget.h" -#include "cmLocalGenerator.h" #include diff --git a/Source/cmOSXBundleGenerator.h b/Source/cmOSXBundleGenerator.h index 240026237..3952e9509 100644 --- a/Source/cmOSXBundleGenerator.h +++ b/Source/cmOSXBundleGenerator.h @@ -16,8 +16,8 @@ #include "cmSourceFile.h" -#include #include +#include class cmTarget; class cmMakefile; diff --git a/Source/cmOrderDirectories.cxx b/Source/cmOrderDirectories.cxx index 61efd01e4..2e884e4ff 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 diff --git a/Source/cmOutputConverter.cxx b/Source/cmOutputConverter.cxx index 59fb2e9e1..3c5d2f4ec 100644 --- a/Source/cmOutputConverter.cxx +++ b/Source/cmOutputConverter.cxx @@ -16,8 +16,8 @@ #include -#include /* strlen */ #include /* isalpha */ +#include /* strlen */ cmOutputConverter::cmOutputConverter(cmState::Snapshot snapshot) : StateSnapshot(snapshot), LinkScriptShell(false) diff --git a/Source/cmPolicies.cxx b/Source/cmPolicies.cxx index 68a908507..0432da5cd 100644 --- a/Source/cmPolicies.cxx +++ b/Source/cmPolicies.cxx @@ -1,15 +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 #include #include -#include #include -#include +#include static bool stringToId(const char* input, cmPolicies::PolicyID& pid) { diff --git a/Source/cmPropertyDefinitionMap.cxx b/Source/cmPropertyDefinitionMap.cxx index cfc4bc390..cba2b5a21 100644 --- a/Source/cmPropertyDefinitionMap.cxx +++ b/Source/cmPropertyDefinitionMap.cxx @@ -11,8 +11,8 @@ ============================================================================*/ #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 e6b1529cb..2b2502329 100644 --- a/Source/cmPropertyMap.cxx +++ b/Source/cmPropertyMap.cxx @@ -11,9 +11,9 @@ ============================================================================*/ #include "cmPropertyMap.h" +#include "cmState.h" #include "cmSystemTools.h" #include "cmake.h" -#include "cmState.h" #include diff --git a/Source/cmQtAutoGeneratorInitializer.h b/Source/cmQtAutoGeneratorInitializer.h index eaf140d26..b411597f7 100644 --- a/Source/cmQtAutoGeneratorInitializer.h +++ b/Source/cmQtAutoGeneratorInitializer.h @@ -16,9 +16,9 @@ #include "cmStandardIncludes.h" +#include #include #include -#include class cmSourceFile; class cmGeneratorTarget; diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx index f376caa77..a55a3f371 100644 --- a/Source/cmQtAutoGenerators.cxx +++ b/Source/cmQtAutoGenerators.cxx @@ -13,18 +13,18 @@ #include "cmQtAutoGenerators.h" -#include "cmGlobalGenerator.h" -#include "cmOutputConverter.h" -#include "cmMakefile.h" -#include "cmSystemTools.h" -#include "cmState.h" #include "cmAlgorithms.h" +#include "cmGlobalGenerator.h" +#include "cmMakefile.h" +#include "cmOutputConverter.h" +#include "cmState.h" +#include "cmSystemTools.h" #include -#include -#include #include +#include +#include #include #if defined(__APPLE__) diff --git a/Source/cmQtAutoGenerators.h b/Source/cmQtAutoGenerators.h index 04d286008..315e9155d 100644 --- a/Source/cmQtAutoGenerators.h +++ b/Source/cmQtAutoGenerators.h @@ -17,9 +17,9 @@ #include "cmStandardIncludes.h" #include -#include -#include #include +#include +#include class cmMakefile; diff --git a/Source/cmRST.cxx b/Source/cmRST.cxx index cb61ed995..67667ea0b 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 #include diff --git a/Source/cmSearchPath.cxx b/Source/cmSearchPath.cxx index 01781b29e..70855b32a 100644 --- a/Source/cmSearchPath.cxx +++ b/Source/cmSearchPath.cxx @@ -11,8 +11,8 @@ ============================================================================*/ #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 fc5c95aab..fb13a19e2 100644 --- a/Source/cmSetPropertyCommand.cxx +++ b/Source/cmSetPropertyCommand.cxx @@ -11,9 +11,9 @@ ============================================================================*/ #include "cmSetPropertyCommand.h" +#include "cmSetSourceFilesPropertiesCommand.h" #include "cmSetTargetPropertiesCommand.h" #include "cmSetTestsPropertiesCommand.h" -#include "cmSetSourceFilesPropertiesCommand.h" //---------------------------------------------------------------------------- diff --git a/Source/cmSetTestsPropertiesCommand.cxx b/Source/cmSetTestsPropertiesCommand.cxx index 53dc5a8a6..70c34c441 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/cmSourceFileLocation.cxx b/Source/cmSourceFileLocation.cxx index 00d5d6afe..988ddebb8 100644 --- a/Source/cmSourceFileLocation.cxx +++ b/Source/cmSourceFileLocation.cxx @@ -11,10 +11,10 @@ ============================================================================*/ #include "cmSourceFileLocation.h" -#include "cmMakefile.h" -#include "cmGlobalGenerator.h" -#include "cmSystemTools.h" #include "cmAlgorithms.h" +#include "cmGlobalGenerator.h" +#include "cmMakefile.h" +#include "cmSystemTools.h" #include "assert.h" diff --git a/Source/cmStandardIncludes.h b/Source/cmStandardIncludes.h index 83cbf677f..f80586e1a 100644 --- a/Source/cmStandardIncludes.h +++ b/Source/cmStandardIncludes.h @@ -35,23 +35,23 @@ #include #include -#include #include +#include #include // we must have stl with the standard include style -#include -#include -#include #include #include +#include #include #include +#include +#include // include the "c" string header -#include #include #include +#include #if defined( _MSC_VER ) typedef unsigned short mode_t; diff --git a/Source/cmState.cxx b/Source/cmState.cxx index f5d63784f..a400def0f 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 diff --git a/Source/cmState.h b/Source/cmState.h index 7b110347d..705c1a818 100644 --- a/Source/cmState.h +++ b/Source/cmState.h @@ -14,11 +14,11 @@ #include "cmStandardIncludes.h" +#include "cmAlgorithms.h" +#include "cmLinkedTree.h" +#include "cmPolicies.h" #include "cmPropertyDefinitionMap.h" #include "cmPropertyMap.h" -#include "cmLinkedTree.h" -#include "cmAlgorithms.h" -#include "cmPolicies.h" class cmake; class cmCommand; diff --git a/Source/cmStringCommand.cxx b/Source/cmStringCommand.cxx index 82c530ce6..e10e1aebb 100644 --- a/Source/cmStringCommand.cxx +++ b/Source/cmStringCommand.cxx @@ -16,8 +16,8 @@ #include #include -#include // required for atoi #include +#include // required for atoi #include #include diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx index 2cf254630..3177a84f9 100644 --- a/Source/cmSystemTools.cxx +++ b/Source/cmSystemTools.cxx @@ -12,20 +12,20 @@ #include "cmSystemTools.h" #include "cmAlgorithms.h" +#include #include #include -#include -#include #include -#include +#include +#include #ifdef __QNX__ # include /* for malloc/free on QNX */ #endif +#include +#include #include #include -#include #include -#include #if defined(CMAKE_BUILD_WITH_CMAKE) # include "cmArchiveWrite.h" # include "cmLocale.h" @@ -42,11 +42,11 @@ // include wincrypt.h after windows.h # include #else -# include # include +# include +# include # include # include -# include #endif #if defined(__APPLE__) diff --git a/Source/cmSystemTools.h b/Source/cmSystemTools.h index d44467539..d311750a5 100644 --- a/Source/cmSystemTools.h +++ b/Source/cmSystemTools.h @@ -14,8 +14,8 @@ #include "cmStandardIncludes.h" -#include #include +#include class cmSystemToolsFileTime; diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx index 275dd6f99..fe14af609 100644 --- a/Source/cmTarget.cxx +++ b/Source/cmTarget.cxx @@ -11,22 +11,22 @@ ============================================================================*/ #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 #include +#include #include #include #include // required for atof -#include -#include #if defined(CMAKE_BUILD_WITH_CMAKE) #include #define UNORDERED_SET cmsys::hash_set diff --git a/Source/cmTarget.h b/Source/cmTarget.h index b39804347..262cc9b64 100644 --- a/Source/cmTarget.h +++ b/Source/cmTarget.h @@ -15,9 +15,9 @@ #include "cmStandardIncludes.h" #include "cmCustomCommand.h" -#include "cmPropertyMap.h" -#include "cmPolicies.h" #include "cmListFileCache.h" +#include "cmPolicies.h" +#include "cmPropertyMap.h" #include #if defined(CMAKE_BUILD_WITH_CMAKE) diff --git a/Source/cmTest.cxx b/Source/cmTest.cxx index 812e4d395..7182122d6 100644 --- a/Source/cmTest.cxx +++ b/Source/cmTest.cxx @@ -13,8 +13,8 @@ #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 44a2d00d0..46013af04 100644 --- a/Source/cmTest.h +++ b/Source/cmTest.h @@ -15,8 +15,8 @@ #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 b411f15e4..5790fa696 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 1c795c4ff..7d1ba3231 100644 --- a/Source/cmTimestamp.cxx +++ b/Source/cmTimestamp.cxx @@ -11,12 +11,12 @@ ============================================================================*/ #include "cmTimestamp.h" -#include #include +#include #include -#include #include +#include //---------------------------------------------------------------------------- std::string cmTimestamp::CurrentTime( diff --git a/Source/cmUseMangledMesaCommand.cxx b/Source/cmUseMangledMesaCommand.cxx index 057b67e5d..f30071ec1 100644 --- a/Source/cmUseMangledMesaCommand.cxx +++ b/Source/cmUseMangledMesaCommand.cxx @@ -13,8 +13,8 @@ #include "cmSystemTools.h" -#include #include +#include bool cmUseMangledMesaCommand ::InitialPass(std::vector const& args, cmExecutionStatus &) diff --git a/Source/cmUuid.cxx b/Source/cmUuid.cxx index e2d0049eb..5f8935f2a 100644 --- a/Source/cmUuid.cxx +++ b/Source/cmUuid.cxx @@ -13,8 +13,8 @@ #include -#include #include "cm_sha2.h" +#include cmUuid::cmUuid() { diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx index 7ff9f04f1..b4bdb2ad6 100644 --- a/Source/cmVisualStudio10TargetGenerator.cxx +++ b/Source/cmVisualStudio10TargetGenerator.cxx @@ -11,36 +11,36 @@ ============================================================================*/ #include "cmVisualStudio10TargetGenerator.h" -#include "windows.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 diff --git a/Source/cmXMLSafe.cxx b/Source/cmXMLSafe.cxx index 4ad05ca31..e76ee5292 100644 --- a/Source/cmXMLSafe.cxx +++ b/Source/cmXMLSafe.cxx @@ -16,8 +16,8 @@ #include #include -#include #include +#include //---------------------------------------------------------------------------- cmXMLSafe::cmXMLSafe(const char* s): diff --git a/Source/cmXMLSafe.h b/Source/cmXMLSafe.h index 981359acf..7cf34bac9 100644 --- a/Source/cmXMLSafe.h +++ b/Source/cmXMLSafe.h @@ -14,8 +14,8 @@ #include -#include #include +#include /** \class cmXMLSafe * \brief Write strings to XML with proper escapes diff --git a/Source/cmake.cxx b/Source/cmake.cxx index f3363840c..da6e59e36 100644 --- a/Source/cmake.cxx +++ b/Source/cmake.cxx @@ -11,17 +11,17 @@ ============================================================================*/ #include "cmake.h" -#include "cmMakefile.h" -#include "cmLocalGenerator.h" -#include "cmExternalMakefileProjectGenerator.h" -#include "cmCommands.h" -#include "cmCommand.h" -#include "cmFileTimeComparison.h" -#include "cmSourceFile.h" -#include "cmTest.h" -#include "cmDocumentationFormatter.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 "cmState.h" +#include "cmTest.h" #if defined(CMAKE_BUILD_WITH_CMAKE) # include "cmGraphVizWriter.h" @@ -29,9 +29,9 @@ # include #endif +#include #include #include -#include // only build kdevelop generator on non-windows platforms // when not bootstrapping cmake @@ -52,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" @@ -81,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" @@ -100,8 +100,8 @@ # define CMAKE_USE_XCODE 1 # endif # include -# include # include +# include #endif #include // struct stat diff --git a/Source/cmake.h b/Source/cmake.h index 8fb41957a..e41ba5699 100644 --- a/Source/cmake.h +++ b/Source/cmake.h @@ -15,11 +15,11 @@ #include "cmStandardIncludes.h" -#include "cmListFileCache.h" -#include "cmSystemTools.h" -#include "cmInstalledFile.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 600cc1a91..785fd9066 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 #ifdef CMAKE_BUILD_WITH_CMAKE diff --git a/Source/cmakexbuild.cxx b/Source/cmakexbuild.cxx index 03059f5b9..1385ff722 100644 --- a/Source/cmakexbuild.cxx +++ b/Source/cmakexbuild.cxx @@ -11,8 +11,8 @@ ============================================================================*/ #include "cmStandardIncludes.h" -#include #include "cmSystemTools.h" +#include // 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 3f3ec4de8..644da1dfe 100644 --- a/Source/cmcldeps.cxx +++ b/Source/cmcldeps.cxx @@ -22,8 +22,8 @@ #include #include -#include #include +#include // We don't want any wildcard expansion. // See http://msdn.microsoft.com/en-us/library/zay8tzh6(v=vs.85).aspx diff --git a/Source/cmcmd.cxx b/Source/cmcmd.cxx index 2b153bd69..1f92b6737 100644 --- a/Source/cmcmd.cxx +++ b/Source/cmcmd.cxx @@ -11,20 +11,20 @@ ============================================================================*/ #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 -#include #include +#include #include #if defined(CMAKE_HAVE_VS_GENERATORS) diff --git a/Source/ctest.cxx b/Source/ctest.cxx index 7fa6aed8e..5c80487a4 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 dadf93d6b..c4adbf8e6 100644 --- a/Tests/BuildDepends/Project/bar.cxx +++ b/Tests/BuildDepends/Project/bar.cxx @@ -1,7 +1,7 @@ +#include +#include #include #include -#include -#include int main(int argc, char** argv) { diff --git a/Tests/BuildDepends/Project/ninjadep.cpp b/Tests/BuildDepends/Project/ninjadep.cpp index 8d6133613..5498b177b 100644 --- a/Tests/BuildDepends/Project/ninjadep.cpp +++ b/Tests/BuildDepends/Project/ninjadep.cpp @@ -1,5 +1,5 @@ -#include #include "dir/header.h" +#include int main() { printf("HEADER_STRING: %s\n", HEADER_STRING); diff --git a/Tests/BuildDepends/Project/zot.cxx b/Tests/BuildDepends/Project/zot.cxx index 775fd3b43..186554b82 100644 --- a/Tests/BuildDepends/Project/zot.cxx +++ b/Tests/BuildDepends/Project/zot.cxx @@ -1,6 +1,6 @@ +#include #include #include -#include 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 37bc178d6..54f9534d0 100644 --- a/Tests/BundleTest/BundleLib.cxx +++ b/Tests/BundleTest/BundleLib.cxx @@ -1,6 +1,6 @@ #include -#include #include +#include #include #include diff --git a/Tests/BundleUtilities/module.cpp b/Tests/BundleUtilities/module.cpp index ee1b542fb..51730d9de 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 649510ce0..9e1656a97 100644 --- a/Tests/CMakeCommands/target_include_directories/consumer.cpp +++ b/Tests/CMakeCommands/target_include_directories/consumer.cpp @@ -1,9 +1,9 @@ -#include "common.h" -#include "publicinclude.h" -#include "interfaceinclude.h" -#include "relative_dir.h" #include "consumer.h" +#include "common.h" +#include "interfaceinclude.h" +#include "publicinclude.h" +#include "relative_dir.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 a4ef6369d..35426605d 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 4ab96cf01..204a71739 100644 --- a/Tests/CMakeLib/testUTF8.cxx +++ b/Tests/CMakeLib/testUTF8.cxx @@ -11,8 +11,8 @@ ============================================================================*/ #include -#include #include +#include typedef char test_utf8_char[5]; diff --git a/Tests/CompileDefinitions/runtest.c b/Tests/CompileDefinitions/runtest.c index 02d2cadb0..c2d51aaf0 100644 --- a/Tests/CompileDefinitions/runtest.c +++ b/Tests/CompileDefinitions/runtest.c @@ -1,6 +1,6 @@ -#include -#include #include +#include +#include #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 ec222a5ac..8d538db8a 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 -#include #include #include +#include +#include #include #include diff --git a/Tests/ComplexOneConfig/Executable/complex.cxx b/Tests/ComplexOneConfig/Executable/complex.cxx index ec222a5ac..8d538db8a 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 -#include #include #include +#include +#include #include #include diff --git a/Tests/ExportImport/Export/testSharedLibDepends.h b/Tests/ExportImport/Export/testSharedLibDepends.h index 8b2f84eb3..e84fb5454 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 d5e4de3c0..0c5cb7fd7 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 72543be77..e1e0a4778 100644 --- a/Tests/FindGSL/rng/main.cc +++ b/Tests/FindGSL/rng/main.cc @@ -1,5 +1,5 @@ -#include #include "gsl/gsl_rng.h" +#include int main() { diff --git a/Tests/FindGTK2/cairomm/main.cpp b/Tests/FindGTK2/cairomm/main.cpp index ea8f1065c..0db3a0421 100644 --- a/Tests/FindGTK2/cairomm/main.cpp +++ b/Tests/FindGTK2/cairomm/main.cpp @@ -8,11 +8,11 @@ #define _USE_MATH_DEFINES #endif -#include -#include -#include #include #include +#include +#include +#include #include diff --git a/Tests/FindGTK2/gtkmm/main.cpp b/Tests/FindGTK2/gtkmm/main.cpp index 5ff64d113..566a4bd0a 100644 --- a/Tests/FindGTK2/gtkmm/main.cpp +++ b/Tests/FindGTK2/gtkmm/main.cpp @@ -1,5 +1,5 @@ -#include #include "helloworld.h" +#include int main(int argc, char *argv[]) { diff --git a/Tests/FindGTK2/sigc++/main.cpp b/Tests/FindGTK2/sigc++/main.cpp index 78428e76b..ccf415e48 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 #include +#include class AlienDetector { diff --git a/Tests/FindLTTngUST/Test/main.c b/Tests/FindLTTngUST/Test/main.c index ac775a0c4..1f313c1a9 100644 --- a/Tests/FindLTTngUST/Test/main.c +++ b/Tests/FindLTTngUST/Test/main.c @@ -1,7 +1,7 @@ #include -#include -#include #include +#include +#include #ifdef CMAKE_LTTNGUST_HAS_TRACEF #include diff --git a/Tests/FindPNG/Test/main.c b/Tests/FindPNG/Test/main.c index 27e14786b..06d943d1b 100644 --- a/Tests/FindPNG/Test/main.c +++ b/Tests/FindPNG/Test/main.c @@ -1,6 +1,6 @@ #include -#include #include +#include int main() { diff --git a/Tests/FindPackageModeMakefileTest/main.cpp b/Tests/FindPackageModeMakefileTest/main.cpp index e5f9134ce..db1ffb19e 100644 --- a/Tests/FindPackageModeMakefileTest/main.cpp +++ b/Tests/FindPackageModeMakefileTest/main.cpp @@ -1,5 +1,5 @@ -#include #include +#include int main() { diff --git a/Tests/FindXalanC/Test/main.cxx b/Tests/FindXalanC/Test/main.cxx index 3b4a2df8e..7d0f42cf4 100644 --- a/Tests/FindXalanC/Test/main.cxx +++ b/Tests/FindXalanC/Test/main.cxx @@ -1,5 +1,5 @@ -#include #include +#include int main() { diff --git a/Tests/IncludeDirectories/TargetIncludeDirectories/main.cpp b/Tests/IncludeDirectories/TargetIncludeDirectories/main.cpp index aed0bde46..2ee05e2ee 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 "list.h" -#include "target.h" -#include "prefix_foo_bar_bat.h" #include "common.h" +#include "foo.h" +#include "list.h" +#include "prefix_foo_bar_bat.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 fc04934dd..eac121d41 100644 --- a/Tests/LoadCommand/CMakeCommands/cmTestCommand.c +++ b/Tests/LoadCommand/CMakeCommands/cmTestCommand.c @@ -1,7 +1,7 @@ #include "cmCPluginAPI.h" -#include -#include #include +#include +#include typedef struct { diff --git a/Tests/LoadCommandOneConfig/CMakeCommands/cmTestCommand.c b/Tests/LoadCommandOneConfig/CMakeCommands/cmTestCommand.c index fc04934dd..eac121d41 100644 --- a/Tests/LoadCommandOneConfig/CMakeCommands/cmTestCommand.c +++ b/Tests/LoadCommandOneConfig/CMakeCommands/cmTestCommand.c @@ -1,7 +1,7 @@ #include "cmCPluginAPI.h" -#include -#include #include +#include +#include typedef struct { diff --git a/Tests/MFC/mfc1/mfc1.cpp b/Tests/MFC/mfc1/mfc1.cpp index 057e1d573..1777d7f29 100644 --- a/Tests/MFC/mfc1/mfc1.cpp +++ b/Tests/MFC/mfc1/mfc1.cpp @@ -3,8 +3,8 @@ #include "stdafx.h" -#include "mfc1.h" #include "MainFrm.h" +#include "mfc1.h" #include "ChildFrm.h" #include "mfc1Doc.h" diff --git a/Tests/MFC/mfc1/stdafx.h b/Tests/MFC/mfc1/stdafx.h index 35a678dcd..654a23f48 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 // MFC core and standard components -#include // MFC extensions -#include // MFC Automation classes +#include // MFC Automation classes +#include // MFC extensions +#include // MFC core and standard components #include // 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 d88c311f8..69d7c82d1 100644 --- a/Tests/OutOfSource/OutOfSourceSubdir/simple.cxx +++ b/Tests/OutOfSource/OutOfSourceSubdir/simple.cxx @@ -1,8 +1,8 @@ #include #include -#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 12d92041a..393bb680c 100644 --- a/Tests/Plugin/src/example_exe.cxx +++ b/Tests/Plugin/src/example_exe.cxx @@ -2,8 +2,8 @@ #include -#include #include +#include #include #include diff --git a/Tests/Preprocess/preprocess.c b/Tests/Preprocess/preprocess.c index 16209acf4..af5eae672 100644 --- a/Tests/Preprocess/preprocess.c +++ b/Tests/Preprocess/preprocess.c @@ -3,8 +3,8 @@ #include FILE_PATH #include TARGET_PATH -#include #include +#include int check_defines_C(void) { diff --git a/Tests/Preprocess/preprocess.cxx b/Tests/Preprocess/preprocess.cxx index 27b6ac89a..d1681036f 100644 --- a/Tests/Preprocess/preprocess.cxx +++ b/Tests/Preprocess/preprocess.cxx @@ -3,8 +3,8 @@ #include FILE_PATH #include TARGET_PATH -#include #include +#include extern "C" int check_defines_C(void); diff --git a/Tests/Qt4Deploy/testdeploy.cpp b/Tests/Qt4Deploy/testdeploy.cpp index 8b9c8d6fa..255453a40 100644 --- a/Tests/Qt4Deploy/testdeploy.cpp +++ b/Tests/Qt4Deploy/testdeploy.cpp @@ -1,7 +1,7 @@ #include -#include -#include #include +#include +#include #include int main(int argc, char** argv) diff --git a/Tests/QtAutogen/Bdir/libB.h b/Tests/QtAutogen/Bdir/libB.h index 510c17f8f..746b67a67 100644 --- a/Tests/QtAutogen/Bdir/libB.h +++ b/Tests/QtAutogen/Bdir/libB.h @@ -4,8 +4,8 @@ #include "libb_export.h" -#include #include "libA.h" +#include class LIBB_EXPORT LibB : public QObject { diff --git a/Tests/QtAutogen/calwidget.cpp b/Tests/QtAutogen/calwidget.cpp index 5f59994b7..0e314cd6a 100644 --- a/Tests/QtAutogen/calwidget.cpp +++ b/Tests/QtAutogen/calwidget.cpp @@ -38,13 +38,13 @@ ** ****************************************************************************/ - #include - #include - #include - #include - #include - #include #include + #include + #include + #include + #include + #include + #include #include #include "calwidget.h" diff --git a/Tests/QtAutogen/codeeditor.h b/Tests/QtAutogen/codeeditor.h index 56e9e7923..fd79a2ac4 100644 --- a/Tests/QtAutogen/codeeditor.h +++ b/Tests/QtAutogen/codeeditor.h @@ -41,8 +41,8 @@ #ifndef CODEEDITOR_H #define CODEEDITOR_H - #include #include + #include class QPaintEvent; class QResizeEvent; diff --git a/Tests/QtAutogen/libC.h b/Tests/QtAutogen/libC.h index 4fb4a2cf4..6682576d1 100644 --- a/Tests/QtAutogen/libC.h +++ b/Tests/QtAutogen/libC.h @@ -4,8 +4,8 @@ #include "libc_export.h" -#include #include "libB.h" +#include class LIBC_EXPORT LibC : public QObject { diff --git a/Tests/QtAutogen/main.cpp b/Tests/QtAutogen/main.cpp index eb596650e..1636cd443 100644 --- a/Tests/QtAutogen/main.cpp +++ b/Tests/QtAutogen/main.cpp @@ -41,16 +41,16 @@ #include #include -#include "codeeditor.h" -#include "calwidget.h" -#include "foo.h" -#include "blub.h" -#include "sub/bar.h" #include "abc.h" -#include "xyz.h" -#include "yaf.h" +#include "blub.h" +#include "calwidget.h" +#include "codeeditor.h" +#include "foo.h" #include "libC.h" #include "resourcetester.h" +#include "sub/bar.h" +#include "xyz.h" +#include "yaf.h" #ifdef TEST_DEBUG_CLASS #include "debug_class.h" #include diff --git a/Tests/QtAutogen/resourcetester.cpp b/Tests/QtAutogen/resourcetester.cpp index 043ec75fc..75ae28f8f 100644 --- a/Tests/QtAutogen/resourcetester.cpp +++ b/Tests/QtAutogen/resourcetester.cpp @@ -1,8 +1,8 @@ #include "resourcetester.h" -#include #include +#include #include #include diff --git a/Tests/QtAutogen/same_name/ccc/item.cpp b/Tests/QtAutogen/same_name/ccc/item.cpp index 2584881e4..12c71d0fa 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 166466e32..fc77a9902 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 3933fc114..4196948f6 100644 --- a/Tests/RunCMake/AutoExportDll/hello.cxx +++ b/Tests/RunCMake/AutoExportDll/hello.cxx @@ -1,5 +1,5 @@ -#include #include "hello.h" +#include int Hello::Data = 0; void Hello::real() { diff --git a/Tests/RunCMake/AutoExportDll/say.cxx b/Tests/RunCMake/AutoExportDll/say.cxx index 655b3c21a..0d78d4be8 100644 --- a/Tests/RunCMake/AutoExportDll/say.cxx +++ b/Tests/RunCMake/AutoExportDll/say.cxx @@ -1,5 +1,5 @@ -#include #include "hello.h" +#include #ifdef _MSC_VER #include "windows.h" #else diff --git a/Tests/StagingPrefix/Consumer/main.cpp b/Tests/StagingPrefix/Consumer/main.cpp index 612ee05a9..5c0202d25 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/TestsWorkingDirectory/main.c b/Tests/TestsWorkingDirectory/main.c index 19f2f14af..3616f8e34 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 #include +#include #if defined(__WATCOMC__) #include diff --git a/Tests/Tutorial/Step1/tutorial.cxx b/Tests/Tutorial/Step1/tutorial.cxx index 8ab6dc306..a3584c475 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 #include #include -#include -#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 62523f69f..0f7c10605 100644 --- a/Tests/Tutorial/Step2/MathFunctions/mysqrt.cxx +++ b/Tests/Tutorial/Step2/MathFunctions/mysqrt.cxx @@ -1,5 +1,5 @@ -#include #include "MathFunctions.h" +#include // 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 c27da0b84..af88dad46 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 #include #include -#include -#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 62523f69f..0f7c10605 100644 --- a/Tests/Tutorial/Step3/MathFunctions/mysqrt.cxx +++ b/Tests/Tutorial/Step3/MathFunctions/mysqrt.cxx @@ -1,5 +1,5 @@ -#include #include "MathFunctions.h" +#include // 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 c27da0b84..af88dad46 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 #include #include -#include -#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 d081d11d2..bbd08fa0d 100644 --- a/Tests/Tutorial/Step4/MathFunctions/mysqrt.cxx +++ b/Tests/Tutorial/Step4/MathFunctions/mysqrt.cxx @@ -1,6 +1,6 @@ -#include #include "MathFunctions.h" #include "TutorialConfig.h" +#include #include diff --git a/Tests/Tutorial/Step4/tutorial.cxx b/Tests/Tutorial/Step4/tutorial.cxx index c27da0b84..af88dad46 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 #include #include -#include -#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 ef98d5fdc..a23feeb62 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 #include +#include int main (int argc, char *argv[]) { diff --git a/Tests/Tutorial/Step5/MathFunctions/mysqrt.cxx b/Tests/Tutorial/Step5/MathFunctions/mysqrt.cxx index 1f9b88719..a488af6a3 100644 --- a/Tests/Tutorial/Step5/MathFunctions/mysqrt.cxx +++ b/Tests/Tutorial/Step5/MathFunctions/mysqrt.cxx @@ -1,6 +1,6 @@ -#include #include "MathFunctions.h" #include "TutorialConfig.h" +#include // include the generated table #include "Table.h" diff --git a/Tests/Tutorial/Step5/tutorial.cxx b/Tests/Tutorial/Step5/tutorial.cxx index c27da0b84..af88dad46 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 #include #include -#include -#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 ef98d5fdc..a23feeb62 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 #include +#include int main (int argc, char *argv[]) { diff --git a/Tests/Tutorial/Step6/MathFunctions/mysqrt.cxx b/Tests/Tutorial/Step6/MathFunctions/mysqrt.cxx index 1f9b88719..a488af6a3 100644 --- a/Tests/Tutorial/Step6/MathFunctions/mysqrt.cxx +++ b/Tests/Tutorial/Step6/MathFunctions/mysqrt.cxx @@ -1,6 +1,6 @@ -#include #include "MathFunctions.h" #include "TutorialConfig.h" +#include // include the generated table #include "Table.h" diff --git a/Tests/Tutorial/Step6/tutorial.cxx b/Tests/Tutorial/Step6/tutorial.cxx index c27da0b84..af88dad46 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 #include #include -#include -#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 ef98d5fdc..a23feeb62 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 #include +#include int main (int argc, char *argv[]) { diff --git a/Tests/Tutorial/Step7/MathFunctions/mysqrt.cxx b/Tests/Tutorial/Step7/MathFunctions/mysqrt.cxx index 1f9b88719..a488af6a3 100644 --- a/Tests/Tutorial/Step7/MathFunctions/mysqrt.cxx +++ b/Tests/Tutorial/Step7/MathFunctions/mysqrt.cxx @@ -1,6 +1,6 @@ -#include #include "MathFunctions.h" #include "TutorialConfig.h" +#include // include the generated table #include "Table.h" diff --git a/Tests/Tutorial/Step7/tutorial.cxx b/Tests/Tutorial/Step7/tutorial.cxx index c27da0b84..af88dad46 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 #include #include -#include -#include "TutorialConfig.h" #ifdef USE_MYMATH #include "MathFunctions.h" diff --git a/Tests/VSResource/main.cpp b/Tests/VSResource/main.cpp index ccf700c42..f8372b70b 100644 --- a/Tests/VSResource/main.cpp +++ b/Tests/VSResource/main.cpp @@ -1,5 +1,5 @@ -#include #include +#include extern int lib(); diff --git a/Tests/VSWinStorePhone/Direct3DApp1/Direct3DApp1.cpp b/Tests/VSWinStorePhone/Direct3DApp1/Direct3DApp1.cpp index 3cfc5891b..41ca124b3 100644 --- a/Tests/VSWinStorePhone/Direct3DApp1/Direct3DApp1.cpp +++ b/Tests/VSWinStorePhone/Direct3DApp1/Direct3DApp1.cpp @@ -1,7 +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/DirectXHelper.h b/Tests/VSWinStorePhone/Direct3DApp1/DirectXHelper.h index d411a9b81..3434ba9ea 100644 --- a/Tests/VSWinStorePhone/Direct3DApp1/DirectXHelper.h +++ b/Tests/VSWinStorePhone/Direct3DApp1/DirectXHelper.h @@ -1,8 +1,8 @@ #pragma once -#include #include #include +#include namespace DX { diff --git a/Tests/VSWinStorePhone/Direct3DApp1/pch.h b/Tests/VSWinStorePhone/Direct3DApp1/pch.h index 2302e66ba..78ebea347 100644 --- a/Tests/VSWinStorePhone/Direct3DApp1/pch.h +++ b/Tests/VSWinStorePhone/Direct3DApp1/pch.h @@ -1,7 +1,7 @@ #pragma once -#include -#include #include -#include #include +#include +#include +#include diff --git a/Tests/Wrapping/qtwrappingmain.cxx b/Tests/Wrapping/qtwrappingmain.cxx index fabecfc72..55c7952ba 100644 --- a/Tests/Wrapping/qtwrappingmain.cxx +++ b/Tests/Wrapping/qtwrappingmain.cxx @@ -1,9 +1,9 @@ -#include #include "qtwrapping.h" +#include #ifndef _WIN32 -# include # include +# include #endif int main(int argc, char *argv[]) diff --git a/Tests/X11/HelloWorldX11.cxx b/Tests/X11/HelloWorldX11.cxx index f2b8bdd47..27ab843b6 100644 --- a/Tests/X11/HelloWorldX11.cxx +++ b/Tests/X11/HelloWorldX11.cxx @@ -19,8 +19,8 @@ /* include the X library headers */ #include -#include #include +#include class Main {