diff options
599 files changed, 2026 insertions, 1724 deletions
diff --git a/Help/guide/tutorial/Complete/MathFunctions/MathFunctions.cxx b/Help/guide/tutorial/Complete/MathFunctions/MathFunctions.cxx index 5351184be4..0145300629 100644 --- a/Help/guide/tutorial/Complete/MathFunctions/MathFunctions.cxx +++ b/Help/guide/tutorial/Complete/MathFunctions/MathFunctions.cxx @@ -1,5 +1,6 @@ #include "MathFunctions.h" + #include <cmath> #ifdef USE_MYMATH diff --git a/Help/guide/tutorial/Complete/MathFunctions/mysqrt.cxx b/Help/guide/tutorial/Complete/MathFunctions/mysqrt.cxx index ff373123eb..8153f18bed 100644 --- a/Help/guide/tutorial/Complete/MathFunctions/mysqrt.cxx +++ b/Help/guide/tutorial/Complete/MathFunctions/mysqrt.cxx @@ -1,6 +1,7 @@ -#include "MathFunctions.h" #include <iostream> +#include "MathFunctions.h" + // include the generated table #include "Table.h" diff --git a/Help/guide/tutorial/MultiPackage/MathFunctions/MathFunctions.cxx b/Help/guide/tutorial/MultiPackage/MathFunctions/MathFunctions.cxx index 5351184be4..0145300629 100644 --- a/Help/guide/tutorial/MultiPackage/MathFunctions/MathFunctions.cxx +++ b/Help/guide/tutorial/MultiPackage/MathFunctions/MathFunctions.cxx @@ -1,5 +1,6 @@ #include "MathFunctions.h" + #include <cmath> #ifdef USE_MYMATH diff --git a/Help/guide/tutorial/MultiPackage/MathFunctions/mysqrt.cxx b/Help/guide/tutorial/MultiPackage/MathFunctions/mysqrt.cxx index 4c212b3e5d..5e622beb59 100644 --- a/Help/guide/tutorial/MultiPackage/MathFunctions/mysqrt.cxx +++ b/Help/guide/tutorial/MultiPackage/MathFunctions/mysqrt.cxx @@ -1,6 +1,7 @@ -#include "MathFunctions.h" #include <iostream> +#include "MathFunctions.h" + // include the generated table #include "Table.h" diff --git a/Help/guide/tutorial/Step10/MathFunctions/MathFunctions.cxx b/Help/guide/tutorial/Step10/MathFunctions/MathFunctions.cxx index 5351184be4..0145300629 100644 --- a/Help/guide/tutorial/Step10/MathFunctions/MathFunctions.cxx +++ b/Help/guide/tutorial/Step10/MathFunctions/MathFunctions.cxx @@ -1,5 +1,6 @@ #include "MathFunctions.h" + #include <cmath> #ifdef USE_MYMATH diff --git a/Help/guide/tutorial/Step10/MathFunctions/mysqrt.cxx b/Help/guide/tutorial/Step10/MathFunctions/mysqrt.cxx index ff373123eb..8153f18bed 100644 --- a/Help/guide/tutorial/Step10/MathFunctions/mysqrt.cxx +++ b/Help/guide/tutorial/Step10/MathFunctions/mysqrt.cxx @@ -1,6 +1,7 @@ -#include "MathFunctions.h" #include <iostream> +#include "MathFunctions.h" + // include the generated table #include "Table.h" diff --git a/Help/guide/tutorial/Step11/MathFunctions/MathFunctions.cxx b/Help/guide/tutorial/Step11/MathFunctions/MathFunctions.cxx index 5351184be4..0145300629 100644 --- a/Help/guide/tutorial/Step11/MathFunctions/MathFunctions.cxx +++ b/Help/guide/tutorial/Step11/MathFunctions/MathFunctions.cxx @@ -1,5 +1,6 @@ #include "MathFunctions.h" + #include <cmath> #ifdef USE_MYMATH diff --git a/Help/guide/tutorial/Step11/MathFunctions/mysqrt.cxx b/Help/guide/tutorial/Step11/MathFunctions/mysqrt.cxx index ff373123eb..8153f18bed 100644 --- a/Help/guide/tutorial/Step11/MathFunctions/mysqrt.cxx +++ b/Help/guide/tutorial/Step11/MathFunctions/mysqrt.cxx @@ -1,6 +1,7 @@ -#include "MathFunctions.h" #include <iostream> +#include "MathFunctions.h" + // include the generated table #include "Table.h" diff --git a/Help/guide/tutorial/Step3/MathFunctions/mysqrt.cxx b/Help/guide/tutorial/Step3/MathFunctions/mysqrt.cxx index 7d9379e43e..abe767d5ae 100644 --- a/Help/guide/tutorial/Step3/MathFunctions/mysqrt.cxx +++ b/Help/guide/tutorial/Step3/MathFunctions/mysqrt.cxx @@ -1,6 +1,7 @@ -#include "MathFunctions.h" #include <iostream> +#include "MathFunctions.h" + // a hack square root calculation using simple operations double mysqrt(double x) { diff --git a/Help/guide/tutorial/Step4/MathFunctions/mysqrt.cxx b/Help/guide/tutorial/Step4/MathFunctions/mysqrt.cxx index 7d9379e43e..abe767d5ae 100644 --- a/Help/guide/tutorial/Step4/MathFunctions/mysqrt.cxx +++ b/Help/guide/tutorial/Step4/MathFunctions/mysqrt.cxx @@ -1,6 +1,7 @@ -#include "MathFunctions.h" #include <iostream> +#include "MathFunctions.h" + // a hack square root calculation using simple operations double mysqrt(double x) { diff --git a/Help/guide/tutorial/Step5/MathFunctions/mysqrt.cxx b/Help/guide/tutorial/Step5/MathFunctions/mysqrt.cxx index 7d9379e43e..abe767d5ae 100644 --- a/Help/guide/tutorial/Step5/MathFunctions/mysqrt.cxx +++ b/Help/guide/tutorial/Step5/MathFunctions/mysqrt.cxx @@ -1,6 +1,7 @@ -#include "MathFunctions.h" #include <iostream> +#include "MathFunctions.h" + // a hack square root calculation using simple operations double mysqrt(double x) { diff --git a/Help/guide/tutorial/Step6/MathFunctions/mysqrt.cxx b/Help/guide/tutorial/Step6/MathFunctions/mysqrt.cxx index 3f23245832..063706365e 100644 --- a/Help/guide/tutorial/Step6/MathFunctions/mysqrt.cxx +++ b/Help/guide/tutorial/Step6/MathFunctions/mysqrt.cxx @@ -1,7 +1,7 @@ -#include "MathFunctions.h" +#include <cmath> #include <iostream> -#include <cmath> +#include "MathFunctions.h" // a hack square root calculation using simple operations double mysqrt(double x) diff --git a/Help/guide/tutorial/Step7/MathFunctions/mysqrt.cxx b/Help/guide/tutorial/Step7/MathFunctions/mysqrt.cxx index 2ae60c6759..7d80ee9648 100644 --- a/Help/guide/tutorial/Step7/MathFunctions/mysqrt.cxx +++ b/Help/guide/tutorial/Step7/MathFunctions/mysqrt.cxx @@ -1,6 +1,7 @@ -#include "MathFunctions.h" #include <iostream> +#include "MathFunctions.h" + // include the generated table #include "Table.h" diff --git a/Help/guide/tutorial/Step8/MathFunctions/mysqrt.cxx b/Help/guide/tutorial/Step8/MathFunctions/mysqrt.cxx index 2ae60c6759..7d80ee9648 100644 --- a/Help/guide/tutorial/Step8/MathFunctions/mysqrt.cxx +++ b/Help/guide/tutorial/Step8/MathFunctions/mysqrt.cxx @@ -1,6 +1,7 @@ -#include "MathFunctions.h" #include <iostream> +#include "MathFunctions.h" + // include the generated table #include "Table.h" diff --git a/Help/guide/tutorial/Step9/MathFunctions/MathFunctions.cxx b/Help/guide/tutorial/Step9/MathFunctions/MathFunctions.cxx index 5351184be4..0145300629 100644 --- a/Help/guide/tutorial/Step9/MathFunctions/MathFunctions.cxx +++ b/Help/guide/tutorial/Step9/MathFunctions/MathFunctions.cxx @@ -1,5 +1,6 @@ #include "MathFunctions.h" + #include <cmath> #ifdef USE_MYMATH diff --git a/Help/guide/tutorial/Step9/MathFunctions/mysqrt.cxx b/Help/guide/tutorial/Step9/MathFunctions/mysqrt.cxx index 2ae60c6759..7d80ee9648 100644 --- a/Help/guide/tutorial/Step9/MathFunctions/mysqrt.cxx +++ b/Help/guide/tutorial/Step9/MathFunctions/mysqrt.cxx @@ -1,6 +1,7 @@ -#include "MathFunctions.h" #include <iostream> +#include "MathFunctions.h" + // include the generated table #include "Table.h" diff --git a/Source/CPack/IFW/cmCPackIFWCommon.cxx b/Source/CPack/IFW/cmCPackIFWCommon.cxx index aa9a4572c6..9fa74be761 100644 --- a/Source/CPack/IFW/cmCPackIFWCommon.cxx +++ b/Source/CPack/IFW/cmCPackIFWCommon.cxx @@ -2,6 +2,11 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmCPackIFWCommon.h" +#include <cstddef> +#include <sstream> +#include <utility> +#include <vector> + #include "cmCPackGenerator.h" #include "cmCPackIFWGenerator.h" #include "cmCPackLog.h" // IWYU pragma: keep @@ -11,11 +16,6 @@ #include "cmVersionConfig.h" #include "cmXMLWriter.h" -#include <cstddef> -#include <sstream> -#include <utility> -#include <vector> - cmCPackIFWCommon::cmCPackIFWCommon() : Generator(nullptr) { diff --git a/Source/CPack/IFW/cmCPackIFWGenerator.cxx b/Source/CPack/IFW/cmCPackIFWGenerator.cxx index 94530c1ee5..509ac65075 100644 --- a/Source/CPack/IFW/cmCPackIFWGenerator.cxx +++ b/Source/CPack/IFW/cmCPackIFWGenerator.cxx @@ -2,6 +2,9 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmCPackIFWGenerator.h" +#include <sstream> +#include <utility> + #include "cmCPackComponentGroup.h" #include "cmCPackGenerator.h" #include "cmCPackIFWCommon.h" @@ -14,9 +17,6 @@ #include "cmStringAlgorithms.h" #include "cmSystemTools.h" -#include <sstream> -#include <utility> - cmCPackIFWGenerator::cmCPackIFWGenerator() { this->Generator = this; diff --git a/Source/CPack/IFW/cmCPackIFWGenerator.h b/Source/CPack/IFW/cmCPackIFWGenerator.h index ee3c166d2b..86a73c83ff 100644 --- a/Source/CPack/IFW/cmCPackIFWGenerator.h +++ b/Source/CPack/IFW/cmCPackIFWGenerator.h @@ -5,6 +5,11 @@ #include "cmConfigure.h" // IWYU pragma: keep +#include <map> +#include <set> +#include <string> +#include <vector> + #include "cmCPackComponentGroup.h" #include "cmCPackGenerator.h" #include "cmCPackIFWCommon.h" @@ -12,11 +17,6 @@ #include "cmCPackIFWPackage.h" #include "cmCPackIFWRepository.h" -#include <map> -#include <set> -#include <string> -#include <vector> - /** \class cmCPackIFWGenerator * \brief A generator for Qt Installer Framework tools * diff --git a/Source/CPack/IFW/cmCPackIFWInstaller.cxx b/Source/CPack/IFW/cmCPackIFWInstaller.cxx index 2393279e9d..4bad598e97 100644 --- a/Source/CPack/IFW/cmCPackIFWInstaller.cxx +++ b/Source/CPack/IFW/cmCPackIFWInstaller.cxx @@ -2,6 +2,10 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmCPackIFWInstaller.h" +#include <cstddef> +#include <sstream> +#include <utility> + #include "cmCPackIFWCommon.h" #include "cmCPackIFWGenerator.h" #include "cmCPackIFWPackage.h" @@ -13,10 +17,6 @@ #include "cmXMLParser.h" #include "cmXMLWriter.h" -#include <cstddef> -#include <sstream> -#include <utility> - cmCPackIFWInstaller::cmCPackIFWInstaller() = default; void cmCPackIFWInstaller::printSkippedOptionWarning( diff --git a/Source/CPack/IFW/cmCPackIFWInstaller.h b/Source/CPack/IFW/cmCPackIFWInstaller.h index 467779e029..8b3f96af8e 100644 --- a/Source/CPack/IFW/cmCPackIFWInstaller.h +++ b/Source/CPack/IFW/cmCPackIFWInstaller.h @@ -5,12 +5,12 @@ #include "cmConfigure.h" // IWYU pragma: keep -#include "cmCPackIFWCommon.h" - #include <map> #include <string> #include <vector> +#include "cmCPackIFWCommon.h" + class cmCPackIFWPackage; class cmCPackIFWRepository; diff --git a/Source/CPack/IFW/cmCPackIFWPackage.cxx b/Source/CPack/IFW/cmCPackIFWPackage.cxx index 9f2a443f69..9a9cd56781 100644 --- a/Source/CPack/IFW/cmCPackIFWPackage.cxx +++ b/Source/CPack/IFW/cmCPackIFWPackage.cxx @@ -2,6 +2,11 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmCPackIFWPackage.h" +#include <cstddef> +#include <map> +#include <sstream> +#include <utility> + #include "cmCPackComponentGroup.h" #include "cmCPackIFWCommon.h" #include "cmCPackIFWGenerator.h" @@ -13,11 +18,6 @@ #include "cmTimestamp.h" #include "cmXMLWriter.h" -#include <cstddef> -#include <map> -#include <sstream> -#include <utility> - //---------------------------------------------------------- CompareStruct --- cmCPackIFWPackage::CompareStruct::CompareStruct() : Type(cmCPackIFWPackage::CompareNone) diff --git a/Source/CPack/IFW/cmCPackIFWPackage.h b/Source/CPack/IFW/cmCPackIFWPackage.h index ae411462a1..6a4a170a5c 100644 --- a/Source/CPack/IFW/cmCPackIFWPackage.h +++ b/Source/CPack/IFW/cmCPackIFWPackage.h @@ -5,13 +5,13 @@ #include "cmConfigure.h" // IWYU pragma: keep -#include "cmCPackIFWCommon.h" - #include <map> #include <set> #include <string> #include <vector> +#include "cmCPackIFWCommon.h" + class cmCPackComponent; class cmCPackComponentGroup; class cmCPackIFWInstaller; diff --git a/Source/CPack/IFW/cmCPackIFWRepository.cxx b/Source/CPack/IFW/cmCPackIFWRepository.cxx index 82ddbdbd80..a6965491eb 100644 --- a/Source/CPack/IFW/cmCPackIFWRepository.cxx +++ b/Source/CPack/IFW/cmCPackIFWRepository.cxx @@ -2,14 +2,14 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmCPackIFWRepository.h" +#include <cstddef> + #include "cmCPackIFWGenerator.h" #include "cmGeneratedFileStream.h" #include "cmSystemTools.h" #include "cmXMLParser.h" #include "cmXMLWriter.h" -#include <cstddef> - cmCPackIFWRepository::cmCPackIFWRepository() : Update(cmCPackIFWRepository::None) { diff --git a/Source/CPack/IFW/cmCPackIFWRepository.h b/Source/CPack/IFW/cmCPackIFWRepository.h index 585334c4b3..c29398124e 100644 --- a/Source/CPack/IFW/cmCPackIFWRepository.h +++ b/Source/CPack/IFW/cmCPackIFWRepository.h @@ -5,11 +5,11 @@ #include "cmConfigure.h" // IWYU pragma: keep -#include "cmCPackIFWCommon.h" - #include <string> #include <vector> +#include "cmCPackIFWCommon.h" + class cmXMLWriter; /** \class cmCPackIFWRepository diff --git a/Source/CPack/OSXScriptLauncher.cxx b/Source/CPack/OSXScriptLauncher.cxx index b8f12fd3aa..21d27a02d4 100644 --- a/Source/CPack/OSXScriptLauncher.cxx +++ b/Source/CPack/OSXScriptLauncher.cxx @@ -1,9 +1,5 @@ /* Distributed under the OSI-approved BSD 3-Clause License. See accompanying file Copyright.txt or https://cmake.org/licensing for details. */ -#include "cmsys/FStream.hxx" -#include "cmsys/Process.h" -#include "cmsys/SystemTools.hxx" - #include <cstddef> #include <iostream> #include <string> @@ -11,6 +7,10 @@ #include <CoreFoundation/CoreFoundation.h> +#include "cmsys/FStream.hxx" +#include "cmsys/Process.h" +#include "cmsys/SystemTools.hxx" + // For the PATH_MAX constant #include <sys/syslimits.h> diff --git a/Source/CPack/WiX/cmCMakeToWixPath.cxx b/Source/CPack/WiX/cmCMakeToWixPath.cxx index 630a8f86bc..87385011aa 100644 --- a/Source/CPack/WiX/cmCMakeToWixPath.cxx +++ b/Source/CPack/WiX/cmCMakeToWixPath.cxx @@ -2,11 +2,11 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmCMakeToWixPath.h" -#include "cmStringAlgorithms.h" - #include <string> #include <vector> +#include "cmStringAlgorithms.h" + #ifdef __CYGWIN__ # include <sys/cygwin.h> std::string CMakeToWixPath(const std::string& cygpath) diff --git a/Source/CPack/WiX/cmCPackWIXGenerator.cxx b/Source/CPack/WiX/cmCPackWIXGenerator.cxx index 683f275d12..5fdbeabe9d 100644 --- a/Source/CPack/WiX/cmCPackWIXGenerator.cxx +++ b/Source/CPack/WiX/cmCPackWIXGenerator.cxx @@ -2,6 +2,15 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmCPackWIXGenerator.h" +#include <algorithm> + +#include <cm/string_view> + +#include "cmsys/Directory.hxx" +#include "cmsys/Encoding.hxx" +#include "cmsys/FStream.hxx" +#include "cmsys/SystemTools.hxx" + #include "cmAlgorithms.h" #include "cmCPackComponentGroup.h" #include "cmCPackLog.h" @@ -11,21 +20,12 @@ #include "cmStringAlgorithms.h" #include "cmSystemTools.h" #include "cmUuid.h" - -#include <algorithm> -#include <cm/string_view> - #include "cmWIXDirectoriesSourceWriter.h" #include "cmWIXFeaturesSourceWriter.h" #include "cmWIXFilesSourceWriter.h" #include "cmWIXRichTextFormatWriter.h" #include "cmWIXSourceWriter.h" -#include "cmsys/Directory.hxx" -#include "cmsys/Encoding.hxx" -#include "cmsys/FStream.hxx" -#include "cmsys/SystemTools.hxx" - #ifdef _WIN32 # include <rpc.h> // for GUID generation (windows only) #else diff --git a/Source/CPack/WiX/cmCPackWIXGenerator.h b/Source/CPack/WiX/cmCPackWIXGenerator.h index 3b72e3848d..d1933483f0 100644 --- a/Source/CPack/WiX/cmCPackWIXGenerator.h +++ b/Source/CPack/WiX/cmCPackWIXGenerator.h @@ -3,14 +3,13 @@ #ifndef cmCPackWIXGenerator_h #define cmCPackWIXGenerator_h -#include "cmCPackGenerator.h" +#include <map> +#include <string> +#include "cmCPackGenerator.h" #include "cmWIXPatch.h" #include "cmWIXShortcut.h" -#include <map> -#include <string> - class cmWIXSourceWriter; class cmWIXDirectoriesSourceWriter; class cmWIXFilesSourceWriter; diff --git a/Source/CPack/WiX/cmWIXAccessControlList.cxx b/Source/CPack/WiX/cmWIXAccessControlList.cxx index b5e287db8b..3668b4613b 100644 --- a/Source/CPack/WiX/cmWIXAccessControlList.cxx +++ b/Source/CPack/WiX/cmWIXAccessControlList.cxx @@ -3,7 +3,6 @@ #include "cmWIXAccessControlList.h" #include "cmCPackGenerator.h" - #include "cmStringAlgorithms.h" #include "cmSystemTools.h" diff --git a/Source/CPack/WiX/cmWIXAccessControlList.h b/Source/CPack/WiX/cmWIXAccessControlList.h index 2a23f2f378..64f9a13828 100644 --- a/Source/CPack/WiX/cmWIXAccessControlList.h +++ b/Source/CPack/WiX/cmWIXAccessControlList.h @@ -3,10 +3,9 @@ #ifndef cmWIXAccessControlList_h #define cmWIXAccessControlList_h -#include "cmWIXSourceWriter.h" - #include "cmCPackLog.h" #include "cmInstalledFile.h" +#include "cmWIXSourceWriter.h" class cmWIXAccessControlList { diff --git a/Source/CPack/WiX/cmWIXDirectoriesSourceWriter.h b/Source/CPack/WiX/cmWIXDirectoriesSourceWriter.h index 8233331a30..a907d6d181 100644 --- a/Source/CPack/WiX/cmWIXDirectoriesSourceWriter.h +++ b/Source/CPack/WiX/cmWIXDirectoriesSourceWriter.h @@ -3,11 +3,10 @@ #ifndef cmWIXDirectoriesSourceWriter_h #define cmWIXDirectoriesSourceWriter_h -#include "cmWIXSourceWriter.h" +#include <string> #include "cmCPackGenerator.h" - -#include <string> +#include "cmWIXSourceWriter.h" /** \class cmWIXDirectoriesSourceWriter * \brief Helper class to generate directories.wxs diff --git a/Source/CPack/WiX/cmWIXFeaturesSourceWriter.h b/Source/CPack/WiX/cmWIXFeaturesSourceWriter.h index e751ca719d..e03e87bada 100644 --- a/Source/CPack/WiX/cmWIXFeaturesSourceWriter.h +++ b/Source/CPack/WiX/cmWIXFeaturesSourceWriter.h @@ -3,11 +3,10 @@ #ifndef cmWIXFeaturesSourceWriter_h #define cmWIXFeaturesSourceWriter_h +#include "cmCPackGenerator.h" #include "cmWIXPatch.h" #include "cmWIXSourceWriter.h" -#include "cmCPackGenerator.h" - /** \class cmWIXFeaturesSourceWriter * \brief Helper class to generate features.wxs */ diff --git a/Source/CPack/WiX/cmWIXFilesSourceWriter.cxx b/Source/CPack/WiX/cmWIXFilesSourceWriter.cxx index 7705d839dc..c0d879a0ce 100644 --- a/Source/CPack/WiX/cmWIXFilesSourceWriter.cxx +++ b/Source/CPack/WiX/cmWIXFilesSourceWriter.cxx @@ -2,16 +2,13 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmWIXFilesSourceWriter.h" -#include "cmWIXAccessControlList.h" +#include "cm_sys_stat.h" +#include "cmCMakeToWixPath.h" #include "cmInstalledFile.h" - #include "cmSystemTools.h" #include "cmUuid.h" - -#include "cmCMakeToWixPath.h" - -#include "cm_sys_stat.h" +#include "cmWIXAccessControlList.h" cmWIXFilesSourceWriter::cmWIXFilesSourceWriter(cmCPackLog* logger, std::string const& filename, diff --git a/Source/CPack/WiX/cmWIXFilesSourceWriter.h b/Source/CPack/WiX/cmWIXFilesSourceWriter.h index dc9c636d32..8cc98f52b3 100644 --- a/Source/CPack/WiX/cmWIXFilesSourceWriter.h +++ b/Source/CPack/WiX/cmWIXFilesSourceWriter.h @@ -3,12 +3,10 @@ #ifndef cmWIXFilesSourceWriter_h #define cmWIXFilesSourceWriter_h -#include "cmWIXSourceWriter.h" - +#include "cmCPackGenerator.h" #include "cmWIXPatch.h" #include "cmWIXShortcut.h" - -#include "cmCPackGenerator.h" +#include "cmWIXSourceWriter.h" /** \class cmWIXFilesSourceWriter * \brief Helper class to generate files.wxs diff --git a/Source/CPack/WiX/cmWIXPatch.h b/Source/CPack/WiX/cmWIXPatch.h index a4c9e714da..31a60f4e82 100644 --- a/Source/CPack/WiX/cmWIXPatch.h +++ b/Source/CPack/WiX/cmWIXPatch.h @@ -3,11 +3,11 @@ #ifndef cmWIXPatch_h #define cmWIXPatch_h +#include <string> + #include "cmWIXPatchParser.h" #include "cmWIXSourceWriter.h" -#include <string> - /** \class cmWIXPatch * \brief Class that maintains and applies patch fragments */ diff --git a/Source/CPack/WiX/cmWIXPatchParser.cxx b/Source/CPack/WiX/cmWIXPatchParser.cxx index c6ca9441a6..fd9103bc17 100644 --- a/Source/CPack/WiX/cmWIXPatchParser.cxx +++ b/Source/CPack/WiX/cmWIXPatchParser.cxx @@ -2,10 +2,10 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmWIXPatchParser.h" -#include "cmCPackGenerator.h" - #include "cm_expat.h" +#include "cmCPackGenerator.h" + cmWIXPatchNode::Type cmWIXPatchText::type() { return cmWIXPatchNode::TEXT; diff --git a/Source/CPack/WiX/cmWIXPatchParser.h b/Source/CPack/WiX/cmWIXPatchParser.h index e0e347066b..87dd892881 100644 --- a/Source/CPack/WiX/cmWIXPatchParser.h +++ b/Source/CPack/WiX/cmWIXPatchParser.h @@ -3,13 +3,12 @@ #ifndef cmCPackWIXPatchParser_h #define cmCPackWIXPatchParser_h -#include "cmCPackLog.h" - -#include "cmXMLParser.h" - #include <map> #include <vector> +#include "cmCPackLog.h" +#include "cmXMLParser.h" + struct cmWIXPatchNode { enum Type diff --git a/Source/CPack/WiX/cmWIXRichTextFormatWriter.h b/Source/CPack/WiX/cmWIXRichTextFormatWriter.h index 21be8ee66e..a879f3da93 100644 --- a/Source/CPack/WiX/cmWIXRichTextFormatWriter.h +++ b/Source/CPack/WiX/cmWIXRichTextFormatWriter.h @@ -5,9 +5,10 @@ #include "cmConfigure.h" // IWYU pragma: keep -#include "cmsys/FStream.hxx" #include <string> +#include "cmsys/FStream.hxx" + /** \class cmWIXRichtTextFormatWriter * \brief Helper class to generate Rich Text Format (RTF) documents * from plain text (e.g. for license and welcome text) diff --git a/Source/CPack/WiX/cmWIXShortcut.h b/Source/CPack/WiX/cmWIXShortcut.h index d9eecdfd4c..c67baf3697 100644 --- a/Source/CPack/WiX/cmWIXShortcut.h +++ b/Source/CPack/WiX/cmWIXShortcut.h @@ -3,13 +3,13 @@ #ifndef cmWIXShortcut_h #define cmWIXShortcut_h -#include "cmInstalledFile.h" - #include <map> #include <set> #include <string> #include <vector> +#include "cmInstalledFile.h" + class cmWIXFilesSourceWriter; struct cmWIXShortcut diff --git a/Source/CPack/WiX/cmWIXSourceWriter.cxx b/Source/CPack/WiX/cmWIXSourceWriter.cxx index 6adf80bac2..8e9bfdf3f5 100644 --- a/Source/CPack/WiX/cmWIXSourceWriter.cxx +++ b/Source/CPack/WiX/cmWIXSourceWriter.cxx @@ -2,12 +2,11 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmWIXSourceWriter.h" -#include "cmCPackGenerator.h" +#include <windows.h> +#include "cmCPackGenerator.h" #include "cmUuid.h" -#include <windows.h> - cmWIXSourceWriter::cmWIXSourceWriter(cmCPackLog* logger, std::string const& filename, GuidType componentGuidType, diff --git a/Source/CPack/WiX/cmWIXSourceWriter.h b/Source/CPack/WiX/cmWIXSourceWriter.h index 4af1ed6ed0..8cc2070a83 100644 --- a/Source/CPack/WiX/cmWIXSourceWriter.h +++ b/Source/CPack/WiX/cmWIXSourceWriter.h @@ -3,12 +3,12 @@ #ifndef cmWIXSourceWriter_h #define cmWIXSourceWriter_h -#include "cmCPackLog.h" +#include <string> +#include <vector> #include "cmsys/FStream.hxx" -#include <string> -#include <vector> +#include "cmCPackLog.h" /** \class cmWIXSourceWriter * \brief Helper class to generate XML WiX source files diff --git a/Source/CPack/cmCPackArchiveGenerator.cxx b/Source/CPack/cmCPackArchiveGenerator.cxx index 1271b085e9..43f2946bd1 100644 --- a/Source/CPack/cmCPackArchiveGenerator.cxx +++ b/Source/CPack/cmCPackArchiveGenerator.cxx @@ -2,6 +2,12 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmCPackArchiveGenerator.h" +#include <cstring> +#include <map> +#include <ostream> +#include <utility> +#include <vector> + #include "cmCPackComponentGroup.h" #include "cmCPackGenerator.h" #include "cmCPackLog.h" @@ -10,12 +16,6 @@ #include "cmSystemTools.h" #include "cmWorkingDirectory.h" -#include <cstring> -#include <map> -#include <ostream> -#include <utility> -#include <vector> - cmCPackGenerator* cmCPackArchiveGenerator::Create7ZGenerator() { return new cmCPackArchiveGenerator(cmArchiveWrite::CompressNone, "7zip", diff --git a/Source/CPack/cmCPackArchiveGenerator.h b/Source/CPack/cmCPackArchiveGenerator.h index 461df6685a..8d677208f8 100644 --- a/Source/CPack/cmCPackArchiveGenerator.h +++ b/Source/CPack/cmCPackArchiveGenerator.h @@ -5,12 +5,12 @@ #include "cmConfigure.h" // IWYU pragma: keep -#include "cmArchiveWrite.h" -#include "cmCPackGenerator.h" - #include <iosfwd> #include <string> +#include "cmArchiveWrite.h" +#include "cmCPackGenerator.h" + class cmCPackComponent; /** \class cmCPackArchiveGenerator diff --git a/Source/CPack/cmCPackComponentGroup.cxx b/Source/CPack/cmCPackComponentGroup.cxx index 9e05d86b31..d40e5fcf84 100644 --- a/Source/CPack/cmCPackComponentGroup.cxx +++ b/Source/CPack/cmCPackComponentGroup.cxx @@ -2,11 +2,11 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmCPackComponentGroup.h" +#include <string> + #include "cmStringAlgorithms.h" #include "cmSystemTools.h" -#include <string> - unsigned long cmCPackComponent::GetInstalledSize( const std::string& installDir) const { diff --git a/Source/CPack/cmCPackCygwinBinaryGenerator.cxx b/Source/CPack/cmCPackCygwinBinaryGenerator.cxx index 22385055ae..b5abd5a6b2 100644 --- a/Source/CPack/cmCPackCygwinBinaryGenerator.cxx +++ b/Source/CPack/cmCPackCygwinBinaryGenerator.cxx @@ -2,6 +2,8 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmCPackCygwinBinaryGenerator.h" +#include "cmsys/SystemTools.hxx" + #include "cmCPackLog.h" #include "cmGeneratedFileStream.h" #include "cmGlobalGenerator.h" @@ -9,8 +11,6 @@ #include "cmSystemTools.h" #include "cmake.h" -#include "cmsys/SystemTools.hxx" - cmCPackCygwinBinaryGenerator::cmCPackCygwinBinaryGenerator() : cmCPackArchiveGenerator(cmArchiveWrite::CompressBZip2, "paxr", ".tar.bz2") { diff --git a/Source/CPack/cmCPackCygwinSourceGenerator.cxx b/Source/CPack/cmCPackCygwinSourceGenerator.cxx index 5f6aab00a0..64a88eba45 100644 --- a/Source/CPack/cmCPackCygwinSourceGenerator.cxx +++ b/Source/CPack/cmCPackCygwinSourceGenerator.cxx @@ -2,6 +2,8 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmCPackCygwinSourceGenerator.h" +#include "cmsys/SystemTools.hxx" + #include "cmCPackLog.h" #include "cmGeneratedFileStream.h" #include "cmGlobalGenerator.h" @@ -9,14 +11,13 @@ #include "cmSystemTools.h" #include "cmake.h" -#include "cmsys/SystemTools.hxx" - // Includes needed for implementation of RenameFile. This is not in // system tools because it is not implemented robustly enough to move // files across directories. #ifdef _WIN32 -# include "cm_sys_stat.h" # include <windows.h> + +# include "cm_sys_stat.h" #endif cmCPackCygwinSourceGenerator::cmCPackCygwinSourceGenerator() diff --git a/Source/CPack/cmCPackDebGenerator.cxx b/Source/CPack/cmCPackDebGenerator.cxx index 4f299f72a4..5b7d8fb68c 100644 --- a/Source/CPack/cmCPackDebGenerator.cxx +++ b/Source/CPack/cmCPackDebGenerator.cxx @@ -2,6 +2,16 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmCPackDebGenerator.h" +#include <cstring> +#include <map> +#include <ostream> +#include <set> +#include <utility> + +#include "cmsys/Glob.hxx" + +#include "cm_sys_stat.h" + #include "cmArchiveWrite.h" #include "cmCPackComponentGroup.h" #include "cmCPackGenerator.h" @@ -11,16 +21,6 @@ #include "cmStringAlgorithms.h" #include "cmSystemTools.h" -#include "cmsys/Glob.hxx" - -#include "cm_sys_stat.h" - -#include <cstring> -#include <map> -#include <ostream> -#include <set> -#include <utility> - namespace { class DebGenerator diff --git a/Source/CPack/cmCPackDebGenerator.h b/Source/CPack/cmCPackDebGenerator.h index 2244fe72e3..ce77e08044 100644 --- a/Source/CPack/cmCPackDebGenerator.h +++ b/Source/CPack/cmCPackDebGenerator.h @@ -5,11 +5,11 @@ #include "cmConfigure.h" // IWYU pragma: keep -#include "cmCPackGenerator.h" - #include <string> #include <vector> +#include "cmCPackGenerator.h" + /** \class cmCPackDebGenerator * \brief A generator for Debian packages * diff --git a/Source/CPack/cmCPackDragNDropGenerator.cxx b/Source/CPack/cmCPackDragNDropGenerator.cxx index bedbfa80b0..ea7100708f 100644 --- a/Source/CPack/cmCPackDragNDropGenerator.cxx +++ b/Source/CPack/cmCPackDragNDropGenerator.cxx @@ -2,15 +2,6 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmCPackDragNDropGenerator.h" -#include "cmCPackGenerator.h" -#include "cmCPackLog.h" -#include "cmDuration.h" -#include "cmGeneratedFileStream.h" -#include "cmStringAlgorithms.h" -#include "cmSystemTools.h" - -#include "cmsys/FStream.hxx" -#include "cmsys/RegularExpression.hxx" #include <algorithm> #include <cstdlib> #include <iomanip> @@ -18,6 +9,16 @@ #include <CoreFoundation/CoreFoundation.h> +#include "cmsys/FStream.hxx" +#include "cmsys/RegularExpression.hxx" + +#include "cmCPackGenerator.h" +#include "cmCPackLog.h" +#include "cmDuration.h" +#include "cmGeneratedFileStream.h" +#include "cmStringAlgorithms.h" +#include "cmSystemTools.h" + #ifdef HAVE_CoreServices // For the old LocaleStringToLangAndRegionCodes() function, to convert // to the old Script Manager RegionCode values needed for the 'LPic' data diff --git a/Source/CPack/cmCPackDragNDropGenerator.h b/Source/CPack/cmCPackDragNDropGenerator.h index d8c5c83374..f8c86c06d7 100644 --- a/Source/CPack/cmCPackDragNDropGenerator.h +++ b/Source/CPack/cmCPackDragNDropGenerator.h @@ -6,10 +6,11 @@ #include "cmConfigure.h" // IWYU pragma: keep #include <sstream> -#include <stddef.h> #include <string> #include <vector> +#include <stddef.h> + #include "cmCPackGenerator.h" class cmGeneratedFileStream; diff --git a/Source/CPack/cmCPackExternalGenerator.cxx b/Source/CPack/cmCPackExternalGenerator.cxx index 05e5c214a3..142eb6fbfa 100644 --- a/Source/CPack/cmCPackExternalGenerator.cxx +++ b/Source/CPack/cmCPackExternalGenerator.cxx @@ -2,23 +2,23 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmCPackExternalGenerator.h" -#include "cmCPackComponentGroup.h" -#include "cmCPackLog.h" -#include "cmMakefile.h" -#include "cmStringAlgorithms.h" -#include "cmSystemTools.h" - -#include "cm_jsoncpp_value.h" -#include "cm_jsoncpp_writer.h" - -#include "cmsys/FStream.hxx" - #include <map> #include <utility> #include <vector> #include <cm/memory> +#include "cmsys/FStream.hxx" + +#include "cm_jsoncpp_value.h" +#include "cm_jsoncpp_writer.h" + +#include "cmCPackComponentGroup.h" +#include "cmCPackLog.h" +#include "cmMakefile.h" +#include "cmStringAlgorithms.h" +#include "cmSystemTools.h" + int cmCPackExternalGenerator::InitializeInternal() { this->SetOption("CPACK_EXTERNAL_KNOWN_VERSIONS", "1.0"); diff --git a/Source/CPack/cmCPackExternalGenerator.h b/Source/CPack/cmCPackExternalGenerator.h index b77e45bc10..80011fddd9 100644 --- a/Source/CPack/cmCPackExternalGenerator.h +++ b/Source/CPack/cmCPackExternalGenerator.h @@ -3,12 +3,12 @@ #ifndef cmCPackExternalGenerator_h #define cmCPackExternalGenerator_h -#include "cmCPackGenerator.h" +#include <memory> +#include <string> #include "cm_sys_stat.h" -#include <memory> -#include <string> +#include "cmCPackGenerator.h" class cmGlobalGenerator; namespace Json { diff --git a/Source/CPack/cmCPackFreeBSDGenerator.cxx b/Source/CPack/cmCPackFreeBSDGenerator.cxx index b3cb2ade8f..e3cc352fb0 100644 --- a/Source/CPack/cmCPackFreeBSDGenerator.cxx +++ b/Source/CPack/cmCPackFreeBSDGenerator.cxx @@ -10,16 +10,16 @@ #include "cmSystemTools.h" // Needed for ::open() and ::stat() -#include <fcntl.h> -#include <sys/stat.h> - -#include <pkg.h> - #include <algorithm> #include <ostream> #include <utility> #include <vector> +#include <fcntl.h> +#include <pkg.h> + +#include <sys/stat.h> + cmCPackFreeBSDGenerator::cmCPackFreeBSDGenerator() : cmCPackArchiveGenerator(cmArchiveWrite::CompressXZ, "paxr", ".txz") { diff --git a/Source/CPack/cmCPackFreeBSDGenerator.h b/Source/CPack/cmCPackFreeBSDGenerator.h index 9c8a934473..a18b72f62d 100644 --- a/Source/CPack/cmCPackFreeBSDGenerator.h +++ b/Source/CPack/cmCPackFreeBSDGenerator.h @@ -5,11 +5,11 @@ #include "cmConfigure.h" // IWYU pragma: keep +#include <string> + #include "cmCPackArchiveGenerator.h" #include "cmCPackGenerator.h" -#include <string> - class cmGeneratedFileStream; /** \class cmCPackFreeBSDGenerator diff --git a/Source/CPack/cmCPackGenerator.cxx b/Source/CPack/cmCPackGenerator.cxx index a96c1c88dc..153f328515 100644 --- a/Source/CPack/cmCPackGenerator.cxx +++ b/Source/CPack/cmCPackGenerator.cxx @@ -2,14 +2,15 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmCPackGenerator.h" -#include "cmsys/FStream.hxx" -#include "cmsys/Glob.hxx" -#include "cmsys/RegularExpression.hxx" #include <algorithm> #include <cstring> #include <memory> #include <utility> +#include "cmsys/FStream.hxx" +#include "cmsys/Glob.hxx" +#include "cmsys/RegularExpression.hxx" + #include "cmCPackComponentGroup.h" #include "cmCPackLog.h" #include "cmCryptoHash.h" diff --git a/Source/CPack/cmCPackLog.h b/Source/CPack/cmCPackLog.h index 65281e3d8b..1cb16433c3 100644 --- a/Source/CPack/cmCPackLog.h +++ b/Source/CPack/cmCPackLog.h @@ -6,9 +6,10 @@ #include "cmConfigure.h" // IWYU pragma: keep #include <ostream> -#include <string.h> #include <string> +#include <string.h> + #define cmCPack_Log(ctSelf, logType, msg) \ do { \ std::ostringstream cmCPackLog_msg; \ diff --git a/Source/CPack/cmCPackNSISGenerator.cxx b/Source/CPack/cmCPackNSISGenerator.cxx index 3f531860d8..adea8ecd15 100644 --- a/Source/CPack/cmCPackNSISGenerator.cxx +++ b/Source/CPack/cmCPackNSISGenerator.cxx @@ -2,6 +2,16 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmCPackNSISGenerator.h" +#include <algorithm> +#include <cstdlib> +#include <cstring> +#include <map> +#include <sstream> +#include <utility> + +#include "cmsys/Directory.hxx" +#include "cmsys/RegularExpression.hxx" + #include "cmAlgorithms.h" #include "cmCPackComponentGroup.h" #include "cmCPackGenerator.h" @@ -11,15 +21,6 @@ #include "cmStringAlgorithms.h" #include "cmSystemTools.h" -#include "cmsys/Directory.hxx" -#include "cmsys/RegularExpression.hxx" -#include <algorithm> -#include <cstdlib> -#include <cstring> -#include <map> -#include <sstream> -#include <utility> - /* NSIS uses different command line syntax on Windows and others */ #ifdef _WIN32 # define NSIS_OPT "/" diff --git a/Source/CPack/cmCPackNSISGenerator.h b/Source/CPack/cmCPackNSISGenerator.h index fc9ad9aced..0af37af502 100644 --- a/Source/CPack/cmCPackNSISGenerator.h +++ b/Source/CPack/cmCPackNSISGenerator.h @@ -5,13 +5,13 @@ #include "cmConfigure.h" // IWYU pragma: keep -#include "cmCPackGenerator.h" - #include <iosfwd> #include <set> #include <string> #include <vector> +#include "cmCPackGenerator.h" + class cmCPackComponent; class cmCPackComponentGroup; diff --git a/Source/CPack/cmCPackNuGetGenerator.cxx b/Source/CPack/cmCPackNuGetGenerator.cxx index 19a3a0ad33..60faecd0bb 100644 --- a/Source/CPack/cmCPackNuGetGenerator.cxx +++ b/Source/CPack/cmCPackNuGetGenerator.cxx @@ -2,11 +2,6 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmCPackNuGetGenerator.h" -#include "cmCPackComponentGroup.h" -#include "cmCPackLog.h" -#include "cmStringAlgorithms.h" -#include "cmSystemTools.h" - #include <algorithm> #include <iterator> #include <map> @@ -15,6 +10,11 @@ #include <utility> #include <vector> +#include "cmCPackComponentGroup.h" +#include "cmCPackLog.h" +#include "cmStringAlgorithms.h" +#include "cmSystemTools.h" + bool cmCPackNuGetGenerator::SupportsComponentInstallation() const { return IsOn("CPACK_NUGET_COMPONENT_INSTALL"); diff --git a/Source/CPack/cmCPackPackageMakerGenerator.cxx b/Source/CPack/cmCPackPackageMakerGenerator.cxx index 7be6a7d1f5..c5ba726d50 100644 --- a/Source/CPack/cmCPackPackageMakerGenerator.cxx +++ b/Source/CPack/cmCPackPackageMakerGenerator.cxx @@ -2,8 +2,6 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmCPackPackageMakerGenerator.h" -#include "cmsys/FStream.hxx" -#include "cmsys/RegularExpression.hxx" #include <cassert> #include <cstdio> #include <cstdlib> @@ -11,6 +9,9 @@ #include <sstream> #include <string> +#include "cmsys/FStream.hxx" +#include "cmsys/RegularExpression.hxx" + #include "cmCPackComponentGroup.h" #include "cmCPackLog.h" #include "cmDuration.h" diff --git a/Source/CPack/cmCPackRPMGenerator.h b/Source/CPack/cmCPackRPMGenerator.h index 27d3b63392..075ce8458e 100644 --- a/Source/CPack/cmCPackRPMGenerator.h +++ b/Source/CPack/cmCPackRPMGenerator.h @@ -5,10 +5,10 @@ #include "cmConfigure.h" // IWYU pragma: keep -#include "cmCPackGenerator.h" - #include <string> +#include "cmCPackGenerator.h" + /** \class cmCPackRPMGenerator * \brief A generator for RPM packages * The idea of the CPack RPM generator is to use diff --git a/Source/CPack/cmCPackSTGZGenerator.cxx b/Source/CPack/cmCPackSTGZGenerator.cxx index eb1e24c735..bb0ed4fdbe 100644 --- a/Source/CPack/cmCPackSTGZGenerator.cxx +++ b/Source/CPack/cmCPackSTGZGenerator.cxx @@ -2,12 +2,13 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmCPackSTGZGenerator.h" -#include "cmsys/FStream.hxx" #include <cstdio> #include <sstream> #include <string> #include <vector> +#include "cmsys/FStream.hxx" + #include "cm_sys_stat.h" #include "cmArchiveWrite.h" diff --git a/Source/CPack/cmCPackSTGZGenerator.h b/Source/CPack/cmCPackSTGZGenerator.h index 55e4779969..79d7035e1d 100644 --- a/Source/CPack/cmCPackSTGZGenerator.h +++ b/Source/CPack/cmCPackSTGZGenerator.h @@ -5,11 +5,11 @@ #include "cmConfigure.h" // IWYU pragma: keep +#include <iosfwd> + #include "cmCPackArchiveGenerator.h" #include "cmCPackGenerator.h" -#include <iosfwd> - /** \class cmCPackSTGZGenerator * \brief A generator for Self extractable TGZ files * diff --git a/Source/CPack/cpack.cxx b/Source/CPack/cpack.cxx index ce41d40cd7..58956522f4 100644 --- a/Source/CPack/cpack.cxx +++ b/Source/CPack/cpack.cxx @@ -1,6 +1,9 @@ /* Distributed under the OSI-approved BSD 3-Clause License. See accompanying file Copyright.txt or https://cmake.org/licensing for details. */ +#include "cmsys/CommandLineArguments.hxx" +#include "cmsys/Encoding.hxx" + #include "cmCPackGenerator.h" #include "cmCPackGeneratorFactory.h" #include "cmCPackLog.h" @@ -15,9 +18,6 @@ #include "cmSystemTools.h" #include "cmake.h" -#include "cmsys/CommandLineArguments.hxx" -#include "cmsys/Encoding.hxx" - #if defined(_WIN32) && !defined(CMAKE_BOOTSTRAP) # include "cmsys/ConsoleBuf.hxx" #endif diff --git a/Source/CTest/cmCTestBZR.cxx b/Source/CTest/cmCTestBZR.cxx index 4ea0c88791..8640c46f84 100644 --- a/Source/CTest/cmCTestBZR.cxx +++ b/Source/CTest/cmCTestBZR.cxx @@ -2,6 +2,16 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmCTestBZR.h" +#include <cstdlib> +#include <list> +#include <map> +#include <ostream> +#include <vector> + +#include "cmsys/RegularExpression.hxx" + +#include "cm_expat.h" + #include "cmAlgorithms.h" #include "cmCTest.h" #include "cmCTestVC.h" @@ -9,14 +19,6 @@ #include "cmSystemTools.h" #include "cmXMLParser.h" -#include "cm_expat.h" -#include "cmsys/RegularExpression.hxx" -#include <cstdlib> -#include <list> -#include <map> -#include <ostream> -#include <vector> - extern "C" int cmBZRXMLParserUnknownEncodingHandler(void* /*unused*/, const XML_Char* name, XML_Encoding* info) diff --git a/Source/CTest/cmCTestBZR.h b/Source/CTest/cmCTestBZR.h index d5c78c7603..d7c6321281 100644 --- a/Source/CTest/cmCTestBZR.h +++ b/Source/CTest/cmCTestBZR.h @@ -5,11 +5,11 @@ #include "cmConfigure.h" // IWYU pragma: keep -#include "cmCTestGlobalVC.h" - #include <iosfwd> #include <string> +#include "cmCTestGlobalVC.h" + class cmCTest; /** \class cmCTestBZR diff --git a/Source/CTest/cmCTestBuildAndTestHandler.cxx b/Source/CTest/cmCTestBuildAndTestHandler.cxx index 0f79670144..2ad661cf04 100644 --- a/Source/CTest/cmCTestBuildAndTestHandler.cxx +++ b/Source/CTest/cmCTestBuildAndTestHandler.cxx @@ -2,6 +2,13 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmCTestBuildAndTestHandler.h" +#include <chrono> +#include <cstdlib> +#include <cstring> +#include <ratio> + +#include "cmsys/Process.h" + #include "cmCTest.h" #include "cmCTestTestHandler.h" #include "cmGlobalGenerator.h" @@ -12,12 +19,6 @@ #include "cmWorkingDirectory.h" #include "cmake.h" -#include "cmsys/Process.h" -#include <chrono> -#include <cstdlib> -#include <cstring> -#include <ratio> - cmCTestBuildAndTestHandler::cmCTestBuildAndTestHandler() { this->BuildTwoConfig = false; diff --git a/Source/CTest/cmCTestBuildAndTestHandler.h b/Source/CTest/cmCTestBuildAndTestHandler.h index d5240aad59..0c8a040793 100644 --- a/Source/CTest/cmCTestBuildAndTestHandler.h +++ b/Source/CTest/cmCTestBuildAndTestHandler.h @@ -5,14 +5,15 @@ #include "cmConfigure.h" // IWYU pragma: keep -#include "cmCTestGenericHandler.h" -#include "cmDuration.h" - #include <sstream> -#include <stddef.h> #include <string> #include <vector> +#include <stddef.h> + +#include "cmCTestGenericHandler.h" +#include "cmDuration.h" + class cmake; /** \class cmCTestBuildAndTestHandler diff --git a/Source/CTest/cmCTestBuildCommand.cxx b/Source/CTest/cmCTestBuildCommand.cxx index ce690f91b0..18df2141ec 100644 --- a/Source/CTest/cmCTestBuildCommand.cxx +++ b/Source/CTest/cmCTestBuildCommand.cxx @@ -2,6 +2,11 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmCTestBuildCommand.h" +#include <cstring> +#include <sstream> + +#include "cm_static_string_view.hxx" + #include "cmCTest.h" #include "cmCTestBuildHandler.h" #include "cmGlobalGenerator.h" @@ -9,12 +14,8 @@ #include "cmMessageType.h" #include "cmStringAlgorithms.h" #include "cmSystemTools.h" -#include "cm_static_string_view.hxx" #include "cmake.h" -#include <cstring> -#include <sstream> - class cmExecutionStatus; void cmCTestBuildCommand::BindArguments() diff --git a/Source/CTest/cmCTestBuildCommand.h b/Source/CTest/cmCTestBuildCommand.h index 791e1f0913..da00a43c64 100644 --- a/Source/CTest/cmCTestBuildCommand.h +++ b/Source/CTest/cmCTestBuildCommand.h @@ -5,15 +5,15 @@ #include "cmConfigure.h" // IWYU pragma: keep -#include "cmCTestHandlerCommand.h" -#include "cmCommand.h" - #include <string> #include <utility> #include <vector> #include <cm/memory> +#include "cmCTestHandlerCommand.h" +#include "cmCommand.h" + class cmCTestBuildHandler; class cmCTestGenericHandler; class cmExecutionStatus; diff --git a/Source/CTest/cmCTestBuildHandler.cxx b/Source/CTest/cmCTestBuildHandler.cxx index 86abb124c0..9cb5449d96 100644 --- a/Source/CTest/cmCTestBuildHandler.cxx +++ b/Source/CTest/cmCTestBuildHandler.cxx @@ -2,6 +2,15 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmCTestBuildHandler.h" +#include <cstdlib> +#include <cstring> +#include <set> +#include <utility> + +#include "cmsys/Directory.hxx" +#include "cmsys/FStream.hxx" +#include "cmsys/Process.h" + #include "cmAlgorithms.h" #include "cmCTest.h" #include "cmDuration.h" @@ -14,14 +23,6 @@ #include "cmSystemTools.h" #include "cmXMLWriter.h" -#include "cmsys/Directory.hxx" -#include "cmsys/FStream.hxx" -#include "cmsys/Process.h" -#include <cstdlib> -#include <cstring> -#include <set> -#include <utility> - static const char* cmCTestErrorMatches[] = { "^[Bb]us [Ee]rror", "^[Ss]egmentation [Vv]iolation", diff --git a/Source/CTest/cmCTestBuildHandler.h b/Source/CTest/cmCTestBuildHandler.h index ce1d34357d..a5193f6e55 100644 --- a/Source/CTest/cmCTestBuildHandler.h +++ b/Source/CTest/cmCTestBuildHandler.h @@ -5,18 +5,20 @@ #include "cmConfigure.h" // IWYU pragma: keep -#include "cmCTestGenericHandler.h" - -#include "cmDuration.h" -#include "cmProcessOutput.h" -#include "cmsys/RegularExpression.hxx" #include <chrono> #include <deque> #include <iosfwd> -#include <stddef.h> #include <string> #include <vector> +#include <stddef.h> + +#include "cmsys/RegularExpression.hxx" + +#include "cmCTestGenericHandler.h" +#include "cmDuration.h" +#include "cmProcessOutput.h" + class cmMakefile; class cmStringReplaceHelper; class cmXMLWriter; diff --git a/Source/CTest/cmCTestCVS.cxx b/Source/CTest/cmCTestCVS.cxx index 5baeecd360..45ec39066d 100644 --- a/Source/CTest/cmCTestCVS.cxx +++ b/Source/CTest/cmCTestCVS.cxx @@ -2,19 +2,19 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmCTestCVS.h" +#include <utility> + +#include <cm/string_view> + +#include "cmsys/FStream.hxx" +#include "cmsys/RegularExpression.hxx" + #include "cmCTest.h" #include "cmProcessTools.h" #include "cmStringAlgorithms.h" #include "cmSystemTools.h" #include "cmXMLWriter.h" -#include "cmsys/FStream.hxx" -#include "cmsys/RegularExpression.hxx" - -#include <cm/string_view> - -#include <utility> - cmCTestCVS::cmCTestCVS(cmCTest* ct, std::ostream& log) : cmCTestVC(ct, log) { diff --git a/Source/CTest/cmCTestCVS.h b/Source/CTest/cmCTestCVS.h index 77fc3cc254..7d33d8f2de 100644 --- a/Source/CTest/cmCTestCVS.h +++ b/Source/CTest/cmCTestCVS.h @@ -5,13 +5,13 @@ #include "cmConfigure.h" // IWYU pragma: keep -#include "cmCTestVC.h" - #include <iosfwd> #include <map> #include <string> #include <vector> +#include "cmCTestVC.h" + class cmCTest; class cmXMLWriter; diff --git a/Source/CTest/cmCTestConfigureCommand.cxx b/Source/CTest/cmCTestConfigureCommand.cxx index 948b9fb3d8..f2f42b4f2d 100644 --- a/Source/CTest/cmCTestConfigureCommand.cxx +++ b/Source/CTest/cmCTestConfigureCommand.cxx @@ -2,19 +2,20 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmCTestConfigureCommand.h" +#include <cstring> +#include <sstream> +#include <vector> + +#include "cm_static_string_view.hxx" + #include "cmCTest.h" #include "cmCTestConfigureHandler.h" #include "cmGlobalGenerator.h" #include "cmMakefile.h" #include "cmStringAlgorithms.h" #include "cmSystemTools.h" -#include "cm_static_string_view.hxx" #include "cmake.h" -#include <cstring> -#include <sstream> -#include <vector> - void cmCTestConfigureCommand::BindArguments() { this->cmCTestHandlerCommand::BindArguments(); diff --git a/Source/CTest/cmCTestConfigureCommand.h b/Source/CTest/cmCTestConfigureCommand.h index 0bc78486c2..3f5944af60 100644 --- a/Source/CTest/cmCTestConfigureCommand.h +++ b/Source/CTest/cmCTestConfigureCommand.h @@ -5,14 +5,14 @@ #include "cmConfigure.h" // IWYU pragma: keep -#include "cmCTestHandlerCommand.h" -#include "cmCommand.h" - #include <string> #include <utility> #include <cm/memory> +#include "cmCTestHandlerCommand.h" +#include "cmCommand.h" + class cmCTestGenericHandler; /** \class cmCTestConfigure diff --git a/Source/CTest/cmCTestConfigureHandler.cxx b/Source/CTest/cmCTestConfigureHandler.cxx index 7e93189cde..914930e00e 100644 --- a/Source/CTest/cmCTestConfigureHandler.cxx +++ b/Source/CTest/cmCTestConfigureHandler.cxx @@ -2,15 +2,15 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmCTestConfigureHandler.h" +#include <chrono> +#include <ostream> +#include <string> + #include "cmCTest.h" #include "cmDuration.h" #include "cmGeneratedFileStream.h" #include "cmXMLWriter.h" -#include <chrono> -#include <ostream> -#include <string> - cmCTestConfigureHandler::cmCTestConfigureHandler() = default; void cmCTestConfigureHandler::Initialize() diff --git a/Source/CTest/cmCTestCoverageCommand.cxx b/Source/CTest/cmCTestCoverageCommand.cxx index b66bba74cd..d6e6be3956 100644 --- a/Source/CTest/cmCTestCoverageCommand.cxx +++ b/Source/CTest/cmCTestCoverageCommand.cxx @@ -4,10 +4,11 @@ #include <set> +#include "cm_static_string_view.hxx" + #include "cmAlgorithms.h" #include "cmCTest.h" #include "cmCTestCoverageHandler.h" -#include "cm_static_string_view.hxx" class cmCTestGenericHandler; diff --git a/Source/CTest/cmCTestCoverageCommand.h b/Source/CTest/cmCTestCoverageCommand.h index fcffa756e2..76aaf46f81 100644 --- a/Source/CTest/cmCTestCoverageCommand.h +++ b/Source/CTest/cmCTestCoverageCommand.h @@ -5,15 +5,15 @@ #include "cmConfigure.h" // IWYU pragma: keep -#include "cmCTestHandlerCommand.h" -#include "cmCommand.h" - #include <string> #include <utility> #include <vector> #include <cm/memory> +#include "cmCTestHandlerCommand.h" +#include "cmCommand.h" + class cmCTestGenericHandler; /** \class cmCTestCoverage diff --git a/Source/CTest/cmCTestCoverageHandler.cxx b/Source/CTest/cmCTestCoverageHandler.cxx index 4d7638766a..4cd783fd6b 100644 --- a/Source/CTest/cmCTestCoverageHandler.cxx +++ b/Source/CTest/cmCTestCoverageHandler.cxx @@ -2,6 +2,21 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmCTestCoverageHandler.h" +#include <algorithm> +#include <chrono> +#include <cstdio> +#include <cstdlib> +#include <cstring> +#include <iomanip> +#include <iterator> +#include <sstream> +#include <utility> + +#include "cmsys/FStream.hxx" +#include "cmsys/Glob.hxx" +#include "cmsys/Process.h" +#include "cmsys/RegularExpression.hxx" + #include "cmAlgorithms.h" #include "cmCTest.h" #include "cmDuration.h" @@ -18,20 +33,6 @@ #include "cmWorkingDirectory.h" #include "cmXMLWriter.h" -#include "cmsys/FStream.hxx" -#include "cmsys/Glob.hxx" -#include "cmsys/Process.h" -#include "cmsys/RegularExpression.hxx" -#include <algorithm> -#include <chrono> -#include <cstdio> -#include <cstdlib> -#include <cstring> -#include <iomanip> -#include <iterator> -#include <sstream> -#include <utility> - class cmMakefile; #define SAFEDIV(x, y) (((y) != 0) ? ((x) / (y)) : (0)) diff --git a/Source/CTest/cmCTestCoverageHandler.h b/Source/CTest/cmCTestCoverageHandler.h index 06aaef759b..991b89d7ba 100644 --- a/Source/CTest/cmCTestCoverageHandler.h +++ b/Source/CTest/cmCTestCoverageHandler.h @@ -5,15 +5,16 @@ #include "cmConfigure.h" // IWYU pragma: keep -#include "cmCTestGenericHandler.h" - -#include "cmsys/RegularExpression.hxx" #include <iosfwd> #include <map> #include <set> #include <string> #include <vector> +#include "cmsys/RegularExpression.hxx" + +#include "cmCTestGenericHandler.h" + class cmGeneratedFileStream; class cmMakefile; class cmXMLWriter; diff --git a/Source/CTest/cmCTestCurl.cxx b/Source/CTest/cmCTestCurl.cxx index 87932607ea..ccac832f06 100644 --- a/Source/CTest/cmCTestCurl.cxx +++ b/Source/CTest/cmCTestCurl.cxx @@ -2,15 +2,15 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmCTestCurl.h" +#include <cstdio> +#include <ostream> + #include "cmAlgorithms.h" #include "cmCTest.h" #include "cmCurl.h" #include "cmStringAlgorithms.h" #include "cmSystemTools.h" -#include <cstdio> -#include <ostream> - cmCTestCurl::cmCTestCurl(cmCTest* ctest) { this->CTest = ctest; diff --git a/Source/CTest/cmCTestCurl.h b/Source/CTest/cmCTestCurl.h index 6186af8d20..9c5ba667e5 100644 --- a/Source/CTest/cmCTestCurl.h +++ b/Source/CTest/cmCTestCurl.h @@ -5,10 +5,11 @@ #include "cmConfigure.h" // IWYU pragma: keep -#include "cm_curl.h" #include <string> #include <vector> +#include "cm_curl.h" + class cmCTest; class cmCTestCurl diff --git a/Source/CTest/cmCTestEmptyBinaryDirectoryCommand.cxx b/Source/CTest/cmCTestEmptyBinaryDirectoryCommand.cxx index f4531a1ee9..051c117ca9 100644 --- a/Source/CTest/cmCTestEmptyBinaryDirectoryCommand.cxx +++ b/Source/CTest/cmCTestEmptyBinaryDirectoryCommand.cxx @@ -2,10 +2,10 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmCTestEmptyBinaryDirectoryCommand.h" -#include "cmCTestScriptHandler.h" - #include <sstream> +#include "cmCTestScriptHandler.h" + class cmExecutionStatus; bool cmCTestEmptyBinaryDirectoryCommand::InitialPass( diff --git a/Source/CTest/cmCTestEmptyBinaryDirectoryCommand.h b/Source/CTest/cmCTestEmptyBinaryDirectoryCommand.h index 4232b9edc4..ac96a4e30e 100644 --- a/Source/CTest/cmCTestEmptyBinaryDirectoryCommand.h +++ b/Source/CTest/cmCTestEmptyBinaryDirectoryCommand.h @@ -5,15 +5,15 @@ #include "cmConfigure.h" // IWYU pragma: keep -#include "cmCTestCommand.h" -#include "cmCommand.h" - #include <string> #include <utility> #include <vector> #include <cm/memory> +#include "cmCTestCommand.h" +#include "cmCommand.h" + class cmExecutionStatus; /** \class cmCTestEmptyBinaryDirectory diff --git a/Source/CTest/cmCTestGIT.cxx b/Source/CTest/cmCTestGIT.cxx index 9fd3a6223d..3f3c1074f5 100644 --- a/Source/CTest/cmCTestGIT.cxx +++ b/Source/CTest/cmCTestGIT.cxx @@ -2,14 +2,15 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmCTestGIT.h" -#include "cmsys/FStream.hxx" -#include "cmsys/Process.h" #include <cctype> #include <cstdio> #include <cstdlib> #include <ctime> #include <vector> +#include "cmsys/FStream.hxx" +#include "cmsys/Process.h" + #include "cmCTest.h" #include "cmCTestVC.h" #include "cmProcessOutput.h" diff --git a/Source/CTest/cmCTestGIT.h b/Source/CTest/cmCTestGIT.h index ade430faed..3103d8492b 100644 --- a/Source/CTest/cmCTestGIT.h +++ b/Source/CTest/cmCTestGIT.h @@ -5,11 +5,11 @@ #include "cmConfigure.h" // IWYU pragma: keep -#include "cmCTestGlobalVC.h" - #include <iosfwd> #include <string> +#include "cmCTestGlobalVC.h" + class cmCTest; /** \class cmCTestGIT diff --git a/Source/CTest/cmCTestGenericHandler.h b/Source/CTest/cmCTestGenericHandler.h index 793829e9ef..94e5418650 100644 --- a/Source/CTest/cmCTestGenericHandler.h +++ b/Source/CTest/cmCTestGenericHandler.h @@ -6,10 +6,11 @@ #include "cmConfigure.h" // IWYU pragma: keep #include <map> -#include <stddef.h> #include <string> #include <vector> +#include <stddef.h> + #include "cmCTest.h" #include "cmSystemTools.h" diff --git a/Source/CTest/cmCTestGlobalVC.cxx b/Source/CTest/cmCTestGlobalVC.cxx index 54ebd4f0ce..5f05efb331 100644 --- a/Source/CTest/cmCTestGlobalVC.cxx +++ b/Source/CTest/cmCTestGlobalVC.cxx @@ -2,13 +2,13 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmCTestGlobalVC.h" +#include <ostream> +#include <utility> + #include "cmCTest.h" #include "cmSystemTools.h" #include "cmXMLWriter.h" -#include <ostream> -#include <utility> - cmCTestGlobalVC::cmCTestGlobalVC(cmCTest* ct, std::ostream& log) : cmCTestVC(ct, log) { diff --git a/Source/CTest/cmCTestGlobalVC.h b/Source/CTest/cmCTestGlobalVC.h index 9c572152ec..ff86591eae 100644 --- a/Source/CTest/cmCTestGlobalVC.h +++ b/Source/CTest/cmCTestGlobalVC.h @@ -5,14 +5,14 @@ #include "cmConfigure.h" // IWYU pragma: keep -#include "cmCTestVC.h" - #include <iosfwd> #include <list> #include <map> #include <string> #include <vector> +#include "cmCTestVC.h" + class cmCTest; class cmXMLWriter; diff --git a/Source/CTest/cmCTestHG.cxx b/Source/CTest/cmCTestHG.cxx index 297077e1f4..3265498c08 100644 --- a/Source/CTest/cmCTestHG.cxx +++ b/Source/CTest/cmCTestHG.cxx @@ -2,6 +2,11 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmCTestHG.h" +#include <ostream> +#include <vector> + +#include "cmsys/RegularExpression.hxx" + #include "cmAlgorithms.h" #include "cmCTest.h" #include "cmCTestVC.h" @@ -9,10 +14,6 @@ #include "cmSystemTools.h" #include "cmXMLParser.h" -#include "cmsys/RegularExpression.hxx" -#include <ostream> -#include <vector> - cmCTestHG::cmCTestHG(cmCTest* ct, std::ostream& log) : cmCTestGlobalVC(ct, log) { diff --git a/Source/CTest/cmCTestHG.h b/Source/CTest/cmCTestHG.h index c12d618874..2900139b4a 100644 --- a/Source/CTest/cmCTestHG.h +++ b/Source/CTest/cmCTestHG.h @@ -5,11 +5,11 @@ #include "cmConfigure.h" // IWYU pragma: keep -#include "cmCTestGlobalVC.h" - #include <iosfwd> #include <string> +#include "cmCTestGlobalVC.h" + class cmCTest; /** \class cmCTestHG diff --git a/Source/CTest/cmCTestHandlerCommand.cxx b/Source/CTest/cmCTestHandlerCommand.cxx index 3f9ce4e4b8..b1034c9ff8 100644 --- a/Source/CTest/cmCTestHandlerCommand.cxx +++ b/Source/CTest/cmCTestHandlerCommand.cxx @@ -2,6 +2,13 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmCTestHandlerCommand.h" +#include <algorithm> +#include <cstdlib> +#include <cstring> +#include <sstream> + +#include "cm_static_string_view.hxx" + #include "cmCTest.h" #include "cmCTestGenericHandler.h" #include "cmExecutionStatus.h" @@ -10,12 +17,6 @@ #include "cmStringAlgorithms.h" #include "cmSystemTools.h" #include "cmWorkingDirectory.h" -#include "cm_static_string_view.hxx" - -#include <algorithm> -#include <cstdlib> -#include <cstring> -#include <sstream> namespace { // class to save and restore the error state for ctest_* commands diff --git a/Source/CTest/cmCTestHandlerCommand.h b/Source/CTest/cmCTestHandlerCommand.h index 5bbc5696bc..a20d607e2f 100644 --- a/Source/CTest/cmCTestHandlerCommand.h +++ b/Source/CTest/cmCTestHandlerCommand.h @@ -5,12 +5,12 @@ #include "cmConfigure.h" // IWYU pragma: keep -#include "cmArgumentParser.h" -#include "cmCTestCommand.h" - #include <string> #include <vector> +#include "cmArgumentParser.h" +#include "cmCTestCommand.h" + class cmCTestGenericHandler; class cmExecutionStatus; diff --git a/Source/CTest/cmCTestLaunch.cxx b/Source/CTest/cmCTestLaunch.cxx index ba49c29101..647f5fff9f 100644 --- a/Source/CTest/cmCTestLaunch.cxx +++ b/Source/CTest/cmCTestLaunch.cxx @@ -2,13 +2,14 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmCTestLaunch.h" -#include "cmsys/FStream.hxx" -#include "cmsys/Process.h" -#include "cmsys/RegularExpression.hxx" #include <cstdlib> #include <cstring> #include <iostream> +#include "cmsys/FStream.hxx" +#include "cmsys/Process.h" +#include "cmsys/RegularExpression.hxx" + #include "cmCryptoHash.h" #include "cmGeneratedFileStream.h" #include "cmGlobalGenerator.h" diff --git a/Source/CTest/cmCTestLaunch.h b/Source/CTest/cmCTestLaunch.h index 107fd61746..79a7712aa5 100644 --- a/Source/CTest/cmCTestLaunch.h +++ b/Source/CTest/cmCTestLaunch.h @@ -5,11 +5,12 @@ #include "cmConfigure.h" // IWYU pragma: keep -#include "cmsys/RegularExpression.hxx" #include <set> #include <string> #include <vector> +#include "cmsys/RegularExpression.hxx" + class cmXMLElement; /** \class cmCTestLaunch diff --git a/Source/CTest/cmCTestMemCheckCommand.cxx b/Source/CTest/cmCTestMemCheckCommand.cxx index abad5fc41f..39dec6d87d 100644 --- a/Source/CTest/cmCTestMemCheckCommand.cxx +++ b/Source/CTest/cmCTestMemCheckCommand.cxx @@ -2,10 +2,11 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmCTestMemCheckCommand.h" +#include "cm_static_string_view.hxx" + #include "cmCTest.h" #include "cmCTestMemCheckHandler.h" #include "cmMakefile.h" -#include "cm_static_string_view.hxx" void cmCTestMemCheckCommand::BindArguments() { diff --git a/Source/CTest/cmCTestMemCheckHandler.cxx b/Source/CTest/cmCTestMemCheckHandler.cxx index ba196f0e48..a5ec1ae81e 100644 --- a/Source/CTest/cmCTestMemCheckHandler.cxx +++ b/Source/CTest/cmCTestMemCheckHandler.cxx @@ -2,21 +2,22 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmCTestMemCheckHandler.h" -#include "cmCTest.h" -#include "cmDuration.h" -#include "cmSystemTools.h" -#include "cmXMLParser.h" -#include "cmXMLWriter.h" - -#include "cmsys/FStream.hxx" -#include "cmsys/Glob.hxx" -#include "cmsys/RegularExpression.hxx" #include <chrono> #include <cstring> #include <iostream> #include <sstream> #include <utility> +#include "cmsys/FStream.hxx" +#include "cmsys/Glob.hxx" +#include "cmsys/RegularExpression.hxx" + +#include "cmCTest.h" +#include "cmDuration.h" +#include "cmSystemTools.h" +#include "cmXMLParser.h" +#include "cmXMLWriter.h" + struct CatToErrorType { const char* ErrorCategory; diff --git a/Source/CTest/cmCTestMemCheckHandler.h b/Source/CTest/cmCTestMemCheckHandler.h index 4bc655b2f8..eda65f7b98 100644 --- a/Source/CTest/cmCTestMemCheckHandler.h +++ b/Source/CTest/cmCTestMemCheckHandler.h @@ -5,11 +5,11 @@ #include "cmConfigure.h" // IWYU pragma: keep -#include "cmCTestTestHandler.h" - #include <string> #include <vector> +#include "cmCTestTestHandler.h" + class cmMakefile; class cmXMLWriter; diff --git a/Source/CTest/cmCTestMultiProcessHandler.cxx b/Source/CTest/cmCTestMultiProcessHandler.cxx index f79ba2e67f..190250006d 100644 --- a/Source/CTest/cmCTestMultiProcessHandler.cxx +++ b/Source/CTest/cmCTestMultiProcessHandler.cxx @@ -2,27 +2,6 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmCTestMultiProcessHandler.h" -#include "cmAffinity.h" -#include "cmAlgorithms.h" -#include "cmCTest.h" -#include "cmCTestRunTest.h" -#include "cmCTestTestHandler.h" -#include "cmDuration.h" -#include "cmListFileCache.h" -#include "cmRange.h" -#include "cmStringAlgorithms.h" -#include "cmSystemTools.h" -#include "cmWorkingDirectory.h" - -#include "cm_jsoncpp_value.h" -#include "cm_jsoncpp_writer.h" -#include "cm_uv.h" - -#include "cmUVSignalHackRAII.h" // IWYU pragma: keep - -#include "cmsys/FStream.hxx" -#include "cmsys/SystemInformation.hxx" - #include <algorithm> #include <chrono> #include <cmath> @@ -38,6 +17,26 @@ #include <utility> #include <vector> +#include "cmsys/FStream.hxx" +#include "cmsys/SystemInformation.hxx" + +#include "cm_jsoncpp_value.h" +#include "cm_jsoncpp_writer.h" +#include "cm_uv.h" + +#include "cmAffinity.h" +#include "cmAlgorithms.h" +#include "cmCTest.h" +#include "cmCTestRunTest.h" +#include "cmCTestTestHandler.h" +#include "cmDuration.h" +#include "cmListFileCache.h" +#include "cmRange.h" +#include "cmStringAlgorithms.h" +#include "cmSystemTools.h" +#include "cmUVSignalHackRAII.h" // IWYU pragma: keep +#include "cmWorkingDirectory.h" + namespace cmsys { class RegularExpression; } diff --git a/Source/CTest/cmCTestMultiProcessHandler.h b/Source/CTest/cmCTestMultiProcessHandler.h index 93bb880fef..be31c75c37 100644 --- a/Source/CTest/cmCTestMultiProcessHandler.h +++ b/Source/CTest/cmCTestMultiProcessHandler.h @@ -5,16 +5,18 @@ #include "cmConfigure.h" // IWYU pragma: keep -#include "cmCTestTestHandler.h" #include <map> #include <set> -#include <stddef.h> #include <string> #include <vector> -#include "cmUVHandlePtr.h" +#include <stddef.h> + #include "cm_uv.h" +#include "cmCTestTestHandler.h" +#include "cmUVHandlePtr.h" + class cmCTest; class cmCTestRunTest; diff --git a/Source/CTest/cmCTestP4.cxx b/Source/CTest/cmCTestP4.cxx index a6aea85d34..e2063e1786 100644 --- a/Source/CTest/cmCTestP4.cxx +++ b/Source/CTest/cmCTestP4.cxx @@ -2,6 +2,13 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmCTestP4.h" +#include <algorithm> +#include <ctime> +#include <ostream> +#include <utility> + +#include "cmsys/RegularExpression.hxx" + #include "cmAlgorithms.h" #include "cmCTest.h" #include "cmCTestVC.h" @@ -10,12 +17,6 @@ #include "cmStringAlgorithms.h" #include "cmSystemTools.h" -#include "cmsys/RegularExpression.hxx" -#include <algorithm> -#include <ctime> -#include <ostream> -#include <utility> - cmCTestP4::cmCTestP4(cmCTest* ct, std::ostream& log) : cmCTestGlobalVC(ct, log) { diff --git a/Source/CTest/cmCTestP4.h b/Source/CTest/cmCTestP4.h index b14edf7e94..e19472ee89 100644 --- a/Source/CTest/cmCTestP4.h +++ b/Source/CTest/cmCTestP4.h @@ -5,13 +5,13 @@ #include "cmConfigure.h" // IWYU pragma: keep -#include "cmCTestGlobalVC.h" - #include <iosfwd> #include <map> #include <string> #include <vector> +#include "cmCTestGlobalVC.h" + class cmCTest; /** \class cmCTestP4 diff --git a/Source/CTest/cmCTestReadCustomFilesCommand.h b/Source/CTest/cmCTestReadCustomFilesCommand.h index 8199cbcbe1..cbb939030b 100644 --- a/Source/CTest/cmCTestReadCustomFilesCommand.h +++ b/Source/CTest/cmCTestReadCustomFilesCommand.h @@ -5,15 +5,15 @@ #include "cmConfigure.h" // IWYU pragma: keep -#include "cmCTestCommand.h" -#include "cmCommand.h" - #include <string> #include <utility> #include <vector> #include <cm/memory> +#include "cmCTestCommand.h" +#include "cmCommand.h" + class cmExecutionStatus; /** \class cmCTestReadCustomFiles diff --git a/Source/CTest/cmCTestRunScriptCommand.h b/Source/CTest/cmCTestRunScriptCommand.h index d262a830a0..2d8bde19df 100644 --- a/Source/CTest/cmCTestRunScriptCommand.h +++ b/Source/CTest/cmCTestRunScriptCommand.h @@ -5,15 +5,15 @@ #include "cmConfigure.h" // IWYU pragma: keep -#include "cmCTestCommand.h" -#include "cmCommand.h" - #include <string> #include <utility> #include <vector> #include <cm/memory> +#include "cmCTestCommand.h" +#include "cmCommand.h" + class cmExecutionStatus; /** \class cmCTestRunScript diff --git a/Source/CTest/cmCTestRunTest.cxx b/Source/CTest/cmCTestRunTest.cxx index d8a5923765..0188fe08d3 100644 --- a/Source/CTest/cmCTestRunTest.cxx +++ b/Source/CTest/cmCTestRunTest.cxx @@ -2,15 +2,6 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmCTestRunTest.h" -#include "cmCTest.h" -#include "cmCTestMemCheckHandler.h" -#include "cmCTestMultiProcessHandler.h" -#include "cmProcess.h" -#include "cmStringAlgorithms.h" -#include "cmSystemTools.h" -#include "cmWorkingDirectory.h" - -#include "cmsys/RegularExpression.hxx" #include <chrono> #include <cstdint> #include <cstdio> @@ -22,6 +13,16 @@ #include <cm/memory> +#include "cmsys/RegularExpression.hxx" + +#include "cmCTest.h" +#include "cmCTestMemCheckHandler.h" +#include "cmCTestMultiProcessHandler.h" +#include "cmProcess.h" +#include "cmStringAlgorithms.h" +#include "cmSystemTools.h" +#include "cmWorkingDirectory.h" + cmCTestRunTest::cmCTestRunTest(cmCTestMultiProcessHandler& multiHandler) : MultiTestHandler(multiHandler) { diff --git a/Source/CTest/cmCTestRunTest.h b/Source/CTest/cmCTestRunTest.h index 43dfe8eaba..c770bac2ab 100644 --- a/Source/CTest/cmCTestRunTest.h +++ b/Source/CTest/cmCTestRunTest.h @@ -7,10 +7,11 @@ #include <memory> #include <set> -#include <stddef.h> #include <string> #include <vector> +#include <stddef.h> + #include "cmCTestTestHandler.h" #include "cmDuration.h" #include "cmProcess.h" diff --git a/Source/CTest/cmCTestSVN.cxx b/Source/CTest/cmCTestSVN.cxx index 6e5b5e72e7..34395c9fe0 100644 --- a/Source/CTest/cmCTestSVN.cxx +++ b/Source/CTest/cmCTestSVN.cxx @@ -2,6 +2,13 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmCTestSVN.h" +#include <cstdlib> +#include <cstring> +#include <map> +#include <ostream> + +#include "cmsys/RegularExpression.hxx" + #include "cmAlgorithms.h" #include "cmCTest.h" #include "cmCTestVC.h" @@ -11,12 +18,6 @@ #include "cmXMLParser.h" #include "cmXMLWriter.h" -#include "cmsys/RegularExpression.hxx" -#include <cstdlib> -#include <cstring> -#include <map> -#include <ostream> - struct cmCTestSVN::Revision : public cmCTestVC::Revision { cmCTestSVN::SVNInfo* SVNInfo; diff --git a/Source/CTest/cmCTestSVN.h b/Source/CTest/cmCTestSVN.h index 5c8505d490..b74dc12b0d 100644 --- a/Source/CTest/cmCTestSVN.h +++ b/Source/CTest/cmCTestSVN.h @@ -5,13 +5,13 @@ #include "cmConfigure.h" // IWYU pragma: keep -#include "cmCTestGlobalVC.h" - #include <iosfwd> #include <list> #include <string> #include <vector> +#include "cmCTestGlobalVC.h" + class cmCTest; class cmXMLWriter; diff --git a/Source/CTest/cmCTestScriptHandler.cxx b/Source/CTest/cmCTestScriptHandler.cxx index c988e3ac7c..60facbdf53 100644 --- a/Source/CTest/cmCTestScriptHandler.cxx +++ b/Source/CTest/cmCTestScriptHandler.cxx @@ -2,11 +2,20 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmCTestScriptHandler.h" -#include "cmsys/Directory.hxx" -#include "cmsys/Process.h" +#include <cstdio> +#include <cstdlib> +#include <cstring> +#include <map> +#include <memory> +#include <ratio> +#include <sstream> +#include <utility> #include <cm/memory> +#include "cmsys/Directory.hxx" +#include "cmsys/Process.h" + #include "cmCTest.h" #include "cmCTestBuildCommand.h" #include "cmCTestCommand.h" @@ -34,15 +43,6 @@ #include "cmSystemTools.h" #include "cmake.h" -#include <cstdio> -#include <cstdlib> -#include <cstring> -#include <map> -#include <memory> -#include <ratio> -#include <sstream> -#include <utility> - #ifdef _WIN32 # include <windows.h> #else diff --git a/Source/CTest/cmCTestScriptHandler.h b/Source/CTest/cmCTestScriptHandler.h index 4a08ad98c2..d0031990ba 100644 --- a/Source/CTest/cmCTestScriptHandler.h +++ b/Source/CTest/cmCTestScriptHandler.h @@ -5,14 +5,14 @@ #include "cmConfigure.h" // IWYU pragma: keep -#include "cmCTestGenericHandler.h" -#include "cmDuration.h" - #include <chrono> #include <memory> #include <string> #include <vector> +#include "cmCTestGenericHandler.h" +#include "cmDuration.h" + class cmCTest; class cmCTestCommand; class cmGlobalGenerator; diff --git a/Source/CTest/cmCTestSleepCommand.cxx b/Source/CTest/cmCTestSleepCommand.cxx index bc4470c736..623d3b69cb 100644 --- a/Source/CTest/cmCTestSleepCommand.cxx +++ b/Source/CTest/cmCTestSleepCommand.cxx @@ -2,10 +2,10 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmCTestSleepCommand.h" -#include "cmCTestScriptHandler.h" - #include <cstdlib> +#include "cmCTestScriptHandler.h" + class cmExecutionStatus; bool cmCTestSleepCommand::InitialPass(std::vector<std::string> const& args, diff --git a/Source/CTest/cmCTestSleepCommand.h b/Source/CTest/cmCTestSleepCommand.h index b98079d2e8..1c3b8a1e1d 100644 --- a/Source/CTest/cmCTestSleepCommand.h +++ b/Source/CTest/cmCTestSleepCommand.h @@ -5,15 +5,15 @@ #include "cmConfigure.h" // IWYU pragma: keep -#include "cmCTestCommand.h" -#include "cmCommand.h" - #include <string> #include <utility> #include <vector> #include <cm/memory> +#include "cmCTestCommand.h" +#include "cmCommand.h" + class cmExecutionStatus; /** \class cmCTestSleep diff --git a/Source/CTest/cmCTestStartCommand.cxx b/Source/CTest/cmCTestStartCommand.cxx index 844f2ca760..fe684062d4 100644 --- a/Source/CTest/cmCTestStartCommand.cxx +++ b/Source/CTest/cmCTestStartCommand.cxx @@ -2,15 +2,15 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmCTestStartCommand.h" +#include <cstddef> +#include <sstream> + #include "cmCTest.h" #include "cmCTestVC.h" #include "cmGeneratedFileStream.h" #include "cmMakefile.h" #include "cmSystemTools.h" -#include <cstddef> -#include <sstream> - class cmExecutionStatus; cmCTestStartCommand::cmCTestStartCommand() diff --git a/Source/CTest/cmCTestStartCommand.h b/Source/CTest/cmCTestStartCommand.h index 598c937af2..b30b1bb445 100644 --- a/Source/CTest/cmCTestStartCommand.h +++ b/Source/CTest/cmCTestStartCommand.h @@ -5,9 +5,6 @@ #include "cmConfigure.h" // IWYU pragma: keep -#include "cmCTestCommand.h" -#include "cmCommand.h" - #include <iosfwd> #include <string> #include <utility> @@ -15,6 +12,9 @@ #include <cm/memory> +#include "cmCTestCommand.h" +#include "cmCommand.h" + class cmExecutionStatus; /** \class cmCTestStart diff --git a/Source/CTest/cmCTestSubmitCommand.cxx b/Source/CTest/cmCTestSubmitCommand.cxx index 706b45aba5..46b00b1685 100644 --- a/Source/CTest/cmCTestSubmitCommand.cxx +++ b/Source/CTest/cmCTestSubmitCommand.cxx @@ -2,6 +2,14 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmCTestSubmitCommand.h" +#include <set> +#include <sstream> +#include <utility> + +#include <cm/memory> + +#include "cm_static_string_view.hxx" + #include "cmAlgorithms.h" #include "cmCTest.h" #include "cmCTestSubmitHandler.h" @@ -11,13 +19,6 @@ #include "cmRange.h" #include "cmStringAlgorithms.h" #include "cmSystemTools.h" -#include "cm_static_string_view.hxx" - -#include <set> -#include <sstream> -#include <utility> - -#include <cm/memory> class cmExecutionStatus; diff --git a/Source/CTest/cmCTestSubmitCommand.h b/Source/CTest/cmCTestSubmitCommand.h index 249f84405f..90607713b1 100644 --- a/Source/CTest/cmCTestSubmitCommand.h +++ b/Source/CTest/cmCTestSubmitCommand.h @@ -5,12 +5,12 @@ #include "cmConfigure.h" // IWYU pragma: keep -#include "cmCTestHandlerCommand.h" - #include <memory> #include <string> #include <vector> +#include "cmCTestHandlerCommand.h" + class cmCommand; class cmCTestGenericHandler; class cmExecutionStatus; diff --git a/Source/CTest/cmCTestSubmitHandler.cxx b/Source/CTest/cmCTestSubmitHandler.cxx index ca7fd2c439..2ac5af691a 100644 --- a/Source/CTest/cmCTestSubmitHandler.cxx +++ b/Source/CTest/cmCTestSubmitHandler.cxx @@ -2,14 +2,15 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmCTestSubmitHandler.h" -#include "cm_curl.h" -#include "cm_jsoncpp_reader.h" -#include "cm_jsoncpp_value.h" #include <chrono> #include <cstdio> #include <cstdlib> #include <sstream> +#include "cm_curl.h" +#include "cm_jsoncpp_reader.h" +#include "cm_jsoncpp_value.h" + #include "cmAlgorithms.h" #include "cmCTest.h" #include "cmCTestCurl.h" diff --git a/Source/CTest/cmCTestSubmitHandler.h b/Source/CTest/cmCTestSubmitHandler.h index 31b747b708..304daaa980 100644 --- a/Source/CTest/cmCTestSubmitHandler.h +++ b/Source/CTest/cmCTestSubmitHandler.h @@ -5,14 +5,14 @@ #include "cmConfigure.h" // IWYU pragma: keep -#include "cmCTest.h" -#include "cmCTestGenericHandler.h" - #include <iosfwd> #include <set> #include <string> #include <vector> +#include "cmCTest.h" +#include "cmCTestGenericHandler.h" + /** \class cmCTestSubmitHandler * \brief Helper class for CTest * diff --git a/Source/CTest/cmCTestTestCommand.cxx b/Source/CTest/cmCTestTestCommand.cxx index c277db8464..d200b404b3 100644 --- a/Source/CTest/cmCTestTestCommand.cxx +++ b/Source/CTest/cmCTestTestCommand.cxx @@ -2,17 +2,18 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmCTestTestCommand.h" +#include <chrono> +#include <cstdlib> +#include <sstream> + +#include "cm_static_string_view.hxx" + #include "cmCTest.h" #include "cmCTestGenericHandler.h" #include "cmCTestTestHandler.h" #include "cmDuration.h" #include "cmMakefile.h" #include "cmStringAlgorithms.h" -#include "cm_static_string_view.hxx" - -#include <chrono> -#include <cstdlib> -#include <sstream> void cmCTestTestCommand::BindArguments() { diff --git a/Source/CTest/cmCTestTestCommand.h b/Source/CTest/cmCTestTestCommand.h index edd21b748d..cb65c0bf14 100644 --- a/Source/CTest/cmCTestTestCommand.h +++ b/Source/CTest/cmCTestTestCommand.h @@ -5,14 +5,14 @@ #include "cmConfigure.h" // IWYU pragma: keep -#include "cmCTestHandlerCommand.h" -#include "cmCommand.h" - #include <string> #include <utility> #include <cm/memory> +#include "cmCTestHandlerCommand.h" +#include "cmCommand.h" + class cmCTestGenericHandler; /** \class cmCTestTest diff --git a/Source/CTest/cmCTestTestHandler.cxx b/Source/CTest/cmCTestTestHandler.cxx index ee0d8c8f7b..67d16afcd1 100644 --- a/Source/CTest/cmCTestTestHandler.cxx +++ b/Source/CTest/cmCTestTestHandler.cxx @@ -2,8 +2,30 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmCTestTestHandler.h" +#include <algorithm> +#include <chrono> +#include <cmath> +#include <cstddef> +#include <cstdio> +#include <cstdlib> +#include <cstring> +#include <ctime> +#include <functional> +#include <iomanip> +#include <iterator> +#include <set> +#include <sstream> +#include <utility> + #include <cm/memory> +#include "cmsys/FStream.hxx" +#include <cmsys/Base64.h> +#include <cmsys/Directory.hxx> +#include <cmsys/RegularExpression.hxx> + +#include "cm_utf8.h" + #include "cmAlgorithms.h" #include "cmCTest.h" #include "cmCTestMultiProcessHandler.h" @@ -18,27 +40,7 @@ #include "cmSystemTools.h" #include "cmWorkingDirectory.h" #include "cmXMLWriter.h" -#include "cm_utf8.h" #include "cmake.h" -#include "cmsys/FStream.hxx" - -#include <algorithm> -#include <chrono> -#include <cmath> -#include <cmsys/Base64.h> -#include <cmsys/Directory.hxx> -#include <cmsys/RegularExpression.hxx> -#include <cstddef> -#include <cstdio> -#include <cstdlib> -#include <cstring> -#include <ctime> -#include <functional> -#include <iomanip> -#include <iterator> -#include <set> -#include <sstream> -#include <utility> namespace { diff --git a/Source/CTest/cmCTestTestHandler.h b/Source/CTest/cmCTestTestHandler.h index 8f1dafced9..1807a5c03e 100644 --- a/Source/CTest/cmCTestTestHandler.h +++ b/Source/CTest/cmCTestTestHandler.h @@ -5,21 +5,23 @@ #include "cmConfigure.h" // IWYU pragma: keep -#include "cmCTestGenericHandler.h" -#include "cmDuration.h" -#include "cmListFileCache.h" - -#include "cmsys/RegularExpression.hxx" #include <chrono> #include <cstdint> #include <iosfwd> #include <map> #include <set> -#include <stddef.h> #include <string> #include <utility> #include <vector> +#include <stddef.h> + +#include "cmsys/RegularExpression.hxx" + +#include "cmCTestGenericHandler.h" +#include "cmDuration.h" +#include "cmListFileCache.h" + class cmCTest; class cmMakefile; class cmXMLWriter; diff --git a/Source/CTest/cmCTestUpdateCommand.h b/Source/CTest/cmCTestUpdateCommand.h index a4798a526b..5555c16377 100644 --- a/Source/CTest/cmCTestUpdateCommand.h +++ b/Source/CTest/cmCTestUpdateCommand.h @@ -5,14 +5,14 @@ #include "cmConfigure.h" // IWYU pragma: keep -#include "cmCTestHandlerCommand.h" -#include "cmCommand.h" - #include <string> #include <utility> #include <cm/memory> +#include "cmCTestHandlerCommand.h" +#include "cmCommand.h" + class cmCTestGenericHandler; /** \class cmCTestUpdate diff --git a/Source/CTest/cmCTestUpdateHandler.cxx b/Source/CTest/cmCTestUpdateHandler.cxx index c4cb233f98..f30ba2bd26 100644 --- a/Source/CTest/cmCTestUpdateHandler.cxx +++ b/Source/CTest/cmCTestUpdateHandler.cxx @@ -2,6 +2,11 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmCTestUpdateHandler.h" +#include <chrono> +#include <sstream> + +#include <cm/memory> + #include "cmCLocaleEnvironmentScope.h" #include "cmCTest.h" #include "cmCTestBZR.h" @@ -17,11 +22,6 @@ #include "cmVersion.h" #include "cmXMLWriter.h" -#include <chrono> -#include <sstream> - -#include <cm/memory> - static const char* cmCTestUpdateHandlerUpdateStrings[] = { "Unknown", "CVS", "SVN", "BZR", "GIT", "HG", "P4" }; diff --git a/Source/CTest/cmCTestUpdateHandler.h b/Source/CTest/cmCTestUpdateHandler.h index 57b952d245..afc0e3d808 100644 --- a/Source/CTest/cmCTestUpdateHandler.h +++ b/Source/CTest/cmCTestUpdateHandler.h @@ -5,12 +5,12 @@ #include "cmConfigure.h" // IWYU pragma: keep -#include "cmCTestGenericHandler.h" - #include <string> #include <utility> #include <vector> +#include "cmCTestGenericHandler.h" + /** \class cmCTestUpdateHandler * \brief A class that handles ctest -S invocations * diff --git a/Source/CTest/cmCTestUploadCommand.cxx b/Source/CTest/cmCTestUploadCommand.cxx index 91808212c4..d0e3848a08 100644 --- a/Source/CTest/cmCTestUploadCommand.cxx +++ b/Source/CTest/cmCTestUploadCommand.cxx @@ -6,13 +6,14 @@ #include <sstream> #include <vector> +#include "cm_static_string_view.hxx" + #include "cmAlgorithms.h" #include "cmCTest.h" #include "cmCTestUploadHandler.h" #include "cmMakefile.h" #include "cmMessageType.h" #include "cmSystemTools.h" -#include "cm_static_string_view.hxx" void cmCTestUploadCommand::BindArguments() { diff --git a/Source/CTest/cmCTestUploadCommand.h b/Source/CTest/cmCTestUploadCommand.h index f78f0ec859..8334a9e08d 100644 --- a/Source/CTest/cmCTestUploadCommand.h +++ b/Source/CTest/cmCTestUploadCommand.h @@ -5,15 +5,15 @@ #include "cmConfigure.h" // IWYU pragma: keep -#include "cmCTestHandlerCommand.h" -#include "cmCommand.h" - #include <string> #include <utility> #include <vector> #include <cm/memory> +#include "cmCTestHandlerCommand.h" +#include "cmCommand.h" + class cmCTestGenericHandler; /** \class cmCTestUpload diff --git a/Source/CTest/cmCTestUploadHandler.cxx b/Source/CTest/cmCTestUploadHandler.cxx index 9efdf70b84..9d92aad036 100644 --- a/Source/CTest/cmCTestUploadHandler.cxx +++ b/Source/CTest/cmCTestUploadHandler.cxx @@ -2,14 +2,14 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmCTestUploadHandler.h" +#include <ostream> +#include <string> + #include "cmCTest.h" #include "cmGeneratedFileStream.h" #include "cmVersion.h" #include "cmXMLWriter.h" -#include <ostream> -#include <string> - cmCTestUploadHandler::cmCTestUploadHandler() { this->Initialize(); diff --git a/Source/CTest/cmCTestUploadHandler.h b/Source/CTest/cmCTestUploadHandler.h index ff69c6eb6f..dde14df166 100644 --- a/Source/CTest/cmCTestUploadHandler.h +++ b/Source/CTest/cmCTestUploadHandler.h @@ -5,11 +5,11 @@ #include "cmConfigure.h" // IWYU pragma: keep -#include "cmCTestGenericHandler.h" - #include <set> #include <string> +#include "cmCTestGenericHandler.h" + /** \class cmCTestUploadHandler * \brief Helper class for CTest * diff --git a/Source/CTest/cmCTestVC.cxx b/Source/CTest/cmCTestVC.cxx index 00919e530b..6026c69bb2 100644 --- a/Source/CTest/cmCTestVC.cxx +++ b/Source/CTest/cmCTestVC.cxx @@ -2,17 +2,18 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmCTestVC.h" -#include "cmCTest.h" -#include "cmStringAlgorithms.h" -#include "cmSystemTools.h" -#include "cmXMLWriter.h" - -#include "cmsys/Process.h" #include <cstdio> #include <ctime> #include <sstream> #include <vector> +#include "cmsys/Process.h" + +#include "cmCTest.h" +#include "cmStringAlgorithms.h" +#include "cmSystemTools.h" +#include "cmXMLWriter.h" + cmCTestVC::cmCTestVC(cmCTest* ct, std::ostream& log) : CTest(ct) , Log(log) diff --git a/Source/CTest/cmParseBlanketJSCoverage.cxx b/Source/CTest/cmParseBlanketJSCoverage.cxx index 8c87700b49..409025f80c 100644 --- a/Source/CTest/cmParseBlanketJSCoverage.cxx +++ b/Source/CTest/cmParseBlanketJSCoverage.cxx @@ -2,14 +2,15 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmParseBlanketJSCoverage.h" +#include <cstdio> +#include <cstdlib> + +#include "cmsys/FStream.hxx" + #include "cmCTest.h" #include "cmCTestCoverageHandler.h" #include "cmSystemTools.h" -#include "cmsys/FStream.hxx" -#include <cstdio> -#include <cstdlib> - class cmParseBlanketJSCoverage::JSONParser { public: diff --git a/Source/CTest/cmParseCacheCoverage.cxx b/Source/CTest/cmParseCacheCoverage.cxx index da486107a9..8c4da75778 100644 --- a/Source/CTest/cmParseCacheCoverage.cxx +++ b/Source/CTest/cmParseCacheCoverage.cxx @@ -1,17 +1,18 @@ #include "cmParseCacheCoverage.h" -#include "cmCTest.h" -#include "cmCTestCoverageHandler.h" -#include "cmStringAlgorithms.h" -#include "cmSystemTools.h" - -#include "cmsys/Directory.hxx" -#include "cmsys/FStream.hxx" #include <cstdio> #include <cstdlib> #include <map> #include <utility> +#include "cmsys/Directory.hxx" +#include "cmsys/FStream.hxx" + +#include "cmCTest.h" +#include "cmCTestCoverageHandler.h" +#include "cmStringAlgorithms.h" +#include "cmSystemTools.h" + cmParseCacheCoverage::cmParseCacheCoverage( cmCTestCoverageHandlerContainer& cont, cmCTest* ctest) : cmParseMumpsCoverage(cont, ctest) diff --git a/Source/CTest/cmParseCacheCoverage.h b/Source/CTest/cmParseCacheCoverage.h index 081f5fa139..e89b9e454b 100644 --- a/Source/CTest/cmParseCacheCoverage.h +++ b/Source/CTest/cmParseCacheCoverage.h @@ -5,11 +5,11 @@ #include "cmConfigure.h" // IWYU pragma: keep -#include "cmParseMumpsCoverage.h" - #include <string> #include <vector> +#include "cmParseMumpsCoverage.h" + class cmCTest; class cmCTestCoverageHandlerContainer; diff --git a/Source/CTest/cmParseCoberturaCoverage.cxx b/Source/CTest/cmParseCoberturaCoverage.cxx index 7c00d0043b..05da84e2e2 100644 --- a/Source/CTest/cmParseCoberturaCoverage.cxx +++ b/Source/CTest/cmParseCoberturaCoverage.cxx @@ -1,15 +1,16 @@ #include "cmParseCoberturaCoverage.h" +#include <cstdlib> +#include <cstring> + +#include "cmsys/FStream.hxx" + #include "cmCTest.h" #include "cmCTestCoverageHandler.h" #include "cmStringAlgorithms.h" #include "cmSystemTools.h" #include "cmXMLParser.h" -#include "cmsys/FStream.hxx" -#include <cstdlib> -#include <cstring> - class cmParseCoberturaCoverage::XMLParser : public cmXMLParser { public: diff --git a/Source/CTest/cmParseDelphiCoverage.cxx b/Source/CTest/cmParseDelphiCoverage.cxx index 22c756ca42..016e90c02f 100644 --- a/Source/CTest/cmParseDelphiCoverage.cxx +++ b/Source/CTest/cmParseDelphiCoverage.cxx @@ -1,13 +1,14 @@ #include "cmParseDelphiCoverage.h" -#include "cmCTest.h" -#include "cmCTestCoverageHandler.h" -#include "cmSystemTools.h" +#include <cstdio> +#include <cstdlib> #include "cmsys/FStream.hxx" #include "cmsys/Glob.hxx" -#include <cstdio> -#include <cstdlib> + +#include "cmCTest.h" +#include "cmCTestCoverageHandler.h" +#include "cmSystemTools.h" class cmParseDelphiCoverage::HTMLParser { diff --git a/Source/CTest/cmParseGTMCoverage.cxx b/Source/CTest/cmParseGTMCoverage.cxx index 1f2181bed2..1dc5b70384 100644 --- a/Source/CTest/cmParseGTMCoverage.cxx +++ b/Source/CTest/cmParseGTMCoverage.cxx @@ -1,17 +1,18 @@ #include "cmParseGTMCoverage.h" -#include "cmCTest.h" -#include "cmCTestCoverageHandler.h" -#include "cmStringAlgorithms.h" -#include "cmSystemTools.h" - -#include "cmsys/Directory.hxx" -#include "cmsys/FStream.hxx" #include <cstdio> #include <cstdlib> #include <map> #include <vector> +#include "cmsys/Directory.hxx" +#include "cmsys/FStream.hxx" + +#include "cmCTest.h" +#include "cmCTestCoverageHandler.h" +#include "cmStringAlgorithms.h" +#include "cmSystemTools.h" + cmParseGTMCoverage::cmParseGTMCoverage(cmCTestCoverageHandlerContainer& cont, cmCTest* ctest) : cmParseMumpsCoverage(cont, ctest) diff --git a/Source/CTest/cmParseGTMCoverage.h b/Source/CTest/cmParseGTMCoverage.h index 13afbbc264..fe0ae0bfdb 100644 --- a/Source/CTest/cmParseGTMCoverage.h +++ b/Source/CTest/cmParseGTMCoverage.h @@ -5,10 +5,10 @@ #include "cmConfigure.h" // IWYU pragma: keep -#include "cmParseMumpsCoverage.h" - #include <string> +#include "cmParseMumpsCoverage.h" + class cmCTest; class cmCTestCoverageHandlerContainer; diff --git a/Source/CTest/cmParseJacocoCoverage.cxx b/Source/CTest/cmParseJacocoCoverage.cxx index be6348a749..9cf30dfcb9 100644 --- a/Source/CTest/cmParseJacocoCoverage.cxx +++ b/Source/CTest/cmParseJacocoCoverage.cxx @@ -1,17 +1,18 @@ #include "cmParseJacocoCoverage.h" +#include <cstdlib> +#include <cstring> + +#include "cmsys/Directory.hxx" +#include "cmsys/FStream.hxx" +#include "cmsys/Glob.hxx" + #include "cmCTest.h" #include "cmCTestCoverageHandler.h" #include "cmStringAlgorithms.h" #include "cmSystemTools.h" #include "cmXMLParser.h" -#include "cmsys/Directory.hxx" -#include "cmsys/FStream.hxx" -#include "cmsys/Glob.hxx" -#include <cstdlib> -#include <cstring> - class cmParseJacocoCoverage::XMLParser : public cmXMLParser { public: diff --git a/Source/CTest/cmParseMumpsCoverage.cxx b/Source/CTest/cmParseMumpsCoverage.cxx index 596b72ebdf..b16f1014ac 100644 --- a/Source/CTest/cmParseMumpsCoverage.cxx +++ b/Source/CTest/cmParseMumpsCoverage.cxx @@ -1,17 +1,18 @@ #include "cmParseMumpsCoverage.h" -#include "cmCTest.h" -#include "cmCTestCoverageHandler.h" -#include "cmStringAlgorithms.h" -#include "cmSystemTools.h" - -#include "cmsys/FStream.hxx" -#include "cmsys/Glob.hxx" #include <map> #include <string> #include <utility> #include <vector> +#include "cmsys/FStream.hxx" +#include "cmsys/Glob.hxx" + +#include "cmCTest.h" +#include "cmCTestCoverageHandler.h" +#include "cmStringAlgorithms.h" +#include "cmSystemTools.h" + cmParseMumpsCoverage::cmParseMumpsCoverage( cmCTestCoverageHandlerContainer& cont, cmCTest* ctest) : Coverage(cont) diff --git a/Source/CTest/cmParsePHPCoverage.cxx b/Source/CTest/cmParsePHPCoverage.cxx index 8f0404dcbe..a494b92b91 100644 --- a/Source/CTest/cmParsePHPCoverage.cxx +++ b/Source/CTest/cmParsePHPCoverage.cxx @@ -1,15 +1,16 @@ #include "cmParsePHPCoverage.h" +#include <cstdlib> +#include <cstring> + +#include "cmsys/Directory.hxx" +#include "cmsys/FStream.hxx" + #include "cmCTest.h" #include "cmCTestCoverageHandler.h" #include "cmStringAlgorithms.h" #include "cmSystemTools.h" -#include "cmsys/Directory.hxx" -#include "cmsys/FStream.hxx" -#include <cstdlib> -#include <cstring> - /* To setup coverage for php. diff --git a/Source/CTest/cmProcess.cxx b/Source/CTest/cmProcess.cxx index 9c63a59a9a..87f7147bc9 100644 --- a/Source/CTest/cmProcess.cxx +++ b/Source/CTest/cmProcess.cxx @@ -2,17 +2,18 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmProcess.h" +#include <csignal> +#include <iostream> +#include <string> + +#include "cmsys/Process.h" + #include "cmAlgorithms.h" #include "cmCTest.h" #include "cmCTestRunTest.h" #include "cmCTestTestHandler.h" #include "cmGetPipes.h" #include "cmStringAlgorithms.h" -#include "cmsys/Process.h" - -#include <csignal> -#include <iostream> -#include <string> #if defined(_WIN32) # include "cm_kwiml.h" #endif diff --git a/Source/CTest/cmProcess.h b/Source/CTest/cmProcess.h index a0a4b6b203..2c24f2df02 100644 --- a/Source/CTest/cmProcess.h +++ b/Source/CTest/cmProcess.h @@ -4,18 +4,20 @@ #define cmProcess_h #include "cmConfigure.h" // IWYU pragma: keep -#include "cmDuration.h" - -#include "cmProcessOutput.h" -#include "cmUVHandlePtr.h" -#include "cm_uv.h" #include <chrono> -#include <stddef.h> -#include <stdint.h> #include <string> #include <vector> +#include <stddef.h> +#include <stdint.h> + +#include "cm_uv.h" + +#include "cmDuration.h" +#include "cmProcessOutput.h" +#include "cmUVHandlePtr.h" + class cmCTestRunTest; /** \class cmProcess diff --git a/Source/CursesDialog/ccmake.cxx b/Source/CursesDialog/ccmake.cxx index 567b4f48fe..9e9dfbd195 100644 --- a/Source/CursesDialog/ccmake.cxx +++ b/Source/CursesDialog/ccmake.cxx @@ -1,6 +1,14 @@ /* Distributed under the OSI-approved BSD 3-Clause License. See accompanying file Copyright.txt or https://cmake.org/licensing for details. */ +#include <csignal> +#include <cstring> +#include <iostream> +#include <string> +#include <vector> + +#include "cmsys/Encoding.hxx" + #include "cmCursesForm.h" #include "cmCursesMainForm.h" #include "cmCursesStandardIncludes.h" @@ -10,13 +18,6 @@ #include "cmSystemTools.h" #include "cmake.h" -#include "cmsys/Encoding.hxx" -#include <csignal> -#include <cstring> -#include <iostream> -#include <string> -#include <vector> - static const char* cmDocumentationName[][2] = { { nullptr, " ccmake - Curses Interface for CMake." }, { nullptr, nullptr } diff --git a/Source/CursesDialog/cmCursesBoolWidget.cxx b/Source/CursesDialog/cmCursesBoolWidget.cxx index 80a5b5b9c2..97b0811288 100644 --- a/Source/CursesDialog/cmCursesBoolWidget.cxx +++ b/Source/CursesDialog/cmCursesBoolWidget.cxx @@ -2,11 +2,11 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmCursesBoolWidget.h" +#include <string> + #include "cmCursesWidget.h" #include "cmStateTypes.h" -#include <string> - cmCursesBoolWidget::cmCursesBoolWidget(int width, int height, int left, int top) : cmCursesWidget(width, height, left, top) diff --git a/Source/CursesDialog/cmCursesCacheEntryComposite.cxx b/Source/CursesDialog/cmCursesCacheEntryComposite.cxx index 561784cc5c..4d3131b076 100644 --- a/Source/CursesDialog/cmCursesCacheEntryComposite.cxx +++ b/Source/CursesDialog/cmCursesCacheEntryComposite.cxx @@ -2,6 +2,12 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmCursesCacheEntryComposite.h" +#include <cassert> +#include <utility> +#include <vector> + +#include <cm/memory> + #include "cmCursesBoolWidget.h" #include "cmCursesFilePathWidget.h" #include "cmCursesLabelWidget.h" @@ -14,12 +20,6 @@ #include "cmStringAlgorithms.h" #include "cmSystemTools.h" -#include <cm/memory> - -#include <cassert> -#include <utility> -#include <vector> - cmCursesCacheEntryComposite::cmCursesCacheEntryComposite( const std::string& key, int labelwidth, int entrywidth) : Key(key) diff --git a/Source/CursesDialog/cmCursesForm.h b/Source/CursesDialog/cmCursesForm.h index 78429059ed..e3626e66a1 100644 --- a/Source/CursesDialog/cmCursesForm.h +++ b/Source/CursesDialog/cmCursesForm.h @@ -5,11 +5,11 @@ #include "cmConfigure.h" // IWYU pragma: keep -#include "cmCursesStandardIncludes.h" +#include <string> #include "cmsys/FStream.hxx" -#include <string> +#include "cmCursesStandardIncludes.h" class cmCursesForm { diff --git a/Source/CursesDialog/cmCursesLabelWidget.h b/Source/CursesDialog/cmCursesLabelWidget.h index 2ee9cfca8a..9e7568187b 100644 --- a/Source/CursesDialog/cmCursesLabelWidget.h +++ b/Source/CursesDialog/cmCursesLabelWidget.h @@ -5,11 +5,11 @@ #include "cmConfigure.h" // IWYU pragma: keep +#include <string> + #include "cmCursesStandardIncludes.h" #include "cmCursesWidget.h" -#include <string> - class cmCursesMainForm; class cmCursesLabelWidget : public cmCursesWidget diff --git a/Source/CursesDialog/cmCursesLongMessageForm.cxx b/Source/CursesDialog/cmCursesLongMessageForm.cxx index 028cc26546..e2d8d06b49 100644 --- a/Source/CursesDialog/cmCursesLongMessageForm.cxx +++ b/Source/CursesDialog/cmCursesLongMessageForm.cxx @@ -2,14 +2,14 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmCursesLongMessageForm.h" +#include <cstdio> +#include <cstring> + #include "cmCursesForm.h" #include "cmCursesMainForm.h" #include "cmCursesStandardIncludes.h" #include "cmVersion.h" -#include <cstdio> -#include <cstring> - inline int ctrl(int z) { return (z & 037); diff --git a/Source/CursesDialog/cmCursesLongMessageForm.h b/Source/CursesDialog/cmCursesLongMessageForm.h index 466b4e1b09..42f9c710b7 100644 --- a/Source/CursesDialog/cmCursesLongMessageForm.h +++ b/Source/CursesDialog/cmCursesLongMessageForm.h @@ -5,12 +5,12 @@ #include "cmConfigure.h" // IWYU pragma: keep -#include "cmCursesForm.h" -#include "cmCursesStandardIncludes.h" - #include <string> #include <vector> +#include "cmCursesForm.h" +#include "cmCursesStandardIncludes.h" + class cmCursesLongMessageForm : public cmCursesForm { public: diff --git a/Source/CursesDialog/cmCursesMainForm.cxx b/Source/CursesDialog/cmCursesMainForm.cxx index 219771b096..ad3debb025 100644 --- a/Source/CursesDialog/cmCursesMainForm.cxx +++ b/Source/CursesDialog/cmCursesMainForm.cxx @@ -2,6 +2,13 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmCursesMainForm.h" +#include <algorithm> +#include <cstdio> +#include <cstring> +#include <utility> + +#include <cm/memory> + #include "cmCursesCacheEntryComposite.h" #include "cmCursesDummyWidget.h" #include "cmCursesForm.h" @@ -17,13 +24,6 @@ #include "cmVersion.h" #include "cmake.h" -#include <cm/memory> - -#include <algorithm> -#include <cstdio> -#include <cstring> -#include <utility> - inline int ctrl(int z) { return (z & 037); diff --git a/Source/CursesDialog/cmCursesMainForm.h b/Source/CursesDialog/cmCursesMainForm.h index 48d1791400..b8769b7cf4 100644 --- a/Source/CursesDialog/cmCursesMainForm.h +++ b/Source/CursesDialog/cmCursesMainForm.h @@ -5,16 +5,16 @@ #include "cmConfigure.h" // IWYU pragma: keep -#include "cmCursesCacheEntryComposite.h" -#include "cmCursesForm.h" -#include "cmCursesStandardIncludes.h" -#include "cmStateTypes.h" - #include <cstddef> #include <memory> #include <string> #include <vector> +#include "cmCursesCacheEntryComposite.h" +#include "cmCursesForm.h" +#include "cmCursesStandardIncludes.h" +#include "cmStateTypes.h" + class cmake; /** \class cmCursesMainForm diff --git a/Source/CursesDialog/cmCursesOptionsWidget.h b/Source/CursesDialog/cmCursesOptionsWidget.h index 0128d6a42d..0de8e64073 100644 --- a/Source/CursesDialog/cmCursesOptionsWidget.h +++ b/Source/CursesDialog/cmCursesOptionsWidget.h @@ -5,12 +5,12 @@ #include "cmConfigure.h" // IWYU pragma: keep -#include "cmCursesStandardIncludes.h" -#include "cmCursesWidget.h" - #include <string> #include <vector> +#include "cmCursesStandardIncludes.h" +#include "cmCursesWidget.h" + class cmCursesMainForm; class cmCursesOptionsWidget : public cmCursesWidget diff --git a/Source/CursesDialog/cmCursesPathWidget.cxx b/Source/CursesDialog/cmCursesPathWidget.cxx index 05c3279c3e..bb3808e89c 100644 --- a/Source/CursesDialog/cmCursesPathWidget.cxx +++ b/Source/CursesDialog/cmCursesPathWidget.cxx @@ -2,13 +2,13 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmCursesPathWidget.h" +#include <vector> + #include "cmCursesMainForm.h" #include "cmCursesStringWidget.h" #include "cmStateTypes.h" #include "cmSystemTools.h" -#include <vector> - cmCursesPathWidget::cmCursesPathWidget(int width, int height, int left, int top) : cmCursesStringWidget(width, height, left, top) diff --git a/Source/CursesDialog/cmCursesPathWidget.h b/Source/CursesDialog/cmCursesPathWidget.h index 1eace03a6c..fb365e9c5a 100644 --- a/Source/CursesDialog/cmCursesPathWidget.h +++ b/Source/CursesDialog/cmCursesPathWidget.h @@ -5,11 +5,11 @@ #include "cmConfigure.h" // IWYU pragma: keep +#include <string> + #include "cmCursesStandardIncludes.h" #include "cmCursesStringWidget.h" -#include <string> - class cmCursesMainForm; class cmCursesPathWidget : public cmCursesStringWidget diff --git a/Source/CursesDialog/cmCursesStringWidget.cxx b/Source/CursesDialog/cmCursesStringWidget.cxx index d3a05e8988..6296af20ba 100644 --- a/Source/CursesDialog/cmCursesStringWidget.cxx +++ b/Source/CursesDialog/cmCursesStringWidget.cxx @@ -2,14 +2,14 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmCursesStringWidget.h" +#include <cstdio> + #include "cmCursesForm.h" #include "cmCursesMainForm.h" #include "cmCursesStandardIncludes.h" #include "cmCursesWidget.h" #include "cmStateTypes.h" -#include <cstdio> - inline int ctrl(int z) { return (z & 037); diff --git a/Source/CursesDialog/cmCursesStringWidget.h b/Source/CursesDialog/cmCursesStringWidget.h index a41f0e8649..ce06c6da74 100644 --- a/Source/CursesDialog/cmCursesStringWidget.h +++ b/Source/CursesDialog/cmCursesStringWidget.h @@ -5,11 +5,11 @@ #include "cmConfigure.h" // IWYU pragma: keep +#include <string> + #include "cmCursesStandardIncludes.h" #include "cmCursesWidget.h" -#include <string> - class cmCursesMainForm; /** \class cmCursesStringWidget diff --git a/Source/CursesDialog/cmCursesWidget.h b/Source/CursesDialog/cmCursesWidget.h index f761f6d8a1..9d03c6e422 100644 --- a/Source/CursesDialog/cmCursesWidget.h +++ b/Source/CursesDialog/cmCursesWidget.h @@ -5,11 +5,11 @@ #include "cmConfigure.h" // IWYU pragma: keep +#include <string> + #include "cmCursesStandardIncludes.h" #include "cmStateTypes.h" -#include <string> - class cmCursesMainForm; class cmCursesWidget diff --git a/Source/QtDialog/AddCacheEntry.h b/Source/QtDialog/AddCacheEntry.h index 65e11c06db..e7a60ddb37 100644 --- a/Source/QtDialog/AddCacheEntry.h +++ b/Source/QtDialog/AddCacheEntry.h @@ -4,7 +4,6 @@ #define AddCacheEntry_h #include "QCMake.h" - #include <QCheckBox> #include <QStringList> #include <QWidget> diff --git a/Source/QtDialog/CMakeSetup.cxx b/Source/QtDialog/CMakeSetup.cxx index ad18cfe33c..ee81a7d621 100644 --- a/Source/QtDialog/CMakeSetup.cxx +++ b/Source/QtDialog/CMakeSetup.cxx @@ -1,17 +1,8 @@ /* Distributed under the OSI-approved BSD 3-Clause License. See accompanying file Copyright.txt or https://cmake.org/licensing for details. */ -#include "QCMake.h" // include to disable MS warnings +#include <iostream> -#include "CMakeSetupDialog.h" -#include "cmAlgorithms.h" -#include "cmDocumentation.h" -#include "cmDocumentationEntry.h" -#include "cmStringAlgorithms.h" -#include "cmVersion.h" -#include "cmake.h" -#include "cmsys/CommandLineArguments.hxx" -#include "cmsys/Encoding.hxx" -#include "cmsys/SystemTools.hxx" +#include "QCMake.h" // include to disable MS warnings #include <QApplication> #include <QDir> #include <QLocale> @@ -19,9 +10,19 @@ #include <QTextCodec> #include <QTranslator> #include <QtPlugin> -#include <iostream> +#include "cmsys/CommandLineArguments.hxx" +#include "cmsys/Encoding.hxx" +#include "cmsys/SystemTools.hxx" + +#include "CMakeSetupDialog.h" +#include "cmAlgorithms.h" +#include "cmDocumentation.h" +#include "cmDocumentationEntry.h" +#include "cmStringAlgorithms.h" #include "cmSystemTools.h" // IWYU pragma: keep +#include "cmVersion.h" +#include "cmake.h" static const char* cmDocumentationName[][2] = { { nullptr, " cmake-gui - CMake GUI." }, @@ -228,10 +229,12 @@ int main(int argc, char** argv) } #if defined(Q_OS_MAC) -# include "cm_sys_stat.h" # include <cerrno> # include <cstring> + # include <unistd.h> + +# include "cm_sys_stat.h" static bool cmOSXInstall(std::string const& dir, std::string const& tool) { if (tool.empty()) { diff --git a/Source/QtDialog/CMakeSetupDialog.cxx b/Source/QtDialog/CMakeSetupDialog.cxx index e98cdcf4a3..436a90466c 100644 --- a/Source/QtDialog/CMakeSetupDialog.cxx +++ b/Source/QtDialog/CMakeSetupDialog.cxx @@ -26,15 +26,17 @@ # include <QWinTaskbarProgress> #endif -#include "AddCacheEntry.h" -#include "FirstConfigure.h" #include "QCMake.h" #include "QCMakeCacheView.h" -#include "RegexExplorer.h" -#include "WarningMessagesDialog.h" + #include "cmSystemTools.h" #include "cmVersion.h" +#include "AddCacheEntry.h" +#include "FirstConfigure.h" +#include "RegexExplorer.h" +#include "WarningMessagesDialog.h" + QCMakeThread::QCMakeThread(QObject* p) : QThread(p) , CMakeInstance(nullptr) diff --git a/Source/QtDialog/CMakeSetupDialog.h b/Source/QtDialog/CMakeSetupDialog.h index 39c1053cb7..f23aee6e81 100644 --- a/Source/QtDialog/CMakeSetupDialog.h +++ b/Source/QtDialog/CMakeSetupDialog.h @@ -4,12 +4,12 @@ #define CMakeSetupDialog_h #include "QCMake.h" - -#include "ui_CMakeSetupDialog.h" #include <QEventLoop> #include <QMainWindow> #include <QThread> +#include "ui_CMakeSetupDialog.h" + class QCMakeThread; class CMakeCacheModel; class QProgressBar; diff --git a/Source/QtDialog/Compilers.h b/Source/QtDialog/Compilers.h index 96770e3f4c..931c93566f 100644 --- a/Source/QtDialog/Compilers.h +++ b/Source/QtDialog/Compilers.h @@ -5,10 +5,10 @@ #include "cmConfigure.h" // IWYU pragma: keep -#include <QWidget> - #include <ui_Compilers.h> +#include <QWidget> + class Compilers : public QWidget , public Ui::Compilers diff --git a/Source/QtDialog/FirstConfigure.cxx b/Source/QtDialog/FirstConfigure.cxx index 0f09d7cac1..ca28b1972a 100644 --- a/Source/QtDialog/FirstConfigure.cxx +++ b/Source/QtDialog/FirstConfigure.cxx @@ -1,14 +1,15 @@ #include "FirstConfigure.h" -#include "Compilers.h" -#include "cmStringAlgorithms.h" - #include <QComboBox> #include <QRadioButton> #include <QSettings> #include <QVBoxLayout> +#include "cmStringAlgorithms.h" + +#include "Compilers.h" + StartCompilerSetup::StartCompilerSetup(QWidget* p) : QWizardPage(p) { diff --git a/Source/QtDialog/QCMakeCacheView.cxx b/Source/QtDialog/QCMakeCacheView.cxx index 5e8636a7f3..3e6a49e099 100644 --- a/Source/QtDialog/QCMakeCacheView.cxx +++ b/Source/QtDialog/QCMakeCacheView.cxx @@ -2,6 +2,7 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "QCMakeCacheView.h" +#include "QCMakeWidgets.h" #include <QApplication> #include <QEvent> #include <QHBoxLayout> @@ -11,8 +12,6 @@ #include <QSortFilterProxyModel> #include <QStyle> -#include "QCMakeWidgets.h" - // filter for searches class QCMakeSearchFilter : public QSortFilterProxyModel { diff --git a/Source/QtDialog/QCMakeCacheView.h b/Source/QtDialog/QCMakeCacheView.h index c1debf590a..bea1965868 100644 --- a/Source/QtDialog/QCMakeCacheView.h +++ b/Source/QtDialog/QCMakeCacheView.h @@ -4,7 +4,6 @@ #define QCMakeCacheView_h #include "QCMake.h" - #include <QItemDelegate> #include <QSet> #include <QStandardItemModel> diff --git a/Source/QtDialog/QCMakeWidgets.cxx b/Source/QtDialog/QCMakeWidgets.cxx index eab418fe7c..332a770ef8 100644 --- a/Source/QtDialog/QCMakeWidgets.cxx +++ b/Source/QtDialog/QCMakeWidgets.cxx @@ -2,12 +2,13 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "QCMakeWidgets.h" +#include <utility> + #include <QDirModel> #include <QFileDialog> #include <QFileInfo> #include <QResizeEvent> #include <QToolButton> -#include <utility> QCMakeFileEditor::QCMakeFileEditor(QWidget* p, QString var) : QLineEdit(p) diff --git a/Source/QtDialog/RegexExplorer.h b/Source/QtDialog/RegexExplorer.h index c7dbb76cdb..1a1d7700fc 100644 --- a/Source/QtDialog/RegexExplorer.h +++ b/Source/QtDialog/RegexExplorer.h @@ -3,10 +3,12 @@ #ifndef RegexExplorer_h #define RegexExplorer_h -#include "cmsys/RegularExpression.hxx" -#include <QDialog> #include <string> +#include <QDialog> + +#include "cmsys/RegularExpression.hxx" + #include "ui_RegexExplorer.h" class QString; diff --git a/Source/QtDialog/WarningMessagesDialog.h b/Source/QtDialog/WarningMessagesDialog.h index 9b29ad63c9..f209dbdb3b 100644 --- a/Source/QtDialog/WarningMessagesDialog.h +++ b/Source/QtDialog/WarningMessagesDialog.h @@ -3,10 +3,10 @@ #ifndef WarningMessagesDialog_h #define WarningMessagesDialog_h +#include "QCMake.h" #include <QDialog> #include <QWidget> -#include "QCMake.h" #include "ui_WarningMessagesDialog.h" /** diff --git a/Source/bindexplib.cxx b/Source/bindexplib.cxx index 7e5db26d96..b85cc33590 100644 --- a/Source/bindexplib.cxx +++ b/Source/bindexplib.cxx @@ -64,14 +64,17 @@ */ #include "bindexplib.h" -#include "cmSystemTools.h" -#include "cmsys/Encoding.hxx" -#include "cmsys/FStream.hxx" #include <iostream> #include <sstream> #include <vector> + #include <windows.h> +#include "cmsys/Encoding.hxx" +#include "cmsys/FStream.hxx" + +#include "cmSystemTools.h" + #ifndef IMAGE_FILE_MACHINE_ARM # define IMAGE_FILE_MACHINE_ARM 0x01c0 // ARM Little-Endian #endif diff --git a/Source/bindexplib.h b/Source/bindexplib.h index 6c066c5be6..538177dff3 100644 --- a/Source/bindexplib.h +++ b/Source/bindexplib.h @@ -6,9 +6,10 @@ #include "cmConfigure.h" // IWYU pragma: keep #include <set> -#include <stdio.h> #include <string> +#include <stdio.h> + class bindexplib { public: diff --git a/Source/cmAffinity.cxx b/Source/cmAffinity.cxx index 33768a93e7..8f9fe2ad89 100644 --- a/Source/cmAffinity.cxx +++ b/Source/cmAffinity.cxx @@ -16,6 +16,7 @@ # include <cstring> // IWYU pragma: keep # if defined(__FreeBSD__) # include <pthread_np.h> + # include <sys/cpuset.h> # include <sys/param.h> # endif diff --git a/Source/cmAlgorithms.h b/Source/cmAlgorithms.h index 06ea9f625b..e0d27eedf9 100644 --- a/Source/cmAlgorithms.h +++ b/Source/cmAlgorithms.h @@ -5,8 +5,6 @@ #include "cmConfigure.h" // IWYU pragma: keep -#include "cmRange.h" -#include "cm_kwiml.h" #include <algorithm> #include <functional> #include <iterator> @@ -14,6 +12,10 @@ #include <utility> #include <vector> +#include "cm_kwiml.h" + +#include "cmRange.h" + template <std::size_t N> struct cmOverloadPriority : cmOverloadPriority<N - 1> { diff --git a/Source/cmArchiveWrite.cxx b/Source/cmArchiveWrite.cxx index c45edaf5c2..e5eea795dd 100644 --- a/Source/cmArchiveWrite.cxx +++ b/Source/cmArchiveWrite.cxx @@ -2,20 +2,22 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmArchiveWrite.h" -#include "cmLocale.h" -#include "cmStringAlgorithms.h" -#include "cmSystemTools.h" -#include "cm_get_date.h" -#include "cm_libarchive.h" -#include "cmsys/Directory.hxx" -#include "cmsys/Encoding.hxx" -#include "cmsys/FStream.hxx" - #include <cstring> #include <ctime> #include <iostream> #include <sstream> +#include "cmsys/Directory.hxx" +#include "cmsys/Encoding.hxx" +#include "cmsys/FStream.hxx" + +#include "cm_get_date.h" +#include "cm_libarchive.h" + +#include "cmLocale.h" +#include "cmStringAlgorithms.h" +#include "cmSystemTools.h" + #ifndef __LA_SSIZE_T # define __LA_SSIZE_T la_ssize_t #endif diff --git a/Source/cmArgumentParser.h b/Source/cmArgumentParser.h index 9be2488ece..94265372a8 100644 --- a/Source/cmArgumentParser.h +++ b/Source/cmArgumentParser.h @@ -5,15 +5,16 @@ #include "cmConfigure.h" // IWYU pragma: keep -#include "cm_static_string_view.hxx" -#include <cm/string_view> - #include <cassert> #include <functional> #include <string> #include <utility> #include <vector> +#include <cm/string_view> + +#include "cm_static_string_view.hxx" + namespace ArgumentParser { using StringList = std::vector<std::string>; diff --git a/Source/cmAuxSourceDirectoryCommand.cxx b/Source/cmAuxSourceDirectoryCommand.cxx index 111bc41b2a..289bb72176 100644 --- a/Source/cmAuxSourceDirectoryCommand.cxx +++ b/Source/cmAuxSourceDirectoryCommand.cxx @@ -2,11 +2,12 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmAuxSourceDirectoryCommand.h" -#include "cmsys/Directory.hxx" #include <algorithm> #include <cstddef> #include <utility> +#include "cmsys/Directory.hxx" + #include "cmExecutionStatus.h" #include "cmMakefile.h" #include "cmSourceFile.h" diff --git a/Source/cmBinUtilsLinker.cxx b/Source/cmBinUtilsLinker.cxx index 3dac85c30f..a9f4d91fcf 100644 --- a/Source/cmBinUtilsLinker.cxx +++ b/Source/cmBinUtilsLinker.cxx @@ -2,6 +2,7 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmBinUtilsLinker.h" + #include "cmRuntimeDependencyArchive.h" cmBinUtilsLinker::cmBinUtilsLinker(cmRuntimeDependencyArchive* archive) diff --git a/Source/cmBinUtilsLinker.h b/Source/cmBinUtilsLinker.h index 29853a5cb0..78d517b619 100644 --- a/Source/cmBinUtilsLinker.h +++ b/Source/cmBinUtilsLinker.h @@ -4,10 +4,10 @@ #ifndef cmBinUtilsLinker_h #define cmBinUtilsLinker_h -#include "cmStateTypes.h" - #include <string> +#include "cmStateTypes.h" + class cmRuntimeDependencyArchive; class cmBinUtilsLinker diff --git a/Source/cmBinUtilsLinuxELFGetRuntimeDependenciesTool.cxx b/Source/cmBinUtilsLinuxELFGetRuntimeDependenciesTool.cxx index 40de592d28..abd12092c2 100644 --- a/Source/cmBinUtilsLinuxELFGetRuntimeDependenciesTool.cxx +++ b/Source/cmBinUtilsLinuxELFGetRuntimeDependenciesTool.cxx @@ -2,6 +2,7 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmBinUtilsLinuxELFGetRuntimeDependenciesTool.h" + #include "cmRuntimeDependencyArchive.h" cmBinUtilsLinuxELFGetRuntimeDependenciesTool:: diff --git a/Source/cmBinUtilsLinuxELFLinker.cxx b/Source/cmBinUtilsLinuxELFLinker.cxx index a1125a92c9..0dea8256c0 100644 --- a/Source/cmBinUtilsLinuxELFLinker.cxx +++ b/Source/cmBinUtilsLinuxELFLinker.cxx @@ -3,6 +3,12 @@ #include "cmBinUtilsLinuxELFLinker.h" +#include <sstream> + +#include <cm/memory> + +#include <cmsys/RegularExpression.hxx> + #include "cmBinUtilsLinuxELFObjdumpGetRuntimeDependenciesTool.h" #include "cmLDConfigLDConfigTool.h" #include "cmMakefile.h" @@ -11,12 +17,6 @@ #include "cmStringAlgorithms.h" #include "cmSystemTools.h" -#include <cmsys/RegularExpression.hxx> - -#include <sstream> - -#include <cm/memory> - static std::string ReplaceOrigin(const std::string& rpath, const std::string& origin) { diff --git a/Source/cmBinUtilsLinuxELFLinker.h b/Source/cmBinUtilsLinuxELFLinker.h index e20963784a..b17df11ee6 100644 --- a/Source/cmBinUtilsLinuxELFLinker.h +++ b/Source/cmBinUtilsLinuxELFLinker.h @@ -4,15 +4,15 @@ #ifndef cmBinUtilsLinuxELFLinker_h #define cmBinUtilsLinuxELFLinker_h +#include <memory> +#include <string> +#include <vector> + #include "cmBinUtilsLinker.h" #include "cmBinUtilsLinuxELFGetRuntimeDependenciesTool.h" #include "cmLDConfigTool.h" #include "cmStateTypes.h" -#include <memory> -#include <string> -#include <vector> - class cmRuntimeDependencyArchive; class cmBinUtilsLinuxELFLinker : public cmBinUtilsLinker diff --git a/Source/cmBinUtilsLinuxELFObjdumpGetRuntimeDependenciesTool.cxx b/Source/cmBinUtilsLinuxELFObjdumpGetRuntimeDependenciesTool.cxx index 3bf7bf8863..566e4a488c 100644 --- a/Source/cmBinUtilsLinuxELFObjdumpGetRuntimeDependenciesTool.cxx +++ b/Source/cmBinUtilsLinuxELFObjdumpGetRuntimeDependenciesTool.cxx @@ -2,13 +2,14 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmBinUtilsLinuxELFObjdumpGetRuntimeDependenciesTool.h" -#include "cmRuntimeDependencyArchive.h" -#include "cmSystemTools.h" -#include "cmUVProcessChain.h" + +#include <sstream> #include <cmsys/RegularExpression.hxx> -#include <sstream> +#include "cmRuntimeDependencyArchive.h" +#include "cmSystemTools.h" +#include "cmUVProcessChain.h" cmBinUtilsLinuxELFObjdumpGetRuntimeDependenciesTool:: cmBinUtilsLinuxELFObjdumpGetRuntimeDependenciesTool( diff --git a/Source/cmBinUtilsLinuxELFObjdumpGetRuntimeDependenciesTool.h b/Source/cmBinUtilsLinuxELFObjdumpGetRuntimeDependenciesTool.h index 286337f1e4..969e4d4dc9 100644 --- a/Source/cmBinUtilsLinuxELFObjdumpGetRuntimeDependenciesTool.h +++ b/Source/cmBinUtilsLinuxELFObjdumpGetRuntimeDependenciesTool.h @@ -4,11 +4,11 @@ #ifndef cmBinUtilsLinuxELFGetRuntimeCollectDependenciesTool_h #define cmBinUtilsLinuxELFGetRuntimeCollectDependenciesTool_h -#include "cmBinUtilsLinuxELFGetRuntimeDependenciesTool.h" - #include <string> #include <vector> +#include "cmBinUtilsLinuxELFGetRuntimeDependenciesTool.h" + class cmRuntimeDependencyArchive; class cmBinUtilsLinuxELFObjdumpGetRuntimeDependenciesTool diff --git a/Source/cmBinUtilsMacOSMachOLinker.cxx b/Source/cmBinUtilsMacOSMachOLinker.cxx index b1f718b674..98250b1c05 100644 --- a/Source/cmBinUtilsMacOSMachOLinker.cxx +++ b/Source/cmBinUtilsMacOSMachOLinker.cxx @@ -3,17 +3,17 @@ #include "cmBinUtilsMacOSMachOLinker.h" -#include "cmBinUtilsMacOSMachOOToolGetRuntimeDependenciesTool.h" -#include "cmRuntimeDependencyArchive.h" -#include "cmStringAlgorithms.h" -#include "cmSystemTools.h" - #include <sstream> #include <string> #include <vector> #include <cm/memory> +#include "cmBinUtilsMacOSMachOOToolGetRuntimeDependenciesTool.h" +#include "cmRuntimeDependencyArchive.h" +#include "cmStringAlgorithms.h" +#include "cmSystemTools.h" + cmBinUtilsMacOSMachOLinker::cmBinUtilsMacOSMachOLinker( cmRuntimeDependencyArchive* archive) : cmBinUtilsLinker(archive) diff --git a/Source/cmBinUtilsMacOSMachOLinker.h b/Source/cmBinUtilsMacOSMachOLinker.h index f4f309d0ae..4a24ea35e9 100644 --- a/Source/cmBinUtilsMacOSMachOLinker.h +++ b/Source/cmBinUtilsMacOSMachOLinker.h @@ -4,14 +4,14 @@ #ifndef cmBinUtilsMacOSMachOLinker_h #define cmBinUtilsMacOSMachOLinker_h -#include "cmBinUtilsLinker.h" -#include "cmBinUtilsMacOSMachOGetRuntimeDependenciesTool.h" -#include "cmStateTypes.h" - #include <memory> #include <string> #include <vector> +#include "cmBinUtilsLinker.h" +#include "cmBinUtilsMacOSMachOGetRuntimeDependenciesTool.h" +#include "cmStateTypes.h" + class cmRuntimeDependencyArchive; class cmBinUtilsMacOSMachOLinker : public cmBinUtilsLinker diff --git a/Source/cmBinUtilsMacOSMachOOToolGetRuntimeDependenciesTool.cxx b/Source/cmBinUtilsMacOSMachOOToolGetRuntimeDependenciesTool.cxx index bab2382cc3..351d92aa82 100644 --- a/Source/cmBinUtilsMacOSMachOOToolGetRuntimeDependenciesTool.cxx +++ b/Source/cmBinUtilsMacOSMachOOToolGetRuntimeDependenciesTool.cxx @@ -3,12 +3,12 @@ #include "cmBinUtilsMacOSMachOOToolGetRuntimeDependenciesTool.h" -#include "cmRuntimeDependencyArchive.h" -#include "cmUVProcessChain.h" +#include <sstream> #include <cmsys/RegularExpression.hxx> -#include <sstream> +#include "cmRuntimeDependencyArchive.h" +#include "cmUVProcessChain.h" cmBinUtilsMacOSMachOOToolGetRuntimeDependenciesTool:: cmBinUtilsMacOSMachOOToolGetRuntimeDependenciesTool( diff --git a/Source/cmBinUtilsMacOSMachOOToolGetRuntimeDependenciesTool.h b/Source/cmBinUtilsMacOSMachOOToolGetRuntimeDependenciesTool.h index 12bcbc17e0..8ac7e188eb 100644 --- a/Source/cmBinUtilsMacOSMachOOToolGetRuntimeDependenciesTool.h +++ b/Source/cmBinUtilsMacOSMachOOToolGetRuntimeDependenciesTool.h @@ -4,11 +4,11 @@ #ifndef cmBinUtilsMacOSMachOOToolGetRuntimeDependenciesTool_h #define cmBinUtilsMacOSMachOOToolGetRuntimeDependenciesTool_h -#include "cmBinUtilsMacOSMachOGetRuntimeDependenciesTool.h" - #include <string> #include <vector> +#include "cmBinUtilsMacOSMachOGetRuntimeDependenciesTool.h" + class cmRuntimeDependencyArchive; class cmBinUtilsMacOSMachOOToolGetRuntimeDependenciesTool diff --git a/Source/cmBinUtilsWindowsPEDumpbinGetRuntimeDependenciesTool.cxx b/Source/cmBinUtilsWindowsPEDumpbinGetRuntimeDependenciesTool.cxx index 2b35e307b6..f342884dcd 100644 --- a/Source/cmBinUtilsWindowsPEDumpbinGetRuntimeDependenciesTool.cxx +++ b/Source/cmBinUtilsWindowsPEDumpbinGetRuntimeDependenciesTool.cxx @@ -2,12 +2,13 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmBinUtilsWindowsPEDumpbinGetRuntimeDependenciesTool.h" -#include "cmRuntimeDependencyArchive.h" -#include "cmUVProcessChain.h" + +#include <sstream> #include <cmsys/RegularExpression.hxx> -#include <sstream> +#include "cmRuntimeDependencyArchive.h" +#include "cmUVProcessChain.h" cmBinUtilsWindowsPEDumpbinGetRuntimeDependenciesTool:: cmBinUtilsWindowsPEDumpbinGetRuntimeDependenciesTool( diff --git a/Source/cmBinUtilsWindowsPEDumpbinGetRuntimeDependenciesTool.h b/Source/cmBinUtilsWindowsPEDumpbinGetRuntimeDependenciesTool.h index 4c17f8d818..eae22eae8e 100644 --- a/Source/cmBinUtilsWindowsPEDumpbinGetRuntimeDependenciesTool.h +++ b/Source/cmBinUtilsWindowsPEDumpbinGetRuntimeDependenciesTool.h @@ -4,11 +4,11 @@ #ifndef cmBinUtilsWindowsPEDumpbinGetRuntimeDependenciesTool_h #define cmBinUtilsWindowsPEDumpbinGetRuntimeDependenciesTool_h -#include "cmBinUtilsWindowsPEGetRuntimeDependenciesTool.h" - #include <string> #include <vector> +#include "cmBinUtilsWindowsPEGetRuntimeDependenciesTool.h" + class cmRuntimeDependencyArchive; class cmBinUtilsWindowsPEDumpbinGetRuntimeDependenciesTool diff --git a/Source/cmBinUtilsWindowsPEGetRuntimeDependenciesTool.cxx b/Source/cmBinUtilsWindowsPEGetRuntimeDependenciesTool.cxx index f5a4431519..468a40c7a5 100644 --- a/Source/cmBinUtilsWindowsPEGetRuntimeDependenciesTool.cxx +++ b/Source/cmBinUtilsWindowsPEGetRuntimeDependenciesTool.cxx @@ -2,6 +2,7 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmBinUtilsWindowsPEGetRuntimeDependenciesTool.h" + #include "cmRuntimeDependencyArchive.h" cmBinUtilsWindowsPEGetRuntimeDependenciesTool:: diff --git a/Source/cmBinUtilsWindowsPELinker.cxx b/Source/cmBinUtilsWindowsPELinker.cxx index bfafaeb674..79e39e9c52 100644 --- a/Source/cmBinUtilsWindowsPELinker.cxx +++ b/Source/cmBinUtilsWindowsPELinker.cxx @@ -3,17 +3,17 @@ #include "cmBinUtilsWindowsPELinker.h" +#include <sstream> +#include <vector> + +#include <cm/memory> + #include "cmBinUtilsWindowsPEDumpbinGetRuntimeDependenciesTool.h" #include "cmBinUtilsWindowsPEObjdumpGetRuntimeDependenciesTool.h" #include "cmRuntimeDependencyArchive.h" #include "cmStringAlgorithms.h" #include "cmSystemTools.h" -#include <sstream> -#include <vector> - -#include <cm/memory> - #ifdef _WIN32 # include <windows.h> #endif diff --git a/Source/cmBinUtilsWindowsPELinker.h b/Source/cmBinUtilsWindowsPELinker.h index 8d2bf4b73f..a8bb596295 100644 --- a/Source/cmBinUtilsWindowsPELinker.h +++ b/Source/cmBinUtilsWindowsPELinker.h @@ -4,13 +4,13 @@ #ifndef cmBinUtilsWindowsPELinker_h #define cmBinUtilsWindowsPELinker_h +#include <memory> +#include <string> + #include "cmBinUtilsLinker.h" #include "cmBinUtilsWindowsPEGetRuntimeDependenciesTool.h" #include "cmStateTypes.h" -#include <memory> -#include <string> - class cmRuntimeDependencyArchive; class cmBinUtilsWindowsPELinker : public cmBinUtilsLinker diff --git a/Source/cmBinUtilsWindowsPEObjdumpGetRuntimeDependenciesTool.cxx b/Source/cmBinUtilsWindowsPEObjdumpGetRuntimeDependenciesTool.cxx index 1f27003d30..1effda053c 100644 --- a/Source/cmBinUtilsWindowsPEObjdumpGetRuntimeDependenciesTool.cxx +++ b/Source/cmBinUtilsWindowsPEObjdumpGetRuntimeDependenciesTool.cxx @@ -2,12 +2,13 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmBinUtilsWindowsPEObjdumpGetRuntimeDependenciesTool.h" -#include "cmRuntimeDependencyArchive.h" -#include "cmUVProcessChain.h" + +#include <sstream> #include <cmsys/RegularExpression.hxx> -#include <sstream> +#include "cmRuntimeDependencyArchive.h" +#include "cmUVProcessChain.h" cmBinUtilsWindowsPEObjdumpGetRuntimeDependenciesTool:: cmBinUtilsWindowsPEObjdumpGetRuntimeDependenciesTool( diff --git a/Source/cmBinUtilsWindowsPEObjdumpGetRuntimeDependenciesTool.h b/Source/cmBinUtilsWindowsPEObjdumpGetRuntimeDependenciesTool.h index 1d1a5b0a94..a67cb0cf1f 100644 --- a/Source/cmBinUtilsWindowsPEObjdumpGetRuntimeDependenciesTool.h +++ b/Source/cmBinUtilsWindowsPEObjdumpGetRuntimeDependenciesTool.h @@ -4,11 +4,11 @@ #ifndef cmBinUtilsWindowsPEObjdumpGetRuntimeDependenciesTool_h #define cmBinUtilsWindowsPEObjdumpGetRuntimeDependenciesTool_h -#include "cmBinUtilsWindowsPEGetRuntimeDependenciesTool.h" - #include <string> #include <vector> +#include "cmBinUtilsWindowsPEGetRuntimeDependenciesTool.h" + class cmRuntimeDependencyArchive; class cmBinUtilsWindowsPEObjdumpGetRuntimeDependenciesTool diff --git a/Source/cmBuildNameCommand.cxx b/Source/cmBuildNameCommand.cxx index df94f1d752..3e517dca4a 100644 --- a/Source/cmBuildNameCommand.cxx +++ b/Source/cmBuildNameCommand.cxx @@ -2,9 +2,10 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmBuildNameCommand.h" -#include "cmsys/RegularExpression.hxx" #include <algorithm> +#include "cmsys/RegularExpression.hxx" + #include "cmExecutionStatus.h" #include "cmMakefile.h" #include "cmStateTypes.h" diff --git a/Source/cmCLocaleEnvironmentScope.cxx b/Source/cmCLocaleEnvironmentScope.cxx index 737e3ea865..c6c38f83cf 100644 --- a/Source/cmCLocaleEnvironmentScope.cxx +++ b/Source/cmCLocaleEnvironmentScope.cxx @@ -2,11 +2,11 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmCLocaleEnvironmentScope.h" -#include "cmSystemTools.h" - #include <sstream> #include <utility> +#include "cmSystemTools.h" + cmCLocaleEnvironmentScope::cmCLocaleEnvironmentScope() { this->SetEnv("LANGUAGE", ""); diff --git a/Source/cmCMakeHostSystemInformationCommand.cxx b/Source/cmCMakeHostSystemInformationCommand.cxx index c3f6f406df..26e9af0279 100644 --- a/Source/cmCMakeHostSystemInformationCommand.cxx +++ b/Source/cmCMakeHostSystemInformationCommand.cxx @@ -4,9 +4,10 @@ #include <cstddef> +#include "cmsys/SystemInformation.hxx" + #include "cmExecutionStatus.h" #include "cmMakefile.h" -#include "cmsys/SystemInformation.hxx" #if defined(_WIN32) # include "cmAlgorithms.h" diff --git a/Source/cmCPackPropertiesGenerator.cxx b/Source/cmCPackPropertiesGenerator.cxx index a33b824f34..cc9ad01034 100644 --- a/Source/cmCPackPropertiesGenerator.cxx +++ b/Source/cmCPackPropertiesGenerator.cxx @@ -1,12 +1,12 @@ #include "cmCPackPropertiesGenerator.h" +#include <map> +#include <ostream> + #include "cmGeneratorExpression.h" #include "cmInstalledFile.h" #include "cmOutputConverter.h" -#include <map> -#include <ostream> - cmCPackPropertiesGenerator::cmCPackPropertiesGenerator( cmLocalGenerator* lg, cmInstalledFile const& installedFile, std::vector<std::string> const& configurations) diff --git a/Source/cmCPackPropertiesGenerator.h b/Source/cmCPackPropertiesGenerator.h index ad943c588a..83392383a4 100644 --- a/Source/cmCPackPropertiesGenerator.h +++ b/Source/cmCPackPropertiesGenerator.h @@ -5,12 +5,12 @@ #include "cmConfigure.h" // IWYU pragma: keep -#include "cmScriptGenerator.h" - #include <iosfwd> #include <string> #include <vector> +#include "cmScriptGenerator.h" + class cmInstalledFile; class cmLocalGenerator; diff --git a/Source/cmCPluginAPI.cxx b/Source/cmCPluginAPI.cxx index 78a232e586..177bca889a 100644 --- a/Source/cmCPluginAPI.cxx +++ b/Source/cmCPluginAPI.cxx @@ -7,6 +7,8 @@ #include "cmCPluginAPI.h" +#include <cstdlib> + #include "cmExecutionStatus.h" #include "cmGlobalGenerator.h" #include "cmMakefile.h" @@ -14,8 +16,6 @@ #include "cmState.h" #include "cmVersion.h" -#include <cstdlib> - #ifdef __QNX__ # include <malloc.h> /* for malloc/free on QNX */ #endif diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx index 1031f407d2..0d1ecca962 100644 --- a/Source/cmCTest.cxx +++ b/Source/cmCTest.cxx @@ -2,14 +2,6 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmCTest.h" -#include "cm_curl.h" -#include "cm_zlib.h" -#include "cmsys/Base64.h" -#include "cmsys/Directory.hxx" -#include "cmsys/FStream.hxx" -#include "cmsys/Glob.hxx" -#include "cmsys/Process.h" -#include "cmsys/SystemInformation.hxx" #include <algorithm> #include <cctype> #include <chrono> @@ -23,6 +15,16 @@ #include <string> #include <utility> #include <vector> + +#include "cmsys/Base64.h" +#include "cmsys/Directory.hxx" +#include "cmsys/FStream.hxx" +#include "cmsys/Glob.hxx" +#include "cmsys/Process.h" +#include "cmsys/SystemInformation.hxx" + +#include "cm_curl.h" +#include "cm_zlib.h" #if defined(_WIN32) # include <windows.h> // IWYU pragma: keep #else diff --git a/Source/cmCTest.h b/Source/cmCTest.h index 9b11653578..82a6f4cbd3 100644 --- a/Source/cmCTest.h +++ b/Source/cmCTest.h @@ -5,9 +5,6 @@ #include "cmConfigure.h" // IWYU pragma: keep -#include "cmDuration.h" -#include "cmProcessOutput.h" - #include <chrono> #include <ctime> #include <map> @@ -16,6 +13,9 @@ #include <string> #include <vector> +#include "cmDuration.h" +#include "cmProcessOutput.h" + class cmCTestBuildHandler; class cmCTestBuildAndTestHandler; class cmCTestCoverageHandler; diff --git a/Source/cmCacheManager.cxx b/Source/cmCacheManager.cxx index 0888a5e9a1..d627465c76 100644 --- a/Source/cmCacheManager.cxx +++ b/Source/cmCacheManager.cxx @@ -2,14 +2,15 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmCacheManager.h" -#include "cmsys/FStream.hxx" -#include "cmsys/Glob.hxx" #include <algorithm> #include <cstdio> #include <cstring> #include <sstream> #include <string> +#include "cmsys/FStream.hxx" +#include "cmsys/Glob.hxx" + #include "cmGeneratedFileStream.h" #include "cmMessageType.h" #include "cmMessenger.h" diff --git a/Source/cmCheckCustomOutputs.h b/Source/cmCheckCustomOutputs.h index 7c4b3fecc2..9f33d16659 100644 --- a/Source/cmCheckCustomOutputs.h +++ b/Source/cmCheckCustomOutputs.h @@ -5,11 +5,11 @@ #include "cmConfigure.h" // IWYU pragma: keep -#include <cm/string_view> - #include <string> #include <vector> +#include <cm/string_view> + class cmExecutionStatus; bool cmCheckCustomOutputs(const std::vector<std::string>& outputs, diff --git a/Source/cmCommandArgumentParserHelper.cxx b/Source/cmCommandArgumentParserHelper.cxx index e35fba5914..613ae06d11 100644 --- a/Source/cmCommandArgumentParserHelper.cxx +++ b/Source/cmCommandArgumentParserHelper.cxx @@ -2,16 +2,16 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmCommandArgumentParserHelper.h" +#include <cstring> +#include <iostream> +#include <sstream> + #include "cmCommandArgumentLexer.h" #include "cmMakefile.h" #include "cmState.h" #include "cmStringAlgorithms.h" #include "cmSystemTools.h" -#include <cstring> -#include <iostream> -#include <sstream> - int cmCommandArgument_yyparse(yyscan_t yyscanner); // cmCommandArgumentParserHelper::cmCommandArgumentParserHelper() diff --git a/Source/cmCommands.cxx b/Source/cmCommands.cxx index b1f7db7435..ff73b279dd 100644 --- a/Source/cmCommands.cxx +++ b/Source/cmCommands.cxx @@ -1,11 +1,9 @@ /* Distributed under the OSI-approved BSD 3-Clause License. See accompanying file Copyright.txt or https://cmake.org/licensing for details. */ -#include <cm/memory> - #include "cmCommands.h" -#include "cmPolicies.h" -#include "cmState.h" + +#include <cm/memory> #include "cmAddCompileDefinitionsCommand.h" #include "cmAddCustomCommandCommand.h" @@ -61,6 +59,7 @@ #include "cmMessageCommand.h" #include "cmOptionCommand.h" #include "cmParseArgumentsCommand.h" +#include "cmPolicies.h" #include "cmProjectCommand.h" #include "cmReturnCommand.h" #include "cmSeparateArgumentsCommand.h" @@ -71,6 +70,7 @@ #include "cmSetTargetPropertiesCommand.h" #include "cmSetTestsPropertiesCommand.h" #include "cmSiteNameCommand.h" +#include "cmState.h" #include "cmStringCommand.h" #include "cmSubdirCommand.h" #include "cmTargetCompileDefinitionsCommand.h" diff --git a/Source/cmComputeComponentGraph.cxx b/Source/cmComputeComponentGraph.cxx index 655e4ac197..af257ee03f 100644 --- a/Source/cmComputeComponentGraph.cxx +++ b/Source/cmComputeComponentGraph.cxx @@ -3,7 +3,6 @@ #include "cmComputeComponentGraph.h" #include <algorithm> - #include <cassert> cmComputeComponentGraph::cmComputeComponentGraph(Graph const& input) diff --git a/Source/cmComputeComponentGraph.h b/Source/cmComputeComponentGraph.h index 5493769eab..202888cf9c 100644 --- a/Source/cmComputeComponentGraph.h +++ b/Source/cmComputeComponentGraph.h @@ -5,11 +5,11 @@ #include "cmConfigure.h" // IWYU pragma: keep -#include "cmGraphAdjacencyList.h" - #include <stack> #include <vector> +#include "cmGraphAdjacencyList.h" + /** \class cmComputeComponentGraph * \brief Analyze a graph to determine strongly connected components. * diff --git a/Source/cmComputeLinkDepends.cxx b/Source/cmComputeLinkDepends.cxx index ab4371a639..7a9e2b7f61 100644 --- a/Source/cmComputeLinkDepends.cxx +++ b/Source/cmComputeLinkDepends.cxx @@ -2,6 +2,16 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmComputeLinkDepends.h" +#include <algorithm> +#include <cassert> +#include <cstdio> +#include <cstring> +#include <iterator> +#include <sstream> +#include <utility> + +#include <cm/memory> + #include "cmComputeComponentGraph.h" #include "cmGeneratorTarget.h" #include "cmGlobalGenerator.h" @@ -14,16 +24,6 @@ #include "cmTarget.h" #include "cmake.h" -#include <algorithm> -#include <cassert> -#include <cstdio> -#include <cstring> -#include <iterator> -#include <sstream> -#include <utility> - -#include <cm/memory> - /* This file computes an ordered list of link items to use when linking a diff --git a/Source/cmComputeLinkDepends.h b/Source/cmComputeLinkDepends.h index 203cc683c4..645189ad52 100644 --- a/Source/cmComputeLinkDepends.h +++ b/Source/cmComputeLinkDepends.h @@ -5,17 +5,18 @@ #include "cmConfigure.h" // IWYU pragma: keep -#include "cmGraphAdjacencyList.h" -#include "cmLinkItem.h" -#include "cmTargetLinkLibraryType.h" - #include <map> #include <memory> -#include <queue> #include <set> #include <string> #include <vector> +#include <queue> + +#include "cmGraphAdjacencyList.h" +#include "cmLinkItem.h" +#include "cmTargetLinkLibraryType.h" + class cmComputeComponentGraph; class cmGeneratorTarget; class cmGlobalGenerator; diff --git a/Source/cmComputeLinkInformation.cxx b/Source/cmComputeLinkInformation.cxx index 832f38e38e..8773d10368 100644 --- a/Source/cmComputeLinkInformation.cxx +++ b/Source/cmComputeLinkInformation.cxx @@ -2,6 +2,12 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmComputeLinkInformation.h" +#include <algorithm> +#include <cctype> +#include <cstring> +#include <sstream> +#include <utility> + #include "cmAlgorithms.h" #include "cmComputeLinkDepends.h" #include "cmGeneratorTarget.h" @@ -20,12 +26,6 @@ #include "cmTarget.h" #include "cmake.h" -#include <algorithm> -#include <cctype> -#include <cstring> -#include <sstream> -#include <utility> - //#define CM_COMPUTE_LINK_INFO_DEBUG /* diff --git a/Source/cmComputeLinkInformation.h b/Source/cmComputeLinkInformation.h index d3345d942f..92ab83b3b2 100644 --- a/Source/cmComputeLinkInformation.h +++ b/Source/cmComputeLinkInformation.h @@ -5,13 +5,14 @@ #include "cmConfigure.h" // IWYU pragma: keep -#include "cmsys/RegularExpression.hxx" #include <iosfwd> #include <set> #include <string> #include <utility> #include <vector> +#include "cmsys/RegularExpression.hxx" + class cmGeneratorTarget; class cmGlobalGenerator; class cmMakefile; diff --git a/Source/cmComputeTargetDepends.cxx b/Source/cmComputeTargetDepends.cxx index 239fcdf74d..162bab2987 100644 --- a/Source/cmComputeTargetDepends.cxx +++ b/Source/cmComputeTargetDepends.cxx @@ -2,6 +2,11 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmComputeTargetDepends.h" +#include <cassert> +#include <cstdio> +#include <sstream> +#include <utility> + #include "cmComputeComponentGraph.h" #include "cmGeneratorTarget.h" #include "cmGlobalGenerator.h" @@ -20,11 +25,6 @@ #include "cmTargetDepend.h" #include "cmake.h" -#include <cassert> -#include <cstdio> -#include <sstream> -#include <utility> - /* This class is meant to analyze inter-target dependencies globally diff --git a/Source/cmComputeTargetDepends.h b/Source/cmComputeTargetDepends.h index 6087574d22..d8060aede6 100644 --- a/Source/cmComputeTargetDepends.h +++ b/Source/cmComputeTargetDepends.h @@ -5,14 +5,14 @@ #include "cmConfigure.h" // IWYU pragma: keep -#include "cmGraphAdjacencyList.h" -#include "cmListFileCache.h" - #include <map> #include <set> #include <string> #include <vector> +#include "cmGraphAdjacencyList.h" +#include "cmListFileCache.h" + class cmComputeComponentGraph; class cmGeneratorTarget; class cmGlobalGenerator; diff --git a/Source/cmConditionEvaluator.cxx b/Source/cmConditionEvaluator.cxx index 3ddd8cac0d..003e60d572 100644 --- a/Source/cmConditionEvaluator.cxx +++ b/Source/cmConditionEvaluator.cxx @@ -2,7 +2,6 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmConditionEvaluator.h" -#include "cmsys/RegularExpression.hxx" #include <cstdio> #include <cstdlib> #include <cstring> @@ -10,6 +9,8 @@ #include <sstream> #include <utility> +#include "cmsys/RegularExpression.hxx" + #include "cmAlgorithms.h" #include "cmMakefile.h" #include "cmMessageType.h" diff --git a/Source/cmConnection.cxx b/Source/cmConnection.cxx index 166426bfc6..884e314321 100644 --- a/Source/cmConnection.cxx +++ b/Source/cmConnection.cxx @@ -2,12 +2,13 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmConnection.h" -#include "cmServer.h" -#include "cm_uv.h" - #include <cassert> #include <cstring> +#include "cm_uv.h" + +#include "cmServer.h" + struct write_req_t { uv_write_t req; diff --git a/Source/cmConnection.h b/Source/cmConnection.h index 092b91302c..7bb2494048 100644 --- a/Source/cmConnection.h +++ b/Source/cmConnection.h @@ -5,13 +5,14 @@ #include "cmConfigure.h" // IWYU pragma: keep -#include "cmUVHandlePtr.h" -#include "cm_uv.h" - #include <cstddef> #include <memory> #include <string> +#include "cm_uv.h" + +#include "cmUVHandlePtr.h" + class cmServerBase; /*** diff --git a/Source/cmCoreTryCompile.cxx b/Source/cmCoreTryCompile.cxx index 12050b383e..515f446955 100644 --- a/Source/cmCoreTryCompile.cxx +++ b/Source/cmCoreTryCompile.cxx @@ -2,13 +2,16 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmCoreTryCompile.h" -#include "cmsys/Directory.hxx" #include <cstdio> #include <cstring> #include <set> #include <sstream> #include <utility> +#include "cmsys/Directory.hxx" + +#include "cm_static_string_view.hxx" + #include "cmExportTryCompileFileGenerator.h" #include "cmGlobalGenerator.h" #include "cmMakefile.h" @@ -20,7 +23,6 @@ #include "cmSystemTools.h" #include "cmTarget.h" #include "cmVersion.h" -#include "cm_static_string_view.hxx" #include "cmake.h" static std::string const kCMAKE_C_COMPILER_EXTERNAL_TOOLCHAIN = diff --git a/Source/cmCryptoHash.cxx b/Source/cmCryptoHash.cxx index ff683add81..dc7d939c94 100644 --- a/Source/cmCryptoHash.cxx +++ b/Source/cmCryptoHash.cxx @@ -2,11 +2,12 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmCryptoHash.h" -#include "cm_kwiml.h" -#include "cm_rhash.h" +#include <cm/memory> + #include "cmsys/FStream.hxx" -#include <cm/memory> +#include "cm_kwiml.h" +#include "cm_rhash.h" static unsigned int const cmCryptoHashAlgoToId[] = { /* clang-format needs this comment to break after the opening brace */ diff --git a/Source/cmCryptoHash.h b/Source/cmCryptoHash.h index 05552bd6ae..f27bb5db41 100644 --- a/Source/cmCryptoHash.h +++ b/Source/cmCryptoHash.h @@ -5,13 +5,13 @@ #include "cmConfigure.h" // IWYU pragma: keep -#include <cm/string_view> - #include <cstddef> #include <memory> #include <string> #include <vector> +#include <cm/string_view> + /** * @brief Abstract base class for cryptographic hash generators */ diff --git a/Source/cmCurl.h b/Source/cmCurl.h index fe7eb809f1..cb73ce6317 100644 --- a/Source/cmCurl.h +++ b/Source/cmCurl.h @@ -5,9 +5,10 @@ #include "cmConfigure.h" // IWYU pragma: keep -#include "cm_curl.h" #include <string> +#include "cm_curl.h" + std::string cmCurlSetCAInfo(::CURL* curl, const char* cafile = nullptr); std::string cmCurlSetNETRCOption(::CURL* curl, const std::string& netrc_level, const std::string& netrc_file); diff --git a/Source/cmCustomCommand.cxx b/Source/cmCustomCommand.cxx index fc6718dcb2..09d269b208 100644 --- a/Source/cmCustomCommand.cxx +++ b/Source/cmCustomCommand.cxx @@ -2,11 +2,11 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmCustomCommand.h" +#include <utility> + #include "cmAlgorithms.h" #include "cmMakefile.h" -#include <utility> - cmCustomCommand::cmCustomCommand(cmMakefile const* mf, std::vector<std::string> outputs, std::vector<std::string> byproducts, diff --git a/Source/cmCustomCommand.h b/Source/cmCustomCommand.h index bb5a0edbd9..4689aceea0 100644 --- a/Source/cmCustomCommand.h +++ b/Source/cmCustomCommand.h @@ -5,13 +5,13 @@ #include "cmConfigure.h" // IWYU pragma: keep -#include "cmCustomCommandLines.h" -#include "cmListFileCache.h" - #include <string> #include <utility> #include <vector> +#include "cmCustomCommandLines.h" +#include "cmListFileCache.h" + class cmMakefile; class cmImplicitDependsList diff --git a/Source/cmCustomCommandGenerator.cxx b/Source/cmCustomCommandGenerator.cxx index 7f3e052157..c1f412df88 100644 --- a/Source/cmCustomCommandGenerator.cxx +++ b/Source/cmCustomCommandGenerator.cxx @@ -2,6 +2,10 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmCustomCommandGenerator.h" +#include <cstddef> +#include <memory> +#include <utility> + #include "cmAlgorithms.h" #include "cmCustomCommand.h" #include "cmCustomCommandLines.h" @@ -13,10 +17,6 @@ #include "cmStringAlgorithms.h" #include "cmSystemTools.h" -#include <cstddef> -#include <memory> -#include <utility> - namespace { void AppendPaths(const std::vector<std::string>& inputs, cmGeneratorExpression const& ge, cmLocalGenerator* lg, diff --git a/Source/cmCustomCommandGenerator.h b/Source/cmCustomCommandGenerator.h index 50f292ef39..67ee9e0e1a 100644 --- a/Source/cmCustomCommandGenerator.h +++ b/Source/cmCustomCommandGenerator.h @@ -4,11 +4,12 @@ #define cmCustomCommandGenerator_h #include "cmConfigure.h" // IWYU pragma: keep -#include "cmCustomCommandLines.h" #include <string> #include <vector> +#include "cmCustomCommandLines.h" + class cmCustomCommand; class cmLocalGenerator; diff --git a/Source/cmDefinitions.cxx b/Source/cmDefinitions.cxx index 32f47b00e6..69a64276bc 100644 --- a/Source/cmDefinitions.cxx +++ b/Source/cmDefinitions.cxx @@ -2,13 +2,13 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmDefinitions.h" -#include <cm/string_view> - #include <cassert> #include <functional> #include <unordered_set> #include <utility> +#include <cm/string_view> + cmDefinitions::Def cmDefinitions::NoDef; cmDefinitions::Def const& cmDefinitions::GetInternal(const std::string& key, diff --git a/Source/cmDefinitions.h b/Source/cmDefinitions.h index 72e88b5304..0e38fb1af2 100644 --- a/Source/cmDefinitions.h +++ b/Source/cmDefinitions.h @@ -5,17 +5,16 @@ #include "cmConfigure.h" // IWYU pragma: keep -#include "cmLinkedTree.h" - -#include "cmString.hxx" - -#include <cm/string_view> - #include <functional> #include <string> #include <unordered_map> #include <vector> +#include <cm/string_view> + +#include "cmLinkedTree.h" +#include "cmString.hxx" + /** \class cmDefinitions * \brief Store a scope of variable definitions for CMake language. * diff --git a/Source/cmDepends.cxx b/Source/cmDepends.cxx index e8f6faf083..129a5f72fe 100644 --- a/Source/cmDepends.cxx +++ b/Source/cmDepends.cxx @@ -2,6 +2,11 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmDepends.h" +#include <sstream> +#include <utility> + +#include "cmsys/FStream.hxx" + #include "cmFileTime.h" #include "cmFileTimeCache.h" #include "cmGeneratedFileStream.h" @@ -10,10 +15,6 @@ #include "cmStringAlgorithms.h" #include "cmSystemTools.h" -#include "cmsys/FStream.hxx" -#include <sstream> -#include <utility> - cmDepends::cmDepends(cmLocalGenerator* lg, std::string targetDir) : LocalGenerator(lg) , TargetDirectory(std::move(targetDir)) diff --git a/Source/cmDependsC.cxx b/Source/cmDependsC.cxx index 012a0b10e1..e30d9597d7 100644 --- a/Source/cmDependsC.cxx +++ b/Source/cmDependsC.cxx @@ -2,9 +2,10 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmDependsC.h" -#include "cmsys/FStream.hxx" #include <utility> +#include "cmsys/FStream.hxx" + #include "cmFileTime.h" #include "cmLocalGenerator.h" #include "cmMakefile.h" diff --git a/Source/cmDependsC.h b/Source/cmDependsC.h index 7d732d9c28..3bb6e36a37 100644 --- a/Source/cmDependsC.h +++ b/Source/cmDependsC.h @@ -5,16 +5,18 @@ #include "cmConfigure.h" // IWYU pragma: keep -#include "cmDepends.h" - -#include "cmsys/RegularExpression.hxx" #include <iosfwd> #include <map> -#include <queue> #include <set> #include <string> #include <vector> +#include <queue> + +#include "cmsys/RegularExpression.hxx" + +#include "cmDepends.h" + class cmLocalGenerator; /** \class cmDependsC diff --git a/Source/cmDependsFortran.cxx b/Source/cmDependsFortran.cxx index de919f1906..ee4358762b 100644 --- a/Source/cmDependsFortran.cxx +++ b/Source/cmDependsFortran.cxx @@ -2,13 +2,14 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmDependsFortran.h" -#include "cmsys/FStream.hxx" #include <cassert> #include <cstdlib> #include <iostream> #include <map> #include <utility> +#include "cmsys/FStream.hxx" + #include "cmFortranParser.h" /* Interface to parser object. */ #include "cmGeneratedFileStream.h" #include "cmLocalGenerator.h" diff --git a/Source/cmDependsJava.h b/Source/cmDependsJava.h index dd671a1b6b..2a90251016 100644 --- a/Source/cmDependsJava.h +++ b/Source/cmDependsJava.h @@ -5,12 +5,12 @@ #include "cmConfigure.h" // IWYU pragma: keep -#include "cmDepends.h" - #include <iosfwd> #include <set> #include <string> +#include "cmDepends.h" + /** \class cmDependsJava * \brief Dependency scanner for Java class files. */ diff --git a/Source/cmDependsJavaParserHelper.cxx b/Source/cmDependsJavaParserHelper.cxx index 18b49b8682..516bbbfe05 100644 --- a/Source/cmDependsJavaParserHelper.cxx +++ b/Source/cmDependsJavaParserHelper.cxx @@ -2,17 +2,19 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmDependsJavaParserHelper.h" -#include "cmDependsJavaLexer.h" -#include "cmSystemTools.h" - -#include "cmsys/FStream.hxx" -#include <cm/string_view> #include <cstdio> #include <cstdlib> #include <cstring> #include <iostream> #include <utility> +#include <cm/string_view> + +#include "cmsys/FStream.hxx" + +#include "cmDependsJavaLexer.h" +#include "cmSystemTools.h" + int cmDependsJava_yyparse(yyscan_t yyscanner); cmDependsJavaParserHelper::cmDependsJavaParserHelper() diff --git a/Source/cmDocumentation.cxx b/Source/cmDocumentation.cxx index d1f3a83a98..1bc453d371 100644 --- a/Source/cmDocumentation.cxx +++ b/Source/cmDocumentation.cxx @@ -2,19 +2,20 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmDocumentation.h" +#include <algorithm> +#include <cctype> +#include <cstring> +#include <utility> + +#include "cmsys/FStream.hxx" +#include "cmsys/Glob.hxx" + #include "cmDocumentationEntry.h" #include "cmDocumentationSection.h" #include "cmRST.h" #include "cmSystemTools.h" #include "cmVersion.h" -#include "cmsys/FStream.hxx" -#include "cmsys/Glob.hxx" -#include <algorithm> -#include <cctype> -#include <cstring> -#include <utility> - static const char* cmDocumentationStandardOptions[][2] = { { "--help,-help,-usage,-h,-H,/?", "Print usage information and exit." }, { "--version,-version,/V [<f>]", "Print version number and exit." }, diff --git a/Source/cmDocumentation.h b/Source/cmDocumentation.h index cf74b800d1..3768e1abe6 100644 --- a/Source/cmDocumentation.h +++ b/Source/cmDocumentation.h @@ -5,14 +5,14 @@ #include "cmConfigure.h" // IWYU pragma: keep -#include "cmDocumentationFormatter.h" -#include "cmDocumentationSection.h" - #include <iosfwd> #include <map> #include <string> #include <vector> +#include "cmDocumentationFormatter.h" +#include "cmDocumentationSection.h" + struct cmDocumentationEntry; /** Class to generate documentation. */ diff --git a/Source/cmDocumentationFormatter.cxx b/Source/cmDocumentationFormatter.cxx index be6756a5d8..732637e36e 100644 --- a/Source/cmDocumentationFormatter.cxx +++ b/Source/cmDocumentationFormatter.cxx @@ -2,15 +2,15 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmDocumentationFormatter.h" -#include "cmDocumentationEntry.h" -#include "cmDocumentationSection.h" - #include <cstring> #include <iomanip> #include <ostream> #include <string> #include <vector> +#include "cmDocumentationEntry.h" +#include "cmDocumentationSection.h" + cmDocumentationFormatter::cmDocumentationFormatter() = default; cmDocumentationFormatter::~cmDocumentationFormatter() = default; diff --git a/Source/cmDocumentationSection.h b/Source/cmDocumentationSection.h index 19c7407b78..15cada6de3 100644 --- a/Source/cmDocumentationSection.h +++ b/Source/cmDocumentationSection.h @@ -5,12 +5,12 @@ #include "cmConfigure.h" // IWYU pragma: keep -#include "cmAlgorithms.h" -#include "cmDocumentationEntry.h" - #include <string> #include <vector> +#include "cmAlgorithms.h" +#include "cmDocumentationEntry.h" + // Low-level interface for custom documents: /** Internal class representing a section of the documentation. * Cares e.g. for the different section titles in the different diff --git a/Source/cmELF.cxx b/Source/cmELF.cxx index 06b55118b5..5976b2f78b 100644 --- a/Source/cmELF.cxx +++ b/Source/cmELF.cxx @@ -2,10 +2,6 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmELF.h" -#include "cmAlgorithms.h" -#include "cm_kwiml.h" -#include "cmsys/FStream.hxx" -#include <cm/memory> #include <cstddef> #include <map> #include <memory> @@ -13,6 +9,14 @@ #include <utility> #include <vector> +#include <cm/memory> + +#include "cmsys/FStream.hxx" + +#include "cm_kwiml.h" + +#include "cmAlgorithms.h" + // Include the ELF format information system header. #if defined(__OpenBSD__) # include <elf_abi.h> diff --git a/Source/cmExecProgramCommand.cxx b/Source/cmExecProgramCommand.cxx index 207b6fd432..51fb2191a5 100644 --- a/Source/cmExecProgramCommand.cxx +++ b/Source/cmExecProgramCommand.cxx @@ -2,9 +2,10 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmExecProgramCommand.h" -#include "cmsys/Process.h" #include <cstdio> +#include "cmsys/Process.h" + #include "cmExecutionStatus.h" #include "cmMakefile.h" #include "cmProcessOutput.h" diff --git a/Source/cmExecuteProcessCommand.cxx b/Source/cmExecuteProcessCommand.cxx index 12364c8761..80e4bcd636 100644 --- a/Source/cmExecuteProcessCommand.cxx +++ b/Source/cmExecuteProcessCommand.cxx @@ -2,9 +2,6 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmExecuteProcessCommand.h" -#include "cm_static_string_view.hxx" -#include "cmsys/Process.h" - #include <algorithm> #include <cctype> /* isspace */ #include <cstdio> @@ -12,6 +9,10 @@ #include <memory> #include <vector> +#include "cmsys/Process.h" + +#include "cm_static_string_view.hxx" + #include "cmAlgorithms.h" #include "cmArgumentParser.h" #include "cmExecutionStatus.h" diff --git a/Source/cmExecutionStatus.h b/Source/cmExecutionStatus.h index 654922c731..d2cc9b87aa 100644 --- a/Source/cmExecutionStatus.h +++ b/Source/cmExecutionStatus.h @@ -4,6 +4,7 @@ #define cmExecutionStatus_h #include <cmConfigure.h> // IWYU pragma: keep + #include <string> class cmMakefile; diff --git a/Source/cmExportBuildFileGenerator.cxx b/Source/cmExportBuildFileGenerator.cxx index c751966610..7e9a98738d 100644 --- a/Source/cmExportBuildFileGenerator.cxx +++ b/Source/cmExportBuildFileGenerator.cxx @@ -2,6 +2,12 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmExportBuildFileGenerator.h" +#include <map> +#include <memory> +#include <set> +#include <sstream> +#include <utility> + #include "cmExportSet.h" #include "cmGeneratorExpression.h" #include "cmGeneratorTarget.h" @@ -16,12 +22,6 @@ #include "cmTargetExport.h" #include "cmake.h" -#include <map> -#include <memory> -#include <set> -#include <sstream> -#include <utility> - class cmSourceFile; cmExportBuildFileGenerator::cmExportBuildFileGenerator() diff --git a/Source/cmExportBuildFileGenerator.h b/Source/cmExportBuildFileGenerator.h index e5b659749a..11fbd02d68 100644 --- a/Source/cmExportBuildFileGenerator.h +++ b/Source/cmExportBuildFileGenerator.h @@ -5,15 +5,15 @@ #include "cmConfigure.h" // IWYU pragma: keep -#include "cmAlgorithms.h" -#include "cmExportFileGenerator.h" -#include "cmStateTypes.h" - #include <iosfwd> #include <string> #include <utility> #include <vector> +#include "cmAlgorithms.h" +#include "cmExportFileGenerator.h" +#include "cmStateTypes.h" + class cmExportSet; class cmGeneratorTarget; class cmGlobalGenerator; diff --git a/Source/cmExportCommand.cxx b/Source/cmExportCommand.cxx index 79af6e90e7..2a6bf5df7d 100644 --- a/Source/cmExportCommand.cxx +++ b/Source/cmExportCommand.cxx @@ -2,13 +2,14 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmExportCommand.h" -#include "cm_static_string_view.hxx" -#include "cmsys/RegularExpression.hxx" - #include <map> #include <sstream> #include <utility> +#include "cmsys/RegularExpression.hxx" + +#include "cm_static_string_view.hxx" + #include "cmAlgorithms.h" #include "cmArgumentParser.h" #include "cmExecutionStatus.h" diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx index e142560b38..b968537648 100644 --- a/Source/cmExportFileGenerator.cxx +++ b/Source/cmExportFileGenerator.cxx @@ -2,6 +2,15 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmExportFileGenerator.h" +#include <cassert> +#include <cstring> +#include <sstream> +#include <utility> + +#include <cm/memory> + +#include "cmsys/FStream.hxx" + #include "cmComputeLinkInformation.h" #include "cmGeneratedFileStream.h" #include "cmGeneratorTarget.h" @@ -18,14 +27,6 @@ #include "cmTarget.h" #include "cmTargetExport.h" -#include "cmsys/FStream.hxx" -#include <cassert> -#include <cstring> -#include <sstream> -#include <utility> - -#include <cm/memory> - static std::string cmExportFileGeneratorEscape(std::string const& str) { // Escape a property value for writing into a .cmake file. diff --git a/Source/cmExportFileGenerator.h b/Source/cmExportFileGenerator.h index 6fa86abd60..b04a31eba1 100644 --- a/Source/cmExportFileGenerator.h +++ b/Source/cmExportFileGenerator.h @@ -5,17 +5,17 @@ #include "cmConfigure.h" // IWYU pragma: keep -#include "cmGeneratorExpression.h" -#include "cmStateTypes.h" -#include "cmVersion.h" -#include "cmVersionConfig.h" - #include <iosfwd> #include <map> #include <set> #include <string> #include <vector> +#include "cmGeneratorExpression.h" +#include "cmStateTypes.h" +#include "cmVersion.h" +#include "cmVersionConfig.h" + class cmGeneratorTarget; #define STRINGIFY_HELPER(X) #X diff --git a/Source/cmExportInstallFileGenerator.cxx b/Source/cmExportInstallFileGenerator.cxx index 1e843b6171..6d29c9994f 100644 --- a/Source/cmExportInstallFileGenerator.cxx +++ b/Source/cmExportInstallFileGenerator.cxx @@ -2,6 +2,10 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmExportInstallFileGenerator.h" +#include <memory> +#include <sstream> +#include <utility> + #include "cmExportSet.h" #include "cmGeneratedFileStream.h" #include "cmGeneratorExpression.h" @@ -18,10 +22,6 @@ #include "cmTarget.h" #include "cmTargetExport.h" -#include <memory> -#include <sstream> -#include <utility> - cmExportInstallFileGenerator::cmExportInstallFileGenerator( cmInstallExportGenerator* iegen) : IEGen(iegen) diff --git a/Source/cmExportInstallFileGenerator.h b/Source/cmExportInstallFileGenerator.h index fcd1aca5da..5fa812c586 100644 --- a/Source/cmExportInstallFileGenerator.h +++ b/Source/cmExportInstallFileGenerator.h @@ -5,9 +5,6 @@ #include "cmConfigure.h" // IWYU pragma: keep -#include "cmExportFileGenerator.h" -#include "cmStateTypes.h" - #include <iosfwd> #include <map> #include <set> @@ -15,6 +12,9 @@ #include <utility> #include <vector> +#include "cmExportFileGenerator.h" +#include "cmStateTypes.h" + class cmGeneratorTarget; class cmGlobalGenerator; class cmInstallExportGenerator; diff --git a/Source/cmExportLibraryDependenciesCommand.cxx b/Source/cmExportLibraryDependenciesCommand.cxx index fd2401e31a..89093e95fa 100644 --- a/Source/cmExportLibraryDependenciesCommand.cxx +++ b/Source/cmExportLibraryDependenciesCommand.cxx @@ -2,12 +2,13 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmExportLibraryDependenciesCommand.h" -#include "cmsys/FStream.hxx" #include <map> #include <utility> #include <cm/memory> +#include "cmsys/FStream.hxx" + #include "cmExecutionStatus.h" #include "cmGeneratedFileStream.h" #include "cmGlobalGenerator.h" diff --git a/Source/cmExportTryCompileFileGenerator.cxx b/Source/cmExportTryCompileFileGenerator.cxx index 4027d4bfd8..fafa51b7b3 100644 --- a/Source/cmExportTryCompileFileGenerator.cxx +++ b/Source/cmExportTryCompileFileGenerator.cxx @@ -2,6 +2,10 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmExportTryCompileFileGenerator.h" +#include <map> +#include <memory> +#include <utility> + #include "cmGeneratorExpression.h" #include "cmGeneratorExpressionDAGChecker.h" #include "cmGeneratorTarget.h" @@ -12,10 +16,6 @@ #include "cmStringAlgorithms.h" #include "cmTarget.h" -#include <map> -#include <memory> -#include <utility> - cmExportTryCompileFileGenerator::cmExportTryCompileFileGenerator( cmGlobalGenerator* gg, const std::vector<std::string>& targets, cmMakefile* mf, std::set<std::string> const& langs) diff --git a/Source/cmExportTryCompileFileGenerator.h b/Source/cmExportTryCompileFileGenerator.h index 2a2ba7e500..7573427f6c 100644 --- a/Source/cmExportTryCompileFileGenerator.h +++ b/Source/cmExportTryCompileFileGenerator.h @@ -5,13 +5,13 @@ #include "cmConfigure.h" // IWYU pragma: keep -#include "cmExportFileGenerator.h" - #include <iosfwd> #include <set> #include <string> #include <vector> +#include "cmExportFileGenerator.h" + class cmGeneratorTarget; class cmGlobalGenerator; class cmMakefile; diff --git a/Source/cmExprParserHelper.cxx b/Source/cmExprParserHelper.cxx index c01e9598c9..56dfc6c1d9 100644 --- a/Source/cmExprParserHelper.cxx +++ b/Source/cmExprParserHelper.cxx @@ -2,14 +2,14 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmExprParserHelper.h" -#include "cmExprLexer.h" -#include "cmStringAlgorithms.h" - #include <iostream> #include <sstream> #include <stdexcept> #include <utility> +#include "cmExprLexer.h" +#include "cmStringAlgorithms.h" + int cmExpr_yyparse(yyscan_t yyscanner); // cmExprParserHelper::cmExprParserHelper() diff --git a/Source/cmExprParserHelper.h b/Source/cmExprParserHelper.h index 42c460accb..eaf5dc78a6 100644 --- a/Source/cmExprParserHelper.h +++ b/Source/cmExprParserHelper.h @@ -5,11 +5,11 @@ #include "cmConfigure.h" // IWYU pragma: keep -#include "cm_kwiml.h" - #include <string> #include <vector> +#include "cm_kwiml.h" + class cmExprParserHelper { public: diff --git a/Source/cmExternalMakefileProjectGenerator.cxx b/Source/cmExternalMakefileProjectGenerator.cxx index 83a0ba6536..5895d666e9 100644 --- a/Source/cmExternalMakefileProjectGenerator.cxx +++ b/Source/cmExternalMakefileProjectGenerator.cxx @@ -2,10 +2,10 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmExternalMakefileProjectGenerator.h" -#include "cmStringAlgorithms.h" - #include <utility> +#include "cmStringAlgorithms.h" + class cmMakefile; void cmExternalMakefileProjectGenerator::EnableLanguage( diff --git a/Source/cmExtraCodeBlocksGenerator.h b/Source/cmExtraCodeBlocksGenerator.h index 173e284005..d9f92bde5e 100644 --- a/Source/cmExtraCodeBlocksGenerator.h +++ b/Source/cmExtraCodeBlocksGenerator.h @@ -5,11 +5,11 @@ #include "cmConfigure.h" // IWYU pragma: keep -#include "cmExternalMakefileProjectGenerator.h" - #include <string> #include <vector> +#include "cmExternalMakefileProjectGenerator.h" + class cmGeneratorTarget; class cmLocalGenerator; class cmMakefile; diff --git a/Source/cmExtraCodeLiteGenerator.cxx b/Source/cmExtraCodeLiteGenerator.cxx index e74ad0c789..c7b74570f7 100644 --- a/Source/cmExtraCodeLiteGenerator.cxx +++ b/Source/cmExtraCodeLiteGenerator.cxx @@ -2,6 +2,14 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmExtraCodeLiteGenerator.h" +#include <cstring> +#include <map> +#include <set> +#include <sstream> +#include <utility> + +#include "cmsys/SystemInformation.hxx" + #include "cmGeneratedFileStream.h" #include "cmGeneratorTarget.h" #include "cmGlobalGenerator.h" @@ -14,13 +22,6 @@ #include "cmXMLWriter.h" #include "cmake.h" -#include "cmsys/SystemInformation.hxx" -#include <cstring> -#include <map> -#include <set> -#include <sstream> -#include <utility> - cmExtraCodeLiteGenerator::cmExtraCodeLiteGenerator() : ConfigName("NoConfig") { diff --git a/Source/cmExtraCodeLiteGenerator.h b/Source/cmExtraCodeLiteGenerator.h index dea7ebc113..0ce90b093a 100644 --- a/Source/cmExtraCodeLiteGenerator.h +++ b/Source/cmExtraCodeLiteGenerator.h @@ -5,13 +5,13 @@ #include "cmConfigure.h" // IWYU pragma: keep -#include "cmExternalMakefileProjectGenerator.h" - #include <map> #include <set> #include <string> #include <vector> +#include "cmExternalMakefileProjectGenerator.h" + class cmLocalGenerator; class cmMakefile; class cmGeneratorTarget; diff --git a/Source/cmExtraEclipseCDT4Generator.cxx b/Source/cmExtraEclipseCDT4Generator.cxx index ca612b5922..b286acf0c8 100644 --- a/Source/cmExtraEclipseCDT4Generator.cxx +++ b/Source/cmExtraEclipseCDT4Generator.cxx @@ -2,7 +2,6 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmExtraEclipseCDT4Generator.h" -#include "cmsys/RegularExpression.hxx" #include <algorithm> #include <cassert> #include <cstdio> @@ -10,6 +9,8 @@ #include <sstream> #include <utility> +#include "cmsys/RegularExpression.hxx" + #include "cmGeneratedFileStream.h" #include "cmGeneratorExpression.h" #include "cmGeneratorTarget.h" diff --git a/Source/cmExtraEclipseCDT4Generator.h b/Source/cmExtraEclipseCDT4Generator.h index ef038d9ae6..ff4c59eeb0 100644 --- a/Source/cmExtraEclipseCDT4Generator.h +++ b/Source/cmExtraEclipseCDT4Generator.h @@ -5,13 +5,13 @@ #include "cmConfigure.h" // IWYU pragma: keep -#include "cmExternalMakefileProjectGenerator.h" - #include <iosfwd> #include <set> #include <string> #include <vector> +#include "cmExternalMakefileProjectGenerator.h" + class cmLocalGenerator; class cmMakefile; class cmSourceGroup; diff --git a/Source/cmExtraKateGenerator.cxx b/Source/cmExtraKateGenerator.cxx index b3d869edfd..e8c9dd0020 100644 --- a/Source/cmExtraKateGenerator.cxx +++ b/Source/cmExtraKateGenerator.cxx @@ -2,6 +2,11 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmExtraKateGenerator.h" +#include <cstring> +#include <ostream> +#include <set> +#include <vector> + #include "cmGeneratedFileStream.h" #include "cmGeneratorTarget.h" #include "cmGlobalGenerator.h" @@ -12,11 +17,6 @@ #include "cmStringAlgorithms.h" #include "cmSystemTools.h" -#include <cstring> -#include <ostream> -#include <set> -#include <vector> - cmExtraKateGenerator::cmExtraKateGenerator() = default; cmExternalMakefileProjectGeneratorFactory* cmExtraKateGenerator::GetFactory() diff --git a/Source/cmExtraKateGenerator.h b/Source/cmExtraKateGenerator.h index a4355f00ca..be1376aa2f 100644 --- a/Source/cmExtraKateGenerator.h +++ b/Source/cmExtraKateGenerator.h @@ -5,10 +5,10 @@ #include "cmConfigure.h" // IWYU pragma: keep -#include "cmExternalMakefileProjectGenerator.h" - #include <string> +#include "cmExternalMakefileProjectGenerator.h" + class cmGeneratedFileStream; class cmLocalGenerator; diff --git a/Source/cmExtraSublimeTextGenerator.cxx b/Source/cmExtraSublimeTextGenerator.cxx index f041821936..495324cbf3 100644 --- a/Source/cmExtraSublimeTextGenerator.cxx +++ b/Source/cmExtraSublimeTextGenerator.cxx @@ -2,12 +2,13 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmExtraSublimeTextGenerator.h" -#include "cmsys/RegularExpression.hxx" #include <cstring> #include <set> #include <sstream> #include <utility> +#include "cmsys/RegularExpression.hxx" + #include "cmGeneratedFileStream.h" #include "cmGeneratorExpression.h" #include "cmGeneratorTarget.h" diff --git a/Source/cmExtraSublimeTextGenerator.h b/Source/cmExtraSublimeTextGenerator.h index d9ef1d1abc..7e8f2d4ec0 100644 --- a/Source/cmExtraSublimeTextGenerator.h +++ b/Source/cmExtraSublimeTextGenerator.h @@ -5,12 +5,12 @@ #include "cmConfigure.h" // IWYU pragma: keep -#include "cmExternalMakefileProjectGenerator.h" - #include <map> #include <string> #include <vector> +#include "cmExternalMakefileProjectGenerator.h" + class cmGeneratedFileStream; class cmGeneratorTarget; class cmLocalGenerator; diff --git a/Source/cmFileAPI.cxx b/Source/cmFileAPI.cxx index 8161191469..a56ad22f69 100644 --- a/Source/cmFileAPI.cxx +++ b/Source/cmFileAPI.cxx @@ -2,6 +2,18 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmFileAPI.h" +#include <algorithm> +#include <cassert> +#include <chrono> +#include <cstddef> +#include <ctime> +#include <iomanip> +#include <sstream> +#include <utility> + +#include "cmsys/Directory.hxx" +#include "cmsys/FStream.hxx" + #include "cmCryptoHash.h" #include "cmFileAPICMakeFiles.h" #include "cmFileAPICache.h" @@ -11,17 +23,6 @@ #include "cmSystemTools.h" #include "cmTimestamp.h" #include "cmake.h" -#include "cmsys/Directory.hxx" -#include "cmsys/FStream.hxx" - -#include <algorithm> -#include <cassert> -#include <chrono> -#include <cstddef> -#include <ctime> -#include <iomanip> -#include <sstream> -#include <utility> cmFileAPI::cmFileAPI(cmake* cm) : CMakeInstance(cm) diff --git a/Source/cmFileAPI.h b/Source/cmFileAPI.h index aa5a42fa85..e183e0d974 100644 --- a/Source/cmFileAPI.h +++ b/Source/cmFileAPI.h @@ -5,16 +5,16 @@ #include "cmConfigure.h" // IWYU pragma: keep -#include "cm_jsoncpp_reader.h" -#include "cm_jsoncpp_value.h" -#include "cm_jsoncpp_writer.h" - #include <map> #include <memory> #include <string> #include <unordered_set> #include <vector> +#include "cm_jsoncpp_reader.h" +#include "cm_jsoncpp_value.h" +#include "cm_jsoncpp_writer.h" + class cmake; class cmFileAPI diff --git a/Source/cmFileAPICMakeFiles.cxx b/Source/cmFileAPICMakeFiles.cxx index 5590bc2b3b..f419997710 100644 --- a/Source/cmFileAPICMakeFiles.cxx +++ b/Source/cmFileAPICMakeFiles.cxx @@ -2,6 +2,11 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmFileAPICMakeFiles.h" +#include <string> +#include <vector> + +#include "cm_jsoncpp_value.h" + #include "cmFileAPI.h" #include "cmGlobalGenerator.h" #include "cmLocalGenerator.h" @@ -9,11 +14,6 @@ #include "cmSystemTools.h" #include "cmake.h" -#include "cm_jsoncpp_value.h" - -#include <string> -#include <vector> - namespace { class CMakeFiles diff --git a/Source/cmFileAPICache.cxx b/Source/cmFileAPICache.cxx index f96bc90e58..ef7779567a 100644 --- a/Source/cmFileAPICache.cxx +++ b/Source/cmFileAPICache.cxx @@ -2,17 +2,17 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmFileAPICache.h" -#include "cmFileAPI.h" -#include "cmState.h" -#include "cmake.h" - -#include "cm_jsoncpp_value.h" - #include <algorithm> #include <string> #include <utility> #include <vector> +#include "cm_jsoncpp_value.h" + +#include "cmFileAPI.h" +#include "cmState.h" +#include "cmake.h" + namespace { class Cache diff --git a/Source/cmFileAPICodemodel.cxx b/Source/cmFileAPICodemodel.cxx index fbdb9754dc..eb50813604 100644 --- a/Source/cmFileAPICodemodel.cxx +++ b/Source/cmFileAPICodemodel.cxx @@ -2,6 +2,21 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmFileAPICodemodel.h" +#include <algorithm> +#include <cassert> +#include <cstddef> +#include <functional> +#include <limits> +#include <map> +#include <memory> +#include <set> +#include <string> +#include <unordered_map> +#include <utility> +#include <vector> + +#include "cm_jsoncpp_value.h" + #include "cmAlgorithms.h" #include "cmCryptoHash.h" #include "cmFileAPI.h" @@ -27,21 +42,6 @@ #include "cmTargetDepend.h" #include "cmake.h" -#include "cm_jsoncpp_value.h" - -#include <algorithm> -#include <cassert> -#include <cstddef> -#include <functional> -#include <limits> -#include <map> -#include <memory> -#include <set> -#include <string> -#include <unordered_map> -#include <utility> -#include <vector> - namespace { class Codemodel diff --git a/Source/cmFileCommand.cxx b/Source/cmFileCommand.cxx index c7a0e55127..d55b959e8e 100644 --- a/Source/cmFileCommand.cxx +++ b/Source/cmFileCommand.cxx @@ -2,12 +2,6 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmFileCommand.h" -#include "cm_kwiml.h" -#include "cm_static_string_view.hxx" -#include "cmsys/FStream.hxx" -#include "cmsys/Glob.hxx" -#include "cmsys/RegularExpression.hxx" - #include <algorithm> #include <cassert> #include <cctype> @@ -22,6 +16,12 @@ #include <cm/memory> +#include "cmsys/FStream.hxx" +#include "cmsys/Glob.hxx" +#include "cmsys/RegularExpression.hxx" + +#include "cm_kwiml.h" +#include "cm_static_string_view.hxx" #include "cm_sys_stat.h" #include "cmAlgorithms.h" @@ -49,9 +49,10 @@ #include "cmake.h" #if !defined(CMAKE_BOOTSTRAP) +# include "cm_curl.h" + # include "cmCurl.h" # include "cmFileLockResult.h" -# include "cm_curl.h" #endif #if defined(CMAKE_USE_ELF_PARSER) diff --git a/Source/cmFileCopier.cxx b/Source/cmFileCopier.cxx index 5b9c85a24a..627e05b587 100644 --- a/Source/cmFileCopier.cxx +++ b/Source/cmFileCopier.cxx @@ -3,14 +3,15 @@ #include "cmFileCopier.h" +#include "cmsys/Directory.hxx" +#include "cmsys/Glob.hxx" + #include "cmExecutionStatus.h" #include "cmFSPermissions.h" #include "cmFileTimes.h" #include "cmMakefile.h" #include "cmStringAlgorithms.h" #include "cmSystemTools.h" -#include "cmsys/Directory.hxx" -#include "cmsys/Glob.hxx" #ifdef _WIN32 # include "cmsys/FStream.hxx" diff --git a/Source/cmFileCopier.h b/Source/cmFileCopier.h index 8fc481ce03..612a57fef2 100644 --- a/Source/cmFileCopier.h +++ b/Source/cmFileCopier.h @@ -5,13 +5,14 @@ #include "cmConfigure.h" // IWYU pragma: keep -#include "cmFileTimeCache.h" +#include <string> +#include <vector> + #include "cmsys/RegularExpression.hxx" #include "cm_sys_stat.h" -#include <string> -#include <vector> +#include "cmFileTimeCache.h" class cmExecutionStatus; class cmMakefile; diff --git a/Source/cmFileInstaller.cxx b/Source/cmFileInstaller.cxx index a773738f74..c89be9628e 100644 --- a/Source/cmFileInstaller.cxx +++ b/Source/cmFileInstaller.cxx @@ -3,16 +3,16 @@ #include "cmFileInstaller.h" +#include <sstream> + +#include "cm_sys_stat.h" + #include "cmExecutionStatus.h" #include "cmFSPermissions.h" #include "cmMakefile.h" #include "cmStringAlgorithms.h" #include "cmSystemTools.h" -#include "cm_sys_stat.h" - -#include <sstream> - using namespace cmFSPermissions; cmFileInstaller::cmFileInstaller(cmExecutionStatus& status) diff --git a/Source/cmFileInstaller.h b/Source/cmFileInstaller.h index fd883ea922..537cd53cb6 100644 --- a/Source/cmFileInstaller.h +++ b/Source/cmFileInstaller.h @@ -5,13 +5,12 @@ #include "cmConfigure.h" // IWYU pragma: keep -#include "cmFileCopier.h" - -#include "cmInstallType.h" - #include <string> #include <vector> +#include "cmFileCopier.h" +#include "cmInstallType.h" + class cmExecutionStatus; struct cmFileInstaller : public cmFileCopier diff --git a/Source/cmFileLock.cxx b/Source/cmFileLock.cxx index d380798d2e..e90f57140e 100644 --- a/Source/cmFileLock.cxx +++ b/Source/cmFileLock.cxx @@ -2,9 +2,10 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmFileLock.h" -#include "cmFileLockResult.h" #include <cassert> +#include "cmFileLockResult.h" + // Common implementation cmFileLock::~cmFileLock() diff --git a/Source/cmFileLockUnix.cxx b/Source/cmFileLockUnix.cxx index 739382362c..1456ea8c14 100644 --- a/Source/cmFileLockUnix.cxx +++ b/Source/cmFileLockUnix.cxx @@ -1,13 +1,14 @@ /* Distributed under the OSI-approved BSD 3-Clause License. See accompanying file Copyright.txt or https://cmake.org/licensing for details. */ -#include "cmFileLock.h" - -#include "cmSystemTools.h" #include <cerrno> // errno #include <cstdio> // SEEK_SET + #include <fcntl.h> #include <unistd.h> +#include "cmFileLock.h" +#include "cmSystemTools.h" + cmFileLock::cmFileLock() = default; cmFileLockResult cmFileLock::Release() diff --git a/Source/cmFileLockWin32.cxx b/Source/cmFileLockWin32.cxx index a61d360ab1..b8e435aa53 100644 --- a/Source/cmFileLockWin32.cxx +++ b/Source/cmFileLockWin32.cxx @@ -1,9 +1,9 @@ /* Distributed under the OSI-approved BSD 3-Clause License. See accompanying file Copyright.txt or https://cmake.org/licensing for details. */ -#include "cmFileLock.h" +#include <windows.h> // CreateFileW +#include "cmFileLock.h" #include "cmSystemTools.h" -#include <windows.h> // CreateFileW cmFileLock::cmFileLock() { diff --git a/Source/cmFileMonitor.cxx b/Source/cmFileMonitor.cxx index 7fcced2f17..ac8a37eee0 100644 --- a/Source/cmFileMonitor.cxx +++ b/Source/cmFileMonitor.cxx @@ -2,14 +2,15 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmFileMonitor.h" -#include "cmAlgorithms.h" -#include "cmsys/SystemTools.hxx" - #include <cassert> #include <cstddef> #include <unordered_map> #include <utility> +#include "cmsys/SystemTools.hxx" + +#include "cmAlgorithms.h" + namespace { void on_directory_change(uv_fs_event_t* handle, const char* filename, int events, int status); diff --git a/Source/cmFilePathChecksum.cxx b/Source/cmFilePathChecksum.cxx index 47a223a208..bb3f610d12 100644 --- a/Source/cmFilePathChecksum.cxx +++ b/Source/cmFilePathChecksum.cxx @@ -2,13 +2,13 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmFilePathChecksum.h" +#include <vector> + #include "cmBase32.h" #include "cmCryptoHash.h" #include "cmMakefile.h" #include "cmSystemTools.h" -#include <vector> - cmFilePathChecksum::cmFilePathChecksum() = default; cmFilePathChecksum::cmFilePathChecksum(std::string const& currentSrcDir, diff --git a/Source/cmFileTime.cxx b/Source/cmFileTime.cxx index f92c0ffce4..96c70fef6b 100644 --- a/Source/cmFileTime.cxx +++ b/Source/cmFileTime.cxx @@ -9,8 +9,9 @@ #if !defined(_WIN32) || defined(__CYGWIN__) # include "cm_sys_stat.h" #else -# include "cmsys/Encoding.hxx" # include <windows.h> + +# include "cmsys/Encoding.hxx" #endif bool cmFileTime::Load(std::string const& fileName) diff --git a/Source/cmFileTimeCache.h b/Source/cmFileTimeCache.h index 4f1a3a253c..83b77b651c 100644 --- a/Source/cmFileTimeCache.h +++ b/Source/cmFileTimeCache.h @@ -5,10 +5,11 @@ #include "cmConfigure.h" // IWYU pragma: keep -#include "cmFileTime.h" // IWYU pragma: keep #include <string> #include <unordered_map> +#include "cmFileTime.h" // IWYU pragma: keep + /** \class cmFileTimeCache * \brief Caches file modification times in an internal map for fast lookups. */ diff --git a/Source/cmFileTimes.cxx b/Source/cmFileTimes.cxx index 54ac4edd5d..d8fe24c5b3 100644 --- a/Source/cmFileTimes.cxx +++ b/Source/cmFileTimes.cxx @@ -9,8 +9,9 @@ #include "cm_sys_stat.h" #if defined(_WIN32) -# include "cmSystemTools.h" # include <windows.h> + +# include "cmSystemTools.h" #else # include <utime.h> #endif diff --git a/Source/cmFindLibraryCommand.cxx b/Source/cmFindLibraryCommand.cxx index 011e8aaaee..20221b12e0 100644 --- a/Source/cmFindLibraryCommand.cxx +++ b/Source/cmFindLibraryCommand.cxx @@ -2,13 +2,14 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmFindLibraryCommand.h" -#include "cmsys/RegularExpression.hxx" #include <algorithm> #include <cstdio> #include <cstring> #include <set> #include <utility> +#include "cmsys/RegularExpression.hxx" + #include "cmGlobalGenerator.h" #include "cmMakefile.h" #include "cmState.h" diff --git a/Source/cmFindPackageCommand.cxx b/Source/cmFindPackageCommand.cxx index 17e9869e8c..ea936cfd95 100644 --- a/Source/cmFindPackageCommand.cxx +++ b/Source/cmFindPackageCommand.cxx @@ -2,12 +2,6 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmFindPackageCommand.h" -#include "cmSystemTools.h" -#include "cmsys/Directory.hxx" -#include "cmsys/FStream.hxx" -#include "cmsys/Glob.hxx" -#include "cmsys/RegularExpression.hxx" -#include "cmsys/String.h" #include <algorithm> #include <cassert> #include <cstdio> @@ -20,6 +14,12 @@ #include <cm/memory> +#include "cmsys/Directory.hxx" +#include "cmsys/FStream.hxx" +#include "cmsys/Glob.hxx" +#include "cmsys/RegularExpression.hxx" +#include "cmsys/String.h" + #include "cmAlgorithms.h" #include "cmMakefile.h" #include "cmMessageType.h" @@ -29,6 +29,7 @@ #include "cmState.h" #include "cmStateTypes.h" #include "cmStringAlgorithms.h" +#include "cmSystemTools.h" #include "cmVersion.h" #if defined(__HAIKU__) diff --git a/Source/cmFindPackageCommand.h b/Source/cmFindPackageCommand.h index 78b49851c8..85fe7b6e51 100644 --- a/Source/cmFindPackageCommand.h +++ b/Source/cmFindPackageCommand.h @@ -5,7 +5,6 @@ #include "cmConfigure.h" // IWYU pragma: keep -#include "cm_kwiml.h" #include <cstddef> #include <functional> #include <map> @@ -13,6 +12,8 @@ #include <string> #include <vector> +#include "cm_kwiml.h" + #include "cmFindCommon.h" #include "cmPolicies.h" diff --git a/Source/cmFortranParserImpl.cxx b/Source/cmFortranParserImpl.cxx index b983b4d968..054a2a93e6 100644 --- a/Source/cmFortranParserImpl.cxx +++ b/Source/cmFortranParserImpl.cxx @@ -1,10 +1,5 @@ /* Distributed under the OSI-approved BSD 3-Clause License. See accompanying file Copyright.txt or https://cmake.org/licensing for details. */ -#include "cmFortranParser.h" - -#include "cmStringAlgorithms.h" -#include "cmSystemTools.h" - #include <cassert> #include <cstdio> #include <set> @@ -13,6 +8,10 @@ #include <utility> #include <vector> +#include "cmFortranParser.h" +#include "cmStringAlgorithms.h" +#include "cmSystemTools.h" + bool cmFortranParser_s::FindIncludeFile(const char* dir, const char* includeName, std::string& fileName) diff --git a/Source/cmGeneratedFileStream.h b/Source/cmGeneratedFileStream.h index 3d94cdcb38..a9088ac8af 100644 --- a/Source/cmGeneratedFileStream.h +++ b/Source/cmGeneratedFileStream.h @@ -5,10 +5,12 @@ #include "cmConfigure.h" // IWYU pragma: keep -#include "cm_codecvt.hxx" -#include "cmsys/FStream.hxx" #include <string> +#include "cmsys/FStream.hxx" + +#include "cm_codecvt.hxx" + // This is the first base class of cmGeneratedFileStream. It will be // created before and destroyed after the ofstream portion and can // therefore be used to manage the temporary file. diff --git a/Source/cmGeneratorExpression.cxx b/Source/cmGeneratorExpression.cxx index 1f31069948..b7f7d1d9b6 100644 --- a/Source/cmGeneratorExpression.cxx +++ b/Source/cmGeneratorExpression.cxx @@ -2,10 +2,12 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmGeneratorExpression.h" -#include "cmsys/RegularExpression.hxx" +#include <cassert> #include <memory> #include <utility> +#include "cmsys/RegularExpression.hxx" + #include "cmAlgorithms.h" #include "cmGeneratorExpressionContext.h" #include "cmGeneratorExpressionDAGChecker.h" @@ -14,7 +16,6 @@ #include "cmGeneratorExpressionParser.h" #include "cmStringAlgorithms.h" #include "cmSystemTools.h" -#include <cassert> cmGeneratorExpression::cmGeneratorExpression(cmListFileBacktrace backtrace) : Backtrace(std::move(backtrace)) diff --git a/Source/cmGeneratorExpression.h b/Source/cmGeneratorExpression.h index de5c705675..4bd1c9f88a 100644 --- a/Source/cmGeneratorExpression.h +++ b/Source/cmGeneratorExpression.h @@ -5,8 +5,6 @@ #include "cmConfigure.h" // IWYU pragma: keep -#include "cmListFileCache.h" - #include <map> #include <memory> #include <set> @@ -14,6 +12,8 @@ #include <utility> #include <vector> +#include "cmListFileCache.h" + class cmCompiledGeneratorExpression; class cmGeneratorTarget; class cmLocalGenerator; diff --git a/Source/cmGeneratorExpressionContext.h b/Source/cmGeneratorExpressionContext.h index 6e076bf542..4709fa0244 100644 --- a/Source/cmGeneratorExpressionContext.h +++ b/Source/cmGeneratorExpressionContext.h @@ -3,12 +3,12 @@ #ifndef cmGeneratorExpressionContext_h #define cmGeneratorExpressionContext_h -#include "cmListFileCache.h" - #include <map> #include <set> #include <string> +#include "cmListFileCache.h" + class cmGeneratorTarget; class cmLocalGenerator; diff --git a/Source/cmGeneratorExpressionDAGChecker.cxx b/Source/cmGeneratorExpressionDAGChecker.cxx index 76f2905245..643ba346d1 100644 --- a/Source/cmGeneratorExpressionDAGChecker.cxx +++ b/Source/cmGeneratorExpressionDAGChecker.cxx @@ -2,6 +2,10 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmGeneratorExpressionDAGChecker.h" +#include <cstring> +#include <sstream> +#include <utility> + #include "cmGeneratorExpressionContext.h" #include "cmGeneratorExpressionEvaluator.h" #include "cmGeneratorTarget.h" @@ -10,10 +14,6 @@ #include "cmStringAlgorithms.h" #include "cmake.h" -#include <cstring> -#include <sstream> -#include <utility> - cmGeneratorExpressionDAGChecker::cmGeneratorExpressionDAGChecker( cmListFileBacktrace backtrace, cmGeneratorTarget const* target, std::string property, const GeneratorExpressionContent* content, diff --git a/Source/cmGeneratorExpressionDAGChecker.h b/Source/cmGeneratorExpressionDAGChecker.h index b72a40ffb9..f2c49bbf23 100644 --- a/Source/cmGeneratorExpressionDAGChecker.h +++ b/Source/cmGeneratorExpressionDAGChecker.h @@ -5,12 +5,12 @@ #include "cmConfigure.h" // IWYU pragma: keep -#include "cmListFileCache.h" - #include <map> #include <set> #include <string> +#include "cmListFileCache.h" + struct GeneratorExpressionContent; struct cmGeneratorExpressionContext; class cmGeneratorTarget; diff --git a/Source/cmGeneratorExpressionEvaluationFile.cxx b/Source/cmGeneratorExpressionEvaluationFile.cxx index aa2c1a6a3f..9e8707d9d9 100644 --- a/Source/cmGeneratorExpressionEvaluationFile.cxx +++ b/Source/cmGeneratorExpressionEvaluationFile.cxx @@ -2,11 +2,12 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmGeneratorExpressionEvaluationFile.h" -#include "cmsys/FStream.hxx" #include <memory> #include <sstream> #include <utility> +#include "cmsys/FStream.hxx" + #include "cmGeneratedFileStream.h" #include "cmGlobalGenerator.h" #include "cmListFileCache.h" diff --git a/Source/cmGeneratorExpressionEvaluator.cxx b/Source/cmGeneratorExpressionEvaluator.cxx index c1343b2238..e0ae170c08 100644 --- a/Source/cmGeneratorExpressionEvaluator.cxx +++ b/Source/cmGeneratorExpressionEvaluator.cxx @@ -2,13 +2,13 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmGeneratorExpressionEvaluator.h" +#include <algorithm> +#include <sstream> + #include "cmAlgorithms.h" #include "cmGeneratorExpressionContext.h" #include "cmGeneratorExpressionNode.h" -#include <algorithm> -#include <sstream> - GeneratorExpressionContent::GeneratorExpressionContent( const char* startContent, size_t length) : StartContent(startContent) diff --git a/Source/cmGeneratorExpressionNode.cxx b/Source/cmGeneratorExpressionNode.cxx index 5a35007b84..66f1c71f42 100644 --- a/Source/cmGeneratorExpressionNode.cxx +++ b/Source/cmGeneratorExpressionNode.cxx @@ -2,6 +2,24 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmGeneratorExpressionNode.h" +#include <algorithm> +#include <cassert> +#include <cerrno> +#include <cstdlib> +#include <cstring> +#include <map> +#include <memory> +#include <set> +#include <sstream> +#include <utility> + +#include <cm/iterator> + +#include "cmsys/RegularExpression.hxx" +#include "cmsys/String.h" + +#include "cm_static_string_view.hxx" + #include "cmAlgorithms.h" #include "cmGeneratorExpression.h" #include "cmGeneratorExpressionContext.h" @@ -23,25 +41,8 @@ #include "cmStringAlgorithms.h" #include "cmSystemTools.h" #include "cmTarget.h" -#include "cm_static_string_view.hxx" #include "cmake.h" -#include "cmsys/RegularExpression.hxx" -#include "cmsys/String.h" - -#include <cm/iterator> - -#include <algorithm> -#include <cassert> -#include <cerrno> -#include <cstdlib> -#include <cstring> -#include <map> -#include <memory> -#include <set> -#include <sstream> -#include <utility> - std::string cmGeneratorExpressionNode::EvaluateDependentExpression( std::string const& prop, cmLocalGenerator* lg, cmGeneratorExpressionContext* context, cmGeneratorTarget const* headTarget, diff --git a/Source/cmGeneratorExpressionParser.cxx b/Source/cmGeneratorExpressionParser.cxx index a0b685eff4..d6cc6ab1c6 100644 --- a/Source/cmGeneratorExpressionParser.cxx +++ b/Source/cmGeneratorExpressionParser.cxx @@ -2,13 +2,13 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmGeneratorExpressionParser.h" -#include "cmAlgorithms.h" -#include "cmGeneratorExpressionEvaluator.h" - #include <cassert> #include <cstddef> #include <utility> +#include "cmAlgorithms.h" +#include "cmGeneratorExpressionEvaluator.h" + cmGeneratorExpressionParser::cmGeneratorExpressionParser( std::vector<cmGeneratorExpressionToken> tokens) : Tokens(std::move(tokens)) diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx index 07578cc210..3a48ff6aaf 100644 --- a/Source/cmGeneratorTarget.cxx +++ b/Source/cmGeneratorTarget.cxx @@ -2,7 +2,6 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmGeneratorTarget.h" -#include "cmsys/RegularExpression.hxx" #include <algorithm> #include <cassert> #include <cerrno> @@ -12,13 +11,16 @@ #include <cstring> #include <iterator> #include <memory> -#include <queue> #include <sstream> #include <unordered_set> #include <utility> #include <cm/string_view> +#include <queue> + +#include "cmsys/RegularExpression.hxx" + #include "cmAlgorithms.h" #include "cmComputeLinkInformation.h" #include "cmCustomCommand.h" diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h index 6c36c4b644..27ad6eb4ae 100644 --- a/Source/cmGeneratorTarget.h +++ b/Source/cmGeneratorTarget.h @@ -5,11 +5,6 @@ #include "cmConfigure.h" // IWYU pragma: keep -#include "cmLinkItem.h" -#include "cmListFileCache.h" -#include "cmPolicies.h" -#include "cmStateTypes.h" - #include <cstddef> #include <map> #include <set> @@ -18,6 +13,11 @@ #include <utility> #include <vector> +#include "cmLinkItem.h" +#include "cmListFileCache.h" +#include "cmPolicies.h" +#include "cmStateTypes.h" + class cmComputeLinkInformation; class cmCustomCommand; class cmGlobalGenerator; diff --git a/Source/cmGetPipes.cxx b/Source/cmGetPipes.cxx index 79f90fdf4e..4eda1c54a7 100644 --- a/Source/cmGetPipes.cxx +++ b/Source/cmGetPipes.cxx @@ -2,10 +2,10 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmGetPipes.h" -#include "cm_uv.h" - #include <fcntl.h> +#include "cm_uv.h" + #if defined(_WIN32) && !defined(__CYGWIN__) # include <io.h> @@ -29,6 +29,7 @@ int cmGetPipes(int* fds) } #else # include <cerrno> + # include <unistd.h> int cmGetPipes(int* fds) diff --git a/Source/cmGhsMultiGpj.h b/Source/cmGhsMultiGpj.h index e588150f40..fbbef5d8f7 100644 --- a/Source/cmGhsMultiGpj.h +++ b/Source/cmGhsMultiGpj.h @@ -4,6 +4,7 @@ #define cmGhsMultiGpj_h #include "cmConfigure.h" // IWYU pragma: keep + #include <iosfwd> class GhsMultiGpj diff --git a/Source/cmGhsMultiTargetGenerator.cxx b/Source/cmGhsMultiTargetGenerator.cxx index 09ed76d126..8e4352e29f 100644 --- a/Source/cmGhsMultiTargetGenerator.cxx +++ b/Source/cmGhsMultiTargetGenerator.cxx @@ -2,6 +2,13 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmGhsMultiTargetGenerator.h" +#include <algorithm> +#include <memory> +#include <ostream> +#include <set> +#include <utility> +#include <vector> + #include "cmCustomCommand.h" #include "cmCustomCommandGenerator.h" #include "cmGeneratedFileStream.h" @@ -22,13 +29,6 @@ #include "cmSystemTools.h" #include "cmTarget.h" -#include <algorithm> -#include <memory> -#include <ostream> -#include <set> -#include <utility> -#include <vector> - cmGhsMultiTargetGenerator::cmGhsMultiTargetGenerator(cmGeneratorTarget* target) : GeneratorTarget(target) , LocalGenerator( diff --git a/Source/cmGhsMultiTargetGenerator.h b/Source/cmGhsMultiTargetGenerator.h index a131567c89..f03ca44a20 100644 --- a/Source/cmGhsMultiTargetGenerator.h +++ b/Source/cmGhsMultiTargetGenerator.h @@ -3,14 +3,14 @@ #ifndef cmGhsMultiTargetGenerator_h #define cmGhsMultiTargetGenerator_h -#include "cmGhsMultiGpj.h" - #include <iosfwd> #include <map> #include <set> #include <string> #include <vector> +#include "cmGhsMultiGpj.h" + class cmCustomCommand; class cmCustomCommandGenerator; class cmGeneratorTarget; diff --git a/Source/cmGlobVerificationManager.cxx b/Source/cmGlobVerificationManager.cxx index 72451b2958..481777345a 100644 --- a/Source/cmGlobVerificationManager.cxx +++ b/Source/cmGlobVerificationManager.cxx @@ -2,9 +2,10 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmGlobVerificationManager.h" -#include "cmsys/FStream.hxx" #include <sstream> +#include "cmsys/FStream.hxx" + #include "cmGeneratedFileStream.h" #include "cmListFileCache.h" #include "cmStringAlgorithms.h" diff --git a/Source/cmGlobVerificationManager.h b/Source/cmGlobVerificationManager.h index e03d939d47..2e7e1ca70c 100644 --- a/Source/cmGlobVerificationManager.h +++ b/Source/cmGlobVerificationManager.h @@ -5,14 +5,14 @@ #include "cmConfigure.h" // IWYU pragma: keep -#include "cmListFileCache.h" - #include <iosfwd> #include <map> #include <string> #include <utility> #include <vector> +#include "cmListFileCache.h" + /** \class cmGlobVerificationManager * \brief Class for expressing build-time dependencies on glob expressions. * diff --git a/Source/cmGlobalBorlandMakefileGenerator.h b/Source/cmGlobalBorlandMakefileGenerator.h index ee7de70f6c..da04743ac0 100644 --- a/Source/cmGlobalBorlandMakefileGenerator.h +++ b/Source/cmGlobalBorlandMakefileGenerator.h @@ -3,10 +3,10 @@ #ifndef cmGlobalBorlandMakefileGenerator_h #define cmGlobalBorlandMakefileGenerator_h -#include "cmGlobalNMakeMakefileGenerator.h" - #include <iosfwd> +#include "cmGlobalNMakeMakefileGenerator.h" + /** \class cmGlobalBorlandMakefileGenerator * \brief Write a Borland makefiles. * diff --git a/Source/cmGlobalCommonGenerator.cxx b/Source/cmGlobalCommonGenerator.cxx index 93ff00bfb0..9fa4467b2a 100644 --- a/Source/cmGlobalCommonGenerator.cxx +++ b/Source/cmGlobalCommonGenerator.cxx @@ -2,6 +2,8 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmGlobalCommonGenerator.h" +#include <utility> + #include "cmGeneratorTarget.h" #include "cmLocalGenerator.h" #include "cmStateDirectory.h" @@ -9,8 +11,6 @@ #include "cmStateTypes.h" #include "cmStringAlgorithms.h" -#include <utility> - class cmake; cmGlobalCommonGenerator::cmGlobalCommonGenerator(cmake* cm) diff --git a/Source/cmGlobalCommonGenerator.h b/Source/cmGlobalCommonGenerator.h index de81da7dc1..7d16daca2a 100644 --- a/Source/cmGlobalCommonGenerator.h +++ b/Source/cmGlobalCommonGenerator.h @@ -5,12 +5,12 @@ #include "cmConfigure.h" // IWYU pragma: keep -#include "cmGlobalGenerator.h" - #include <map> #include <string> #include <vector> +#include "cmGlobalGenerator.h" + class cmake; class cmGeneratorTarget; class cmLocalGenerator; diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx index a75e2edd05..d53165cbc7 100644 --- a/Source/cmGlobalGenerator.cxx +++ b/Source/cmGlobalGenerator.cxx @@ -2,8 +2,6 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmGlobalGenerator.h" -#include "cmsys/Directory.hxx" -#include "cmsys/FStream.hxx" #include <algorithm> #include <cassert> #include <cstdio> @@ -13,6 +11,9 @@ #include <iterator> #include <sstream> +#include "cmsys/Directory.hxx" +#include "cmsys/FStream.hxx" + #if defined(_WIN32) && !defined(__CYGWIN__) # include <windows.h> #endif @@ -45,10 +46,11 @@ #include "cmake.h" #if !defined(CMAKE_BOOTSTRAP) -# include "cmCryptoHash.h" -# include "cmQtAutoGenGlobalInitializer.h" # include "cm_jsoncpp_value.h" # include "cm_jsoncpp_writer.h" + +# include "cmCryptoHash.h" +# include "cmQtAutoGenGlobalInitializer.h" #endif #if defined(_MSC_VER) && _MSC_VER >= 1800 diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h index cf9c951f43..28e4d219b5 100644 --- a/Source/cmGlobalGenerator.h +++ b/Source/cmGlobalGenerator.h @@ -14,6 +14,8 @@ #include <utility> #include <vector> +#include "cm_codecvt.hxx" + #include "cmAlgorithms.h" #include "cmCustomCommandLines.h" #include "cmDuration.h" @@ -23,11 +25,11 @@ #include "cmSystemTools.h" #include "cmTarget.h" #include "cmTargetDepend.h" -#include "cm_codecvt.hxx" #if !defined(CMAKE_BOOTSTRAP) -# include "cmFileLockPool.h" # include "cm_jsoncpp_value.h" + +# include "cmFileLockPool.h" #endif #define CMAKE_DIRECTORY_ID_SEP "::@" diff --git a/Source/cmGlobalGhsMultiGenerator.cxx b/Source/cmGlobalGhsMultiGenerator.cxx index 236554f8d2..5a708abbcb 100644 --- a/Source/cmGlobalGhsMultiGenerator.cxx +++ b/Source/cmGlobalGhsMultiGenerator.cxx @@ -2,6 +2,12 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmGlobalGhsMultiGenerator.h" +#include <algorithm> +#include <cstring> +#include <map> +#include <ostream> +#include <utility> + #include "cmAlgorithms.h" #include "cmDocumentationEntry.h" #include "cmGeneratedFileStream.h" @@ -17,12 +23,6 @@ #include "cmVersion.h" #include "cmake.h" -#include <algorithm> -#include <cstring> -#include <map> -#include <ostream> -#include <utility> - const char* cmGlobalGhsMultiGenerator::FILE_EXTENSION = ".gpj"; #ifdef __linux__ const char* cmGlobalGhsMultiGenerator::DEFAULT_BUILD_PROGRAM = "gbuild"; diff --git a/Source/cmGlobalGhsMultiGenerator.h b/Source/cmGlobalGhsMultiGenerator.h index e58e65e96f..ccfe073820 100644 --- a/Source/cmGlobalGhsMultiGenerator.h +++ b/Source/cmGlobalGhsMultiGenerator.h @@ -3,17 +3,16 @@ #ifndef cmGhsMultiGenerator_h #define cmGhsMultiGenerator_h -#include "cmGlobalGenerator.h" - -#include "cmGlobalGeneratorFactory.h" -#include "cmTargetDepend.h" - #include <iosfwd> #include <set> #include <string> #include <utility> #include <vector> +#include "cmGlobalGenerator.h" +#include "cmGlobalGeneratorFactory.h" +#include "cmTargetDepend.h" + class cmGeneratorTarget; class cmLocalGenerator; class cmMakefile; diff --git a/Source/cmGlobalJOMMakefileGenerator.h b/Source/cmGlobalJOMMakefileGenerator.h index df3aec9b4f..fc39ddf427 100644 --- a/Source/cmGlobalJOMMakefileGenerator.h +++ b/Source/cmGlobalJOMMakefileGenerator.h @@ -3,10 +3,10 @@ #ifndef cmGlobalJOMMakefileGenerator_h #define cmGlobalJOMMakefileGenerator_h -#include "cmGlobalUnixMakefileGenerator3.h" - #include <iosfwd> +#include "cmGlobalUnixMakefileGenerator3.h" + /** \class cmGlobalJOMMakefileGenerator * \brief Write a JOM makefiles. * diff --git a/Source/cmGlobalNMakeMakefileGenerator.h b/Source/cmGlobalNMakeMakefileGenerator.h index 2fdf1ce5d0..4586b77b15 100644 --- a/Source/cmGlobalNMakeMakefileGenerator.h +++ b/Source/cmGlobalNMakeMakefileGenerator.h @@ -3,10 +3,10 @@ #ifndef cmGlobalNMakeMakefileGenerator_h #define cmGlobalNMakeMakefileGenerator_h -#include "cmGlobalUnixMakefileGenerator3.h" - #include <iosfwd> +#include "cmGlobalUnixMakefileGenerator3.h" + /** \class cmGlobalNMakeMakefileGenerator * \brief Write a NMake makefiles. * diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx index d8fe25837a..da21d6c2a2 100644 --- a/Source/cmGlobalNinjaGenerator.cxx +++ b/Source/cmGlobalNinjaGenerator.cxx @@ -2,10 +2,6 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmGlobalNinjaGenerator.h" -#include "cm_jsoncpp_reader.h" -#include "cm_jsoncpp_value.h" -#include "cm_jsoncpp_writer.h" -#include "cmsys/FStream.hxx" #include <algorithm> #include <cctype> #include <cstdio> @@ -14,6 +10,12 @@ #include <cm/memory> +#include "cmsys/FStream.hxx" + +#include "cm_jsoncpp_reader.h" +#include "cm_jsoncpp_value.h" +#include "cm_jsoncpp_writer.h" + #include "cmAlgorithms.h" #include "cmDocumentationEntry.h" #include "cmFortranParser.h" diff --git a/Source/cmGlobalNinjaGenerator.h b/Source/cmGlobalNinjaGenerator.h index 1bfbffa15e..244e9fd384 100644 --- a/Source/cmGlobalNinjaGenerator.h +++ b/Source/cmGlobalNinjaGenerator.h @@ -15,12 +15,13 @@ #include <utility> #include <vector> +#include "cm_codecvt.hxx" + #include "cmGeneratedFileStream.h" #include "cmGlobalCommonGenerator.h" #include "cmGlobalGeneratorFactory.h" #include "cmNinjaTypes.h" #include "cmPolicies.h" -#include "cm_codecvt.hxx" class cmCustomCommand; class cmGeneratorTarget; diff --git a/Source/cmGlobalVisualStudio10Generator.cxx b/Source/cmGlobalVisualStudio10Generator.cxx index 7d437f3514..09a49e1e9d 100644 --- a/Source/cmGlobalVisualStudio10Generator.cxx +++ b/Source/cmGlobalVisualStudio10Generator.cxx @@ -2,6 +2,14 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmGlobalVisualStudio10Generator.h" +#include <algorithm> + +#include "cmsys/FStream.hxx" +#include "cmsys/Glob.hxx" +#include "cmsys/RegularExpression.hxx" + +#include "cm_jsoncpp_reader.h" + #include "cmAlgorithms.h" #include "cmDocumentationEntry.h" #include "cmGeneratorTarget.h" @@ -13,15 +21,8 @@ #include "cmVisualStudioSlnData.h" #include "cmVisualStudioSlnParser.h" #include "cmXMLWriter.h" -#include "cm_jsoncpp_reader.h" #include "cmake.h" -#include "cmsys/FStream.hxx" -#include "cmsys/Glob.hxx" -#include "cmsys/RegularExpression.hxx" - -#include <algorithm> - static const char vs10generatorName[] = "Visual Studio 10 2010"; static std::map<std::string, std::vector<cmIDEFlagTable>> loadedFlagJsonFiles; diff --git a/Source/cmGlobalVisualStudio7Generator.cxx b/Source/cmGlobalVisualStudio7Generator.cxx index 0915189742..40b214c032 100644 --- a/Source/cmGlobalVisualStudio7Generator.cxx +++ b/Source/cmGlobalVisualStudio7Generator.cxx @@ -2,6 +2,16 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmGlobalVisualStudio7Generator.h" +#include <vector> + +#include <cm/string_view> + +#include <windows.h> + +#include <assert.h> + +#include "cmsys/Encoding.hxx" + #include "cmGeneratedFileStream.h" #include "cmGeneratorExpression.h" #include "cmGeneratorTarget.h" @@ -12,13 +22,6 @@ #include "cmStringAlgorithms.h" #include "cmUuid.h" #include "cmake.h" -#include "cmsys/Encoding.hxx" - -#include <cm/string_view> - -#include <assert.h> -#include <vector> -#include <windows.h> static cmVS7FlagTable cmVS7ExtraFlagTable[] = { // Precompiled header and related options. Note that the diff --git a/Source/cmGlobalVisualStudio7Generator.h b/Source/cmGlobalVisualStudio7Generator.h index 9b8473271b..7a9fcefa24 100644 --- a/Source/cmGlobalVisualStudio7Generator.h +++ b/Source/cmGlobalVisualStudio7Generator.h @@ -3,9 +3,8 @@ #ifndef cmGlobalVisualStudio7Generator_h #define cmGlobalVisualStudio7Generator_h -#include "cmGlobalVisualStudioGenerator.h" - #include "cmGlobalGeneratorFactory.h" +#include "cmGlobalVisualStudioGenerator.h" class cmTarget; struct cmIDEFlagTable; diff --git a/Source/cmGlobalVisualStudioGenerator.cxx b/Source/cmGlobalVisualStudioGenerator.cxx index 0f939cca01..ed0cba7ddf 100644 --- a/Source/cmGlobalVisualStudioGenerator.cxx +++ b/Source/cmGlobalVisualStudioGenerator.cxx @@ -3,14 +3,17 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmGlobalVisualStudioGenerator.h" -#include "cmsys/Encoding.hxx" #include <future> #include <iostream> + +#include <cm/iterator> + +#include <windows.h> + #include <objbase.h> #include <shellapi.h> -#include <windows.h> -#include <cm/iterator> +#include "cmsys/Encoding.hxx" #include "cmCallVisualStudioMacro.h" #include "cmCustomCommand.h" diff --git a/Source/cmGlobalWatcomWMakeGenerator.cxx b/Source/cmGlobalWatcomWMakeGenerator.cxx index 8a27384311..308ddda736 100644 --- a/Source/cmGlobalWatcomWMakeGenerator.cxx +++ b/Source/cmGlobalWatcomWMakeGenerator.cxx @@ -2,14 +2,14 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmGlobalWatcomWMakeGenerator.h" +#include <ostream> + #include "cmDocumentationEntry.h" #include "cmGlobalGenerator.h" #include "cmMakefile.h" #include "cmState.h" #include "cmake.h" -#include <ostream> - cmGlobalWatcomWMakeGenerator::cmGlobalWatcomWMakeGenerator(cmake* cm) : cmGlobalUnixMakefileGenerator3(cm) { diff --git a/Source/cmGlobalWatcomWMakeGenerator.h b/Source/cmGlobalWatcomWMakeGenerator.h index 3ca5e7d864..64ace13597 100644 --- a/Source/cmGlobalWatcomWMakeGenerator.h +++ b/Source/cmGlobalWatcomWMakeGenerator.h @@ -5,13 +5,13 @@ #include "cmConfigure.h" // IWYU pragma: keep -#include "cmGlobalGeneratorFactory.h" -#include "cmGlobalUnixMakefileGenerator3.h" - #include <iosfwd> #include <string> #include <vector> +#include "cmGlobalGeneratorFactory.h" +#include "cmGlobalUnixMakefileGenerator3.h" + class cmMakefile; class cmake; struct cmDocumentationEntry; diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx index f42218bac2..f23e28d53b 100644 --- a/Source/cmGlobalXCodeGenerator.cxx +++ b/Source/cmGlobalXCodeGenerator.cxx @@ -2,7 +2,6 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmGlobalXCodeGenerator.h" -#include "cmsys/RegularExpression.hxx" #include <cassert> #include <cstdio> #include <cstring> @@ -11,6 +10,8 @@ #include <cm/memory> +#include "cmsys/RegularExpression.hxx" + #include "cmAlgorithms.h" #include "cmComputeLinkInformation.h" #include "cmCustomCommand.h" diff --git a/Source/cmGraphAdjacencyList.h b/Source/cmGraphAdjacencyList.h index 5ca9269ed7..5ed6af4613 100644 --- a/Source/cmGraphAdjacencyList.h +++ b/Source/cmGraphAdjacencyList.h @@ -5,11 +5,11 @@ #include "cmConfigure.h" // IWYU pragma: keep -#include "cmListFileCache.h" - #include <utility> #include <vector> +#include "cmListFileCache.h" + /** * Graph edge representation. Most use cases just need the * destination vertex, so we support conversion to/from an int. We diff --git a/Source/cmGraphVizWriter.h b/Source/cmGraphVizWriter.h index 768683a3b8..9c3051f2c1 100644 --- a/Source/cmGraphVizWriter.h +++ b/Source/cmGraphVizWriter.h @@ -5,14 +5,15 @@ #include "cmConfigure.h" // IWYU pragma: keep -#include "cmStateTypes.h" - -#include "cmsys/RegularExpression.hxx" #include <map> #include <set> #include <string> #include <vector> +#include "cmsys/RegularExpression.hxx" + +#include "cmStateTypes.h" + class cmGeneratedFileStream; class cmGeneratorTarget; class cmLocalGenerator; diff --git a/Source/cmHexFileConverter.h b/Source/cmHexFileConverter.h index cb5de8f346..26f9ea8ba0 100644 --- a/Source/cmHexFileConverter.h +++ b/Source/cmHexFileConverter.h @@ -4,6 +4,7 @@ #define cmHexFileConverter_h #include "cmConfigure.h" // IWYU pragma: keep + #include <string> /** \class cmHexFileConverter diff --git a/Source/cmIDEOptions.cxx b/Source/cmIDEOptions.cxx index e80aa8e7f4..71326d23ad 100644 --- a/Source/cmIDEOptions.cxx +++ b/Source/cmIDEOptions.cxx @@ -2,10 +2,12 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmIDEOptions.h" -#include "cmsys/String.h" #include <iterator> + #include <string.h> +#include "cmsys/String.h" + #include "cmAlgorithms.h" #include "cmIDEFlagTable.h" #include "cmStringAlgorithms.h" diff --git a/Source/cmIfCommand.cxx b/Source/cmIfCommand.cxx index b36d96b0f7..290e064b46 100644 --- a/Source/cmIfCommand.cxx +++ b/Source/cmIfCommand.cxx @@ -2,6 +2,9 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmIfCommand.h" +#include <string> +#include <utility> + #include <cm/memory> #include <cm/string_view> @@ -19,9 +22,6 @@ #include "cmSystemTools.h" #include "cmake.h" -#include <string> -#include <utility> - static std::string cmIfCommandError( std::vector<cmExpandedCommandArgument> const& args) { diff --git a/Source/cmInstallCommand.cxx b/Source/cmInstallCommand.cxx index 27d0dfbfc8..0c52cc5b7e 100644 --- a/Source/cmInstallCommand.cxx +++ b/Source/cmInstallCommand.cxx @@ -2,14 +2,17 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmInstallCommand.h" -#include "cm_static_string_view.hxx" -#include "cmsys/Glob.hxx" -#include <cm/memory> #include <cstddef> #include <set> #include <sstream> #include <utility> +#include <cm/memory> + +#include "cmsys/Glob.hxx" + +#include "cm_static_string_view.hxx" + #include "cmArgumentParser.h" #include "cmExecutionStatus.h" #include "cmExportSet.h" diff --git a/Source/cmInstallCommandArguments.cxx b/Source/cmInstallCommandArguments.cxx index 8b33782ae2..31ba63f2ca 100644 --- a/Source/cmInstallCommandArguments.cxx +++ b/Source/cmInstallCommandArguments.cxx @@ -2,11 +2,12 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmInstallCommandArguments.h" -#include "cmRange.h" -#include "cmSystemTools.h" +#include <utility> + #include "cm_static_string_view.hxx" -#include <utility> +#include "cmRange.h" +#include "cmSystemTools.h" // Table of valid permissions. const char* cmInstallCommandArguments::PermissionsTable[] = { diff --git a/Source/cmInstallDirectoryGenerator.h b/Source/cmInstallDirectoryGenerator.h index e30849f831..84c06948e8 100644 --- a/Source/cmInstallDirectoryGenerator.h +++ b/Source/cmInstallDirectoryGenerator.h @@ -3,15 +3,15 @@ #ifndef cmInstallDirectoryGenerator_h #define cmInstallDirectoryGenerator_h -#include "cmInstallGenerator.h" -#include "cmScriptGenerator.h" - #include "cmConfigure.h" // IWYU pragma: keep #include <iosfwd> #include <string> #include <vector> +#include "cmInstallGenerator.h" +#include "cmScriptGenerator.h" + class cmLocalGenerator; /** \class cmInstallDirectoryGenerator diff --git a/Source/cmInstallExportGenerator.h b/Source/cmInstallExportGenerator.h index 3b9268a29f..f44127e3d9 100644 --- a/Source/cmInstallExportGenerator.h +++ b/Source/cmInstallExportGenerator.h @@ -5,14 +5,14 @@ #include "cmConfigure.h" // IWYU pragma: keep -#include "cmInstallGenerator.h" -#include "cmScriptGenerator.h" - #include <cstddef> #include <iosfwd> #include <string> #include <vector> +#include "cmInstallGenerator.h" +#include "cmScriptGenerator.h" + class cmExportInstallFileGenerator; class cmExportSet; class cmLocalGenerator; diff --git a/Source/cmInstallFilesGenerator.h b/Source/cmInstallFilesGenerator.h index ac462d46fa..a6800375bb 100644 --- a/Source/cmInstallFilesGenerator.h +++ b/Source/cmInstallFilesGenerator.h @@ -5,13 +5,13 @@ #include "cmConfigure.h" // IWYU pragma: keep -#include "cmInstallGenerator.h" -#include "cmScriptGenerator.h" - #include <iosfwd> #include <string> #include <vector> +#include "cmInstallGenerator.h" +#include "cmScriptGenerator.h" + class cmLocalGenerator; /** \class cmInstallFilesGenerator diff --git a/Source/cmInstallGenerator.cxx b/Source/cmInstallGenerator.cxx index 2ffca30f62..ec173619fb 100644 --- a/Source/cmInstallGenerator.cxx +++ b/Source/cmInstallGenerator.cxx @@ -2,11 +2,11 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmInstallGenerator.h" +#include <ostream> + #include "cmMakefile.h" #include "cmSystemTools.h" -#include <ostream> - cmInstallGenerator::cmInstallGenerator( const char* destination, std::vector<std::string> const& configurations, const char* component, MessageLevel message, bool exclude_from_all) diff --git a/Source/cmInstallGenerator.h b/Source/cmInstallGenerator.h index dbe707d1d5..024027d4db 100644 --- a/Source/cmInstallGenerator.h +++ b/Source/cmInstallGenerator.h @@ -5,13 +5,13 @@ #include "cmConfigure.h" // IWYU pragma: keep -#include "cmInstallType.h" -#include "cmScriptGenerator.h" - #include <iosfwd> #include <string> #include <vector> +#include "cmInstallType.h" +#include "cmScriptGenerator.h" + class cmLocalGenerator; class cmMakefile; diff --git a/Source/cmInstallScriptGenerator.h b/Source/cmInstallScriptGenerator.h index 6af7371131..7efa321691 100644 --- a/Source/cmInstallScriptGenerator.h +++ b/Source/cmInstallScriptGenerator.h @@ -5,12 +5,12 @@ #include "cmConfigure.h" // IWYU pragma: keep -#include "cmInstallGenerator.h" -#include "cmScriptGenerator.h" - #include <iosfwd> #include <string> +#include "cmInstallGenerator.h" +#include "cmScriptGenerator.h" + class cmLocalGenerator; /** \class cmInstallScriptGenerator diff --git a/Source/cmInstallSubdirectoryGenerator.cxx b/Source/cmInstallSubdirectoryGenerator.cxx index 1c0512ce5f..8a0fefac2e 100644 --- a/Source/cmInstallSubdirectoryGenerator.cxx +++ b/Source/cmInstallSubdirectoryGenerator.cxx @@ -2,15 +2,15 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmInstallSubdirectoryGenerator.h" +#include <sstream> +#include <vector> + #include "cmLocalGenerator.h" #include "cmMakefile.h" #include "cmPolicies.h" #include "cmScriptGenerator.h" #include "cmSystemTools.h" -#include <sstream> -#include <vector> - cmInstallSubdirectoryGenerator::cmInstallSubdirectoryGenerator( cmMakefile* makefile, const char* binaryDirectory, bool excludeFromAll) : cmInstallGenerator(nullptr, std::vector<std::string>(), nullptr, diff --git a/Source/cmInstallSubdirectoryGenerator.h b/Source/cmInstallSubdirectoryGenerator.h index 22759d9485..b99bdd5ff8 100644 --- a/Source/cmInstallSubdirectoryGenerator.h +++ b/Source/cmInstallSubdirectoryGenerator.h @@ -5,11 +5,11 @@ #include "cmConfigure.h" // IWYU pragma: keep -#include "cmInstallGenerator.h" - #include <iosfwd> #include <string> +#include "cmInstallGenerator.h" + class cmLocalGenerator; class cmMakefile; diff --git a/Source/cmInstallTargetGenerator.h b/Source/cmInstallTargetGenerator.h index 3097bec00f..8730454b12 100644 --- a/Source/cmInstallTargetGenerator.h +++ b/Source/cmInstallTargetGenerator.h @@ -5,14 +5,14 @@ #include "cmConfigure.h" // IWYU pragma: keep -#include "cmInstallGenerator.h" -#include "cmListFileCache.h" -#include "cmScriptGenerator.h" - #include <iosfwd> #include <string> #include <vector> +#include "cmInstallGenerator.h" +#include "cmListFileCache.h" +#include "cmScriptGenerator.h" + class cmGeneratorTarget; class cmLocalGenerator; diff --git a/Source/cmInstalledFile.cxx b/Source/cmInstalledFile.cxx index 7d98b90e23..eabe5903bd 100644 --- a/Source/cmInstalledFile.cxx +++ b/Source/cmInstalledFile.cxx @@ -2,14 +2,14 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmInstalledFile.h" +#include <utility> + #include "cmAlgorithms.h" #include "cmGeneratorExpression.h" #include "cmListFileCache.h" #include "cmMakefile.h" #include "cmStringAlgorithms.h" -#include <utility> - cmInstalledFile::cmInstalledFile() = default; cmInstalledFile::~cmInstalledFile() diff --git a/Source/cmJsonObjects.cxx b/Source/cmJsonObjects.cxx index 79180cb9af..b23ab43d82 100644 --- a/Source/cmJsonObjects.cxx +++ b/Source/cmJsonObjects.cxx @@ -2,6 +2,18 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmJsonObjects.h" // IWYU pragma: keep +#include <algorithm> +#include <cassert> +#include <cstddef> +#include <functional> +#include <limits> +#include <map> +#include <set> +#include <string> +#include <unordered_map> +#include <utility> +#include <vector> + #include "cmAlgorithms.h" #include "cmGeneratorExpression.h" #include "cmGeneratorTarget.h" @@ -26,18 +38,6 @@ #include "cmTest.h" #include "cmake.h" -#include <algorithm> -#include <cassert> -#include <cstddef> -#include <functional> -#include <limits> -#include <map> -#include <set> -#include <string> -#include <unordered_map> -#include <utility> -#include <vector> - namespace { std::vector<std::string> getConfigurations(const cmake* cm) diff --git a/Source/cmJsonObjects.h b/Source/cmJsonObjects.h index cd4da94f41..64291cc066 100644 --- a/Source/cmJsonObjects.h +++ b/Source/cmJsonObjects.h @@ -5,11 +5,11 @@ #include "cmConfigure.h" // IWYU pragma: keep -#include "cm_jsoncpp_value.h" - #include <string> #include <vector> +#include "cm_jsoncpp_value.h" + class cmake; class cmGlobalGenerator; diff --git a/Source/cmLDConfigLDConfigTool.cxx b/Source/cmLDConfigLDConfigTool.cxx index b68dbbdf8a..cce6178dae 100644 --- a/Source/cmLDConfigLDConfigTool.cxx +++ b/Source/cmLDConfigLDConfigTool.cxx @@ -2,18 +2,19 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmLDConfigLDConfigTool.h" + +#include <istream> +#include <string> +#include <vector> + +#include "cmsys/RegularExpression.hxx" + #include "cmMakefile.h" #include "cmRuntimeDependencyArchive.h" #include "cmStringAlgorithms.h" #include "cmSystemTools.h" #include "cmUVProcessChain.h" -#include "cmsys/RegularExpression.hxx" - -#include <istream> -#include <string> -#include <vector> - cmLDConfigLDConfigTool::cmLDConfigLDConfigTool( cmRuntimeDependencyArchive* archive) : cmLDConfigTool(archive) diff --git a/Source/cmLDConfigLDConfigTool.h b/Source/cmLDConfigLDConfigTool.h index d945a9bb7d..34bf6c61fc 100644 --- a/Source/cmLDConfigLDConfigTool.h +++ b/Source/cmLDConfigLDConfigTool.h @@ -4,11 +4,11 @@ #ifndef cmLDConfigLDConfigTool_h #define cmLDConfigLDConfigTool_h -#include "cmLDConfigTool.h" - #include <string> #include <vector> +#include "cmLDConfigTool.h" + class cmRuntimeDependencyArchive; class cmLDConfigLDConfigTool : public cmLDConfigTool diff --git a/Source/cmLinkItem.cxx b/Source/cmLinkItem.cxx index 9b03ad011e..91eb183379 100644 --- a/Source/cmLinkItem.cxx +++ b/Source/cmLinkItem.cxx @@ -2,10 +2,10 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmLinkItem.h" -#include "cmGeneratorTarget.h" - #include <utility> // IWYU pragma: keep +#include "cmGeneratorTarget.h" + cmLinkItem::cmLinkItem() = default; cmLinkItem::cmLinkItem(std::string n, cmListFileBacktrace bt) diff --git a/Source/cmListCommand.cxx b/Source/cmListCommand.cxx index 7bf35c350d..5200a160fe 100644 --- a/Source/cmListCommand.cxx +++ b/Source/cmListCommand.cxx @@ -2,7 +2,6 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmListCommand.h" -#include "cmsys/RegularExpression.hxx" #include <algorithm> #include <cassert> #include <cstddef> @@ -18,6 +17,8 @@ #include <cm/memory> +#include "cmsys/RegularExpression.hxx" + #include "cm_static_string_view.hxx" #include "cmAlgorithms.h" diff --git a/Source/cmListFileCache.cxx b/Source/cmListFileCache.cxx index ab53df6e4e..47679c9322 100644 --- a/Source/cmListFileCache.cxx +++ b/Source/cmListFileCache.cxx @@ -2,6 +2,11 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmListFileCache.h" +#include <cassert> +#include <memory> +#include <sstream> +#include <utility> + #include "cmListFileLexer.h" #include "cmMessageType.h" #include "cmMessenger.h" @@ -10,11 +15,6 @@ #include "cmStringAlgorithms.h" #include "cmSystemTools.h" -#include <cassert> -#include <memory> -#include <sstream> -#include <utility> - cmCommandContext::cmCommandName& cmCommandContext::cmCommandName::operator=( std::string const& name) { diff --git a/Source/cmLoadCacheCommand.cxx b/Source/cmLoadCacheCommand.cxx index cca16336d1..1184bcb583 100644 --- a/Source/cmLoadCacheCommand.cxx +++ b/Source/cmLoadCacheCommand.cxx @@ -2,9 +2,10 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmLoadCacheCommand.h" -#include "cmsys/FStream.hxx" #include <set> +#include "cmsys/FStream.hxx" + #include "cmExecutionStatus.h" #include "cmMakefile.h" #include "cmStateTypes.h" diff --git a/Source/cmLoadCommandCommand.cxx b/Source/cmLoadCommandCommand.cxx index 1e026327dc..23ace649a8 100644 --- a/Source/cmLoadCommandCommand.cxx +++ b/Source/cmLoadCommandCommand.cxx @@ -3,16 +3,13 @@ #include "cmLoadCommandCommand.h" #include <csignal> - #include <cstdio> #include <cstdlib> #include <cstring> - #include <utility> #include <cm/memory> -#include "cmCPluginAPI.cxx" #include "cmCPluginAPI.h" #include "cmCommand.h" #include "cmDynamicLoader.h" @@ -22,6 +19,8 @@ #include "cmStringAlgorithms.h" #include "cmSystemTools.h" +#include "cmCPluginAPI.cxx" + #ifdef __QNX__ # include <malloc.h> /* for malloc/free on QNX */ #endif diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx index 6e6ca51f65..154d509cd2 100644 --- a/Source/cmLocalGenerator.cxx +++ b/Source/cmLocalGenerator.cxx @@ -2,6 +2,8 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmLocalGenerator.h" +#include "cmsys/RegularExpression.hxx" + #include "cmAlgorithms.h" #include "cmComputeLinkInformation.h" #include "cmCustomCommand.h" @@ -32,15 +34,12 @@ #include "cmTestGenerator.h" #include "cmVersion.h" #include "cmake.h" -#include "cmsys/RegularExpression.hxx" #if !defined(CMAKE_BOOTSTRAP) # define CM_LG_ENCODE_OBJECT_NAMES # include "cmCryptoHash.h" #endif -#include <cm/string_view> - #include <algorithm> #include <cassert> #include <cstdio> @@ -54,6 +53,8 @@ #include <utility> #include <vector> +#include <cm/string_view> + #if defined(__HAIKU__) # include <FindDirectory.h> # include <StorageDefs.h> diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h index 512df2691b..f1507335ef 100644 --- a/Source/cmLocalGenerator.h +++ b/Source/cmLocalGenerator.h @@ -5,7 +5,6 @@ #include "cmConfigure.h" // IWYU pragma: keep -#include "cm_kwiml.h" #include <iosfwd> #include <map> #include <set> @@ -13,6 +12,8 @@ #include <unordered_map> #include <vector> +#include "cm_kwiml.h" + #include "cmListFileCache.h" #include "cmMessageType.h" #include "cmOutputConverter.h" diff --git a/Source/cmLocalGhsMultiGenerator.cxx b/Source/cmLocalGhsMultiGenerator.cxx index b00dda10f2..4b10798e1f 100644 --- a/Source/cmLocalGhsMultiGenerator.cxx +++ b/Source/cmLocalGhsMultiGenerator.cxx @@ -2,6 +2,9 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmLocalGhsMultiGenerator.h" +#include <algorithm> +#include <utility> + #include "cmGeneratorTarget.h" #include "cmGhsMultiTargetGenerator.h" #include "cmGlobalGenerator.h" @@ -10,9 +13,6 @@ #include "cmStringAlgorithms.h" #include "cmSystemTools.h" -#include <algorithm> -#include <utility> - cmLocalGhsMultiGenerator::cmLocalGhsMultiGenerator(cmGlobalGenerator* gg, cmMakefile* mf) : cmLocalGenerator(gg, mf) diff --git a/Source/cmLocalGhsMultiGenerator.h b/Source/cmLocalGhsMultiGenerator.h index b6ccd08153..2250e5745c 100644 --- a/Source/cmLocalGhsMultiGenerator.h +++ b/Source/cmLocalGhsMultiGenerator.h @@ -3,12 +3,12 @@ #ifndef cmLocalGhsMultiGenerator_h #define cmLocalGhsMultiGenerator_h -#include "cmLocalGenerator.h" - #include <map> #include <string> #include <vector> +#include "cmLocalGenerator.h" + class cmGeneratorTarget; class cmGlobalGenerator; class cmMakefile; diff --git a/Source/cmLocalNinjaGenerator.cxx b/Source/cmLocalNinjaGenerator.cxx index 187a8472e9..134bbe18af 100644 --- a/Source/cmLocalNinjaGenerator.cxx +++ b/Source/cmLocalNinjaGenerator.cxx @@ -10,6 +10,8 @@ #include <sstream> #include <utility> +#include "cmsys/FStream.hxx" + #include "cmCryptoHash.h" #include "cmCustomCommand.h" #include "cmCustomCommandGenerator.h" @@ -28,7 +30,6 @@ #include "cmStringAlgorithms.h" #include "cmSystemTools.h" #include "cmake.h" -#include "cmsys/FStream.hxx" cmLocalNinjaGenerator::cmLocalNinjaGenerator(cmGlobalGenerator* gg, cmMakefile* mf) diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx index c50989efe0..4a70248d6f 100644 --- a/Source/cmLocalUnixMakefileGenerator3.cxx +++ b/Source/cmLocalUnixMakefileGenerator3.cxx @@ -2,8 +2,6 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmLocalUnixMakefileGenerator3.h" -#include "cmsys/FStream.hxx" -#include "cmsys/Terminal.h" #include <algorithm> #include <cstdio> #include <sstream> @@ -11,6 +9,9 @@ #include <cm/memory> +#include "cmsys/FStream.hxx" +#include "cmsys/Terminal.h" + #include "cmAlgorithms.h" #include "cmCustomCommand.h" // IWYU pragma: keep #include "cmCustomCommandGenerator.h" diff --git a/Source/cmLocalUnixMakefileGenerator3.h b/Source/cmLocalUnixMakefileGenerator3.h index f2295eff00..f12ae8b161 100644 --- a/Source/cmLocalUnixMakefileGenerator3.h +++ b/Source/cmLocalUnixMakefileGenerator3.h @@ -5,9 +5,6 @@ #include "cmConfigure.h" // IWYU pragma: keep -#include "cmDepends.h" -#include "cmLocalCommonGenerator.h" - #include <iosfwd> #include <map> #include <set> @@ -15,6 +12,9 @@ #include <utility> #include <vector> +#include "cmDepends.h" +#include "cmLocalCommonGenerator.h" + class cmCustomCommand; class cmCustomCommandGenerator; class cmGeneratorTarget; diff --git a/Source/cmLocalVisualStudio10Generator.cxx b/Source/cmLocalVisualStudio10Generator.cxx index 6d7b3590c4..f3d828b28e 100644 --- a/Source/cmLocalVisualStudio10Generator.cxx +++ b/Source/cmLocalVisualStudio10Generator.cxx @@ -2,6 +2,8 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmLocalVisualStudio10Generator.h" +#include "cm_expat.h" + #include "cmGeneratorTarget.h" #include "cmGlobalVisualStudio10Generator.h" #include "cmMakefile.h" @@ -9,8 +11,6 @@ #include "cmXMLParser.h" #include "cmake.h" -#include "cm_expat.h" - class cmVS10XMLParser : public cmXMLParser { public: diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx index 026f494ffe..6b0f802006 100644 --- a/Source/cmLocalVisualStudio7Generator.cxx +++ b/Source/cmLocalVisualStudio7Generator.cxx @@ -2,8 +2,16 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmLocalVisualStudio7Generator.h" +#include <windows.h> + +#include <ctype.h> // for isspace + +#include "cm_expat.h" + +#include "cmComputeLinkInformation.h" #include "cmCustomCommand.h" #include "cmCustomCommandGenerator.h" +#include "cmGeneratedFileStream.h" #include "cmGeneratorExpression.h" #include "cmGeneratorTarget.h" #include "cmGlobalVisualStudio7Generator.h" @@ -12,15 +20,8 @@ #include "cmSourceFile.h" #include "cmSystemTools.h" #include "cmXMLParser.h" -#include "cm_expat.h" #include "cmake.h" -#include "cmComputeLinkInformation.h" -#include "cmGeneratedFileStream.h" - -#include <ctype.h> // for isspace -#include <windows.h> - static bool cmLVS7G_IsFAT(const char* dir); class cmLocalVisualStudio7GeneratorInternals diff --git a/Source/cmLocalVisualStudioGenerator.cxx b/Source/cmLocalVisualStudioGenerator.cxx index cec9c02c40..336e3a5a17 100644 --- a/Source/cmLocalVisualStudioGenerator.cxx +++ b/Source/cmLocalVisualStudioGenerator.cxx @@ -2,6 +2,8 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmLocalVisualStudioGenerator.h" +#include "windows.h" + #include "cmCustomCommand.h" #include "cmCustomCommandGenerator.h" #include "cmGeneratorTarget.h" @@ -9,7 +11,6 @@ #include "cmMakefile.h" #include "cmSourceFile.h" #include "cmSystemTools.h" -#include "windows.h" cmLocalVisualStudioGenerator::cmLocalVisualStudioGenerator( cmGlobalGenerator* gg, cmMakefile* mf) diff --git a/Source/cmMachO.cxx b/Source/cmMachO.cxx index ee5eb0028f..6cbed36d95 100644 --- a/Source/cmMachO.cxx +++ b/Source/cmMachO.cxx @@ -2,15 +2,16 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmMachO.h" -#include "cmAlgorithms.h" -#include "cmsys/FStream.hxx" - #include <cstddef> #include <string> #include <vector> #include <cm/memory> +#include "cmsys/FStream.hxx" + +#include "cmAlgorithms.h" + // Include the Mach-O format information system header. #include <mach-o/fat.h> #include <mach-o/loader.h> diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index d9fbe9d1ce..f143ef704f 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -1,9 +1,9 @@ /* Distributed under the OSI-approved BSD 3-Clause License. See accompanying file Copyright.txt or https://cmake.org/licensing for details. */ +#include "cmConfigure.h" // IWYU pragma: keep + #include "cmMakefile.h" -#include "cmsys/FStream.hxx" -#include "cmsys/RegularExpression.hxx" #include <algorithm> #include <cassert> #include <cctype> @@ -16,6 +16,11 @@ #include <cm/iterator> #include <cm/memory> +#include "cmsys/FStream.hxx" +#include "cmsys/RegularExpression.hxx" + +#include "cm_sys_stat.h" + #include "cmAlgorithms.h" #include "cmCommandArgumentParserHelper.h" #include "cmCustomCommand.h" @@ -46,11 +51,8 @@ #include "cmTestGenerator.h" // IWYU pragma: keep #include "cmVersion.h" #include "cmWorkingDirectory.h" -#include "cm_sys_stat.h" #include "cmake.h" -#include "cmConfigure.h" // IWYU pragma: keep - #ifndef CMAKE_BOOTSTRAP # include "cmVariableWatch.h" #endif diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h index 3a17aaf703..6e59494049 100644 --- a/Source/cmMakefile.h +++ b/Source/cmMakefile.h @@ -5,7 +5,6 @@ #include "cmConfigure.h" // IWYU pragma: keep -#include "cmsys/RegularExpression.hxx" #include <cstddef> #include <deque> #include <functional> @@ -19,6 +18,8 @@ #include <cm/string_view> +#include "cmsys/RegularExpression.hxx" + #include "cmAlgorithms.h" #include "cmCustomCommandTypes.h" #include "cmListFileCache.h" diff --git a/Source/cmMakefileLibraryTargetGenerator.h b/Source/cmMakefileLibraryTargetGenerator.h index 35e43277dd..ca22b099d5 100644 --- a/Source/cmMakefileLibraryTargetGenerator.h +++ b/Source/cmMakefileLibraryTargetGenerator.h @@ -5,10 +5,10 @@ #include "cmConfigure.h" // IWYU pragma: keep -#include "cmMakefileTargetGenerator.h" - #include <string> +#include "cmMakefileTargetGenerator.h" + class cmGeneratorTarget; class cmMakefileLibraryTargetGenerator : public cmMakefileTargetGenerator diff --git a/Source/cmMathCommand.cxx b/Source/cmMathCommand.cxx index 4ea36386ee..f11b906d46 100644 --- a/Source/cmMathCommand.cxx +++ b/Source/cmMathCommand.cxx @@ -2,13 +2,14 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmMathCommand.h" +#include <cstdio> + +#include "cm_kwiml.h" + #include "cmExecutionStatus.h" #include "cmExprParserHelper.h" #include "cmMakefile.h" #include "cmMessageType.h" -#include "cm_kwiml.h" - -#include <cstdio> namespace { bool HandleExprCommand(std::vector<std::string> const& args, diff --git a/Source/cmMessageCommand.cxx b/Source/cmMessageCommand.cxx index 39b40b8b0e..96a6386bf1 100644 --- a/Source/cmMessageCommand.cxx +++ b/Source/cmMessageCommand.cxx @@ -2,6 +2,8 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmMessageCommand.h" +#include <cassert> + #include "cmExecutionStatus.h" #include "cmMakefile.h" #include "cmMessageType.h" @@ -11,8 +13,6 @@ #include "cmSystemTools.h" #include "cmake.h" -#include <cassert> - // cmLibraryCommand bool cmMessageCommand(std::vector<std::string> const& args, cmExecutionStatus& status) diff --git a/Source/cmMessenger.h b/Source/cmMessenger.h index cf15adfc1b..8c097827eb 100644 --- a/Source/cmMessenger.h +++ b/Source/cmMessenger.h @@ -5,11 +5,11 @@ #include "cmConfigure.h" // IWYU pragma: keep +#include <string> + #include "cmListFileCache.h" #include "cmMessageType.h" -#include <string> - class cmMessenger { public: diff --git a/Source/cmNinjaNormalTargetGenerator.h b/Source/cmNinjaNormalTargetGenerator.h index 14991a286e..ebc1268232 100644 --- a/Source/cmNinjaNormalTargetGenerator.h +++ b/Source/cmNinjaNormalTargetGenerator.h @@ -5,12 +5,12 @@ #include "cmConfigure.h" // IWYU pragma: keep -#include "cmGeneratorTarget.h" -#include "cmNinjaTargetGenerator.h" - #include <string> #include <vector> +#include "cmGeneratorTarget.h" +#include "cmNinjaTargetGenerator.h" + class cmNinjaNormalTargetGenerator : public cmNinjaTargetGenerator { public: diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx index 613e7aaa0e..0fda47eece 100644 --- a/Source/cmNinjaTargetGenerator.cxx +++ b/Source/cmNinjaTargetGenerator.cxx @@ -2,8 +2,6 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmNinjaTargetGenerator.h" -#include "cm_jsoncpp_value.h" -#include "cm_jsoncpp_writer.h" #include <algorithm> #include <cassert> #include <iterator> @@ -13,6 +11,9 @@ #include <cm/memory> +#include "cm_jsoncpp_value.h" +#include "cm_jsoncpp_writer.h" + #include "cmAlgorithms.h" #include "cmComputeLinkInformation.h" #include "cmCustomCommandGenerator.h" diff --git a/Source/cmNinjaTargetGenerator.h b/Source/cmNinjaTargetGenerator.h index e304bc7023..4627bcdc6f 100644 --- a/Source/cmNinjaTargetGenerator.h +++ b/Source/cmNinjaTargetGenerator.h @@ -5,6 +5,12 @@ #include "cmConfigure.h" // IWYU pragma: keep +#include <map> +#include <memory> +#include <set> +#include <string> +#include <vector> + #include "cm_jsoncpp_value.h" #include "cmCommonTargetGenerator.h" @@ -12,12 +18,6 @@ #include "cmNinjaTypes.h" #include "cmOSXBundleGenerator.h" -#include <map> -#include <memory> -#include <set> -#include <string> -#include <vector> - class cmCustomCommand; class cmGeneratedFileStream; class cmGeneratorTarget; diff --git a/Source/cmNinjaUtilityTargetGenerator.cxx b/Source/cmNinjaUtilityTargetGenerator.cxx index eea4c93f5f..5259037bfd 100644 --- a/Source/cmNinjaUtilityTargetGenerator.cxx +++ b/Source/cmNinjaUtilityTargetGenerator.cxx @@ -2,6 +2,13 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmNinjaUtilityTargetGenerator.h" +#include <algorithm> +#include <array> +#include <iterator> +#include <string> +#include <utility> +#include <vector> + #include "cmCustomCommand.h" #include "cmCustomCommandGenerator.h" #include "cmGeneratedFileStream.h" @@ -16,13 +23,6 @@ #include "cmStringAlgorithms.h" #include "cmSystemTools.h" -#include <algorithm> -#include <array> -#include <iterator> -#include <string> -#include <utility> -#include <vector> - cmNinjaUtilityTargetGenerator::cmNinjaUtilityTargetGenerator( cmGeneratorTarget* target) : cmNinjaTargetGenerator(target) diff --git a/Source/cmOSXBundleGenerator.cxx b/Source/cmOSXBundleGenerator.cxx index 6175c1e658..a6f4e512ea 100644 --- a/Source/cmOSXBundleGenerator.cxx +++ b/Source/cmOSXBundleGenerator.cxx @@ -2,6 +2,9 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmOSXBundleGenerator.h" +#include <cassert> +#include <utility> + #include "cmGeneratorTarget.h" #include "cmLocalGenerator.h" #include "cmMakefile.h" @@ -10,9 +13,6 @@ #include "cmSystemTools.h" #include "cmTarget.h" -#include <cassert> -#include <utility> - class cmSourceFile; cmOSXBundleGenerator::cmOSXBundleGenerator(cmGeneratorTarget* target, diff --git a/Source/cmOrderDirectories.cxx b/Source/cmOrderDirectories.cxx index 916a9f7285..073222cd80 100644 --- a/Source/cmOrderDirectories.cxx +++ b/Source/cmOrderDirectories.cxx @@ -2,6 +2,12 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmOrderDirectories.h" +#include <algorithm> +#include <cassert> +#include <functional> +#include <sstream> +#include <vector> + #include "cmAlgorithms.h" #include "cmGeneratorTarget.h" #include "cmGlobalGenerator.h" @@ -10,12 +16,6 @@ #include "cmSystemTools.h" #include "cmake.h" -#include <algorithm> -#include <cassert> -#include <functional> -#include <sstream> -#include <vector> - /* Directory ordering computation. - Useful to compute a safe runtime library path order diff --git a/Source/cmOrderDirectories.h b/Source/cmOrderDirectories.h index 2dfc4d12e6..23c5145009 100644 --- a/Source/cmOrderDirectories.h +++ b/Source/cmOrderDirectories.h @@ -5,13 +5,14 @@ #include "cmConfigure.h" // IWYU pragma: keep -#include "cmsys/RegularExpression.hxx" #include <map> #include <set> #include <string> #include <utility> #include <vector> +#include "cmsys/RegularExpression.hxx" + class cmGeneratorTarget; class cmGlobalGenerator; class cmOrderDirectoriesConstraint; diff --git a/Source/cmOutputConverter.h b/Source/cmOutputConverter.h index c2053c7a91..349a069d61 100644 --- a/Source/cmOutputConverter.h +++ b/Source/cmOutputConverter.h @@ -5,11 +5,11 @@ #include "cmConfigure.h" // IWYU pragma: keep -#include "cmStateSnapshot.h" +#include <string> #include <cm/string_view> -#include <string> +#include "cmStateSnapshot.h" class cmState; diff --git a/Source/cmOutputRequiredFilesCommand.cxx b/Source/cmOutputRequiredFilesCommand.cxx index d9a433d1e8..e093be019c 100644 --- a/Source/cmOutputRequiredFilesCommand.cxx +++ b/Source/cmOutputRequiredFilesCommand.cxx @@ -2,13 +2,14 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmOutputRequiredFilesCommand.h" -#include "cmsys/FStream.hxx" -#include "cmsys/RegularExpression.hxx" #include <cstdio> #include <map> #include <set> #include <utility> +#include "cmsys/FStream.hxx" +#include "cmsys/RegularExpression.hxx" + #include "cmAlgorithms.h" #include "cmExecutionStatus.h" #include "cmGeneratorExpression.h" diff --git a/Source/cmParseArgumentsCommand.cxx b/Source/cmParseArgumentsCommand.cxx index c802fb45c7..d712edb812 100644 --- a/Source/cmParseArgumentsCommand.cxx +++ b/Source/cmParseArgumentsCommand.cxx @@ -7,6 +7,8 @@ #include <sstream> #include <utility> +#include <cm/string_view> + #include "cmArgumentParser.h" #include "cmExecutionStatus.h" #include "cmMakefile.h" @@ -14,7 +16,6 @@ #include "cmRange.h" #include "cmStringAlgorithms.h" #include "cmSystemTools.h" -#include <cm/string_view> static std::string EscapeArg(const std::string& arg) { diff --git a/Source/cmPipeConnection.h b/Source/cmPipeConnection.h index e67f15c57e..81f8a49f67 100644 --- a/Source/cmPipeConnection.h +++ b/Source/cmPipeConnection.h @@ -4,12 +4,13 @@ #include "cmConfigure.h" // IWYU pragma: keep -#include "cmUVHandlePtr.h" #include <string> -#include "cmConnection.h" #include "cm_uv.h" +#include "cmConnection.h" +#include "cmUVHandlePtr.h" + class cmPipeConnection : public cmEventBasedConnection { public: diff --git a/Source/cmPolicies.cxx b/Source/cmPolicies.cxx index c8bc56de05..5c8bc98b24 100644 --- a/Source/cmPolicies.cxx +++ b/Source/cmPolicies.cxx @@ -1,5 +1,12 @@ #include "cmPolicies.h" +#include <cassert> +#include <cctype> +#include <cstdio> +#include <cstring> +#include <sstream> +#include <vector> + #include "cmMakefile.h" #include "cmMessageType.h" #include "cmState.h" @@ -8,13 +15,6 @@ #include "cmSystemTools.h" #include "cmVersion.h" -#include <cassert> -#include <cctype> -#include <cstdio> -#include <cstring> -#include <sstream> -#include <vector> - static bool stringToId(const char* input, cmPolicies::PolicyID& pid) { assert(input); diff --git a/Source/cmProcessTools.cxx b/Source/cmProcessTools.cxx index a2bc16ffb1..9ebf5b7712 100644 --- a/Source/cmProcessTools.cxx +++ b/Source/cmProcessTools.cxx @@ -1,11 +1,13 @@ /* Distributed under the OSI-approved BSD 3-Clause License. See accompanying file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmProcessTools.h" -#include "cmProcessOutput.h" -#include "cmsys/Process.h" #include <ostream> +#include "cmsys/Process.h" + +#include "cmProcessOutput.h" + void cmProcessTools::RunProcess(struct cmsysProcess_s* cp, OutputParser* out, OutputParser* err, Encoding encoding) { diff --git a/Source/cmProcessTools.h b/Source/cmProcessTools.h index 7d97e366a5..21d59c463d 100644 --- a/Source/cmProcessTools.h +++ b/Source/cmProcessTools.h @@ -4,12 +4,13 @@ #define cmProcessTools_h #include "cmConfigure.h" // IWYU pragma: keep -#include "cmProcessOutput.h" #include <cstring> #include <iosfwd> #include <string> +#include "cmProcessOutput.h" + /** \class cmProcessTools * \brief Helper classes for process output parsing * diff --git a/Source/cmProjectCommand.cxx b/Source/cmProjectCommand.cxx index 373e7677a3..eb59b4f65a 100644 --- a/Source/cmProjectCommand.cxx +++ b/Source/cmProjectCommand.cxx @@ -2,7 +2,6 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmProjectCommand.h" -#include "cmsys/RegularExpression.hxx" #include <array> #include <cstddef> #include <cstdio> @@ -10,6 +9,8 @@ #include <limits> #include <utility> +#include "cmsys/RegularExpression.hxx" + #include "cmExecutionStatus.h" #include "cmMakefile.h" #include "cmMessageType.h" diff --git a/Source/cmPropertyDefinition.h b/Source/cmPropertyDefinition.h index 9adff49023..0d68c328b5 100644 --- a/Source/cmPropertyDefinition.h +++ b/Source/cmPropertyDefinition.h @@ -5,10 +5,10 @@ #include "cmConfigure.h" // IWYU pragma: keep -#include "cmProperty.h" - #include <string> +#include "cmProperty.h" + /** \class cmPropertyDefinition * \brief Property meta-information * diff --git a/Source/cmPropertyDefinitionMap.h b/Source/cmPropertyDefinitionMap.h index 97ba55391a..8ec7910332 100644 --- a/Source/cmPropertyDefinitionMap.h +++ b/Source/cmPropertyDefinitionMap.h @@ -5,12 +5,12 @@ #include "cmConfigure.h" // IWYU pragma: keep -#include "cmProperty.h" -#include "cmPropertyDefinition.h" - #include <map> #include <string> +#include "cmProperty.h" +#include "cmPropertyDefinition.h" + class cmPropertyDefinitionMap : public std::map<std::string, cmPropertyDefinition> { diff --git a/Source/cmQtAutoGen.cxx b/Source/cmQtAutoGen.cxx index 0f0e86469d..eb7c900c3d 100644 --- a/Source/cmQtAutoGen.cxx +++ b/Source/cmQtAutoGen.cxx @@ -2,20 +2,21 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmQtAutoGen.h" -#include "cmAlgorithms.h" -#include "cmDuration.h" -#include "cmProcessOutput.h" -#include "cmStringAlgorithms.h" -#include "cmSystemTools.h" -#include "cmsys/FStream.hxx" -#include "cmsys/RegularExpression.hxx" - #include <algorithm> #include <array> #include <initializer_list> #include <sstream> #include <utility> +#include "cmsys/FStream.hxx" +#include "cmsys/RegularExpression.hxx" + +#include "cmAlgorithms.h" +#include "cmDuration.h" +#include "cmProcessOutput.h" +#include "cmStringAlgorithms.h" +#include "cmSystemTools.h" + // - Static functions /// @brief Merges newOpts into baseOpts diff --git a/Source/cmQtAutoGen.h b/Source/cmQtAutoGen.h index d070b790a3..a740ba30a8 100644 --- a/Source/cmQtAutoGen.h +++ b/Source/cmQtAutoGen.h @@ -5,12 +5,12 @@ #include "cmConfigure.h" // IWYU pragma: keep -#include <cm/string_view> - #include <memory> #include <string> #include <vector> +#include <cm/string_view> + /** \class cmQtAutoGen * \brief Common base class for QtAutoGen classes */ diff --git a/Source/cmQtAutoGenGlobalInitializer.cxx b/Source/cmQtAutoGenGlobalInitializer.cxx index 751ad5085c..ef6b886364 100644 --- a/Source/cmQtAutoGenGlobalInitializer.cxx +++ b/Source/cmQtAutoGenGlobalInitializer.cxx @@ -2,6 +2,10 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmQtAutoGenGlobalInitializer.h" +#include <utility> + +#include <cm/memory> + #include "cmCustomCommandLines.h" #include "cmCustomCommandTypes.h" #include "cmDuration.h" @@ -18,10 +22,6 @@ #include "cmSystemTools.h" #include "cmTarget.h" -#include <cm/memory> - -#include <utility> - cmQtAutoGenGlobalInitializer::Keywords::Keywords() : AUTOMOC("AUTOMOC") , AUTOUIC("AUTOUIC") diff --git a/Source/cmQtAutoGenGlobalInitializer.h b/Source/cmQtAutoGenGlobalInitializer.h index d7f4cc6e10..806725a01b 100644 --- a/Source/cmQtAutoGenGlobalInitializer.h +++ b/Source/cmQtAutoGenGlobalInitializer.h @@ -5,14 +5,14 @@ #include "cmConfigure.h" // IWYU pragma: keep -#include "cmQtAutoGen.h" - #include <map> #include <memory> #include <string> #include <unordered_map> #include <vector> +#include "cmQtAutoGen.h" + class cmLocalGenerator; class cmQtAutoGenInitializer; diff --git a/Source/cmQtAutoGenInitializer.cxx b/Source/cmQtAutoGenInitializer.cxx index d7b9fa23e2..a20f1060f8 100644 --- a/Source/cmQtAutoGenInitializer.cxx +++ b/Source/cmQtAutoGenInitializer.cxx @@ -2,8 +2,25 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmQtAutoGenInitializer.h" -#include "cmQtAutoGen.h" -#include "cmQtAutoGenGlobalInitializer.h" +#include <cstddef> +#include <deque> +#include <initializer_list> +#include <map> +#include <ostream> +#include <set> +#include <string> +#include <unordered_set> +#include <utility> +#include <vector> + +#include <cm/algorithm> +#include <cm/iterator> +#include <cm/memory> + +#include "cmsys/SystemInformation.hxx" + +#include "cm_jsoncpp_value.h" +#include "cm_jsoncpp_writer.h" #include "cmAlgorithms.h" #include "cmCustomCommand.h" @@ -19,6 +36,8 @@ #include "cmMakefile.h" #include "cmMessageType.h" #include "cmPolicies.h" +#include "cmQtAutoGen.h" +#include "cmQtAutoGenGlobalInitializer.h" #include "cmSourceFile.h" #include "cmSourceFileLocationKind.h" #include "cmSourceGroup.h" @@ -27,25 +46,7 @@ #include "cmStringAlgorithms.h" #include "cmSystemTools.h" #include "cmTarget.h" -#include "cm_jsoncpp_value.h" -#include "cm_jsoncpp_writer.h" #include "cmake.h" -#include "cmsys/SystemInformation.hxx" - -#include <cstddef> -#include <deque> -#include <initializer_list> -#include <map> -#include <ostream> -#include <set> -#include <string> -#include <unordered_set> -#include <utility> -#include <vector> - -#include <cm/algorithm> -#include <cm/iterator> -#include <cm/memory> namespace { diff --git a/Source/cmQtAutoGenInitializer.h b/Source/cmQtAutoGenInitializer.h index 0580ddb85b..486dab71fc 100644 --- a/Source/cmQtAutoGenInitializer.h +++ b/Source/cmQtAutoGenInitializer.h @@ -4,10 +4,6 @@ #define cmQtAutoGenInitializer_h #include "cmConfigure.h" // IWYU pragma: keep -#include "cmFilePathChecksum.h" -#include "cmQtAutoGen.h" - -#include <cm/string_view> #include <memory> #include <set> @@ -17,6 +13,11 @@ #include <utility> #include <vector> +#include <cm/string_view> + +#include "cmFilePathChecksum.h" +#include "cmQtAutoGen.h" + class cmGeneratorTarget; class cmGlobalGenerator; class cmLocalGenerator; diff --git a/Source/cmQtAutoGenerator.cxx b/Source/cmQtAutoGenerator.cxx index 1320b07e31..da963052fb 100644 --- a/Source/cmQtAutoGenerator.cxx +++ b/Source/cmQtAutoGenerator.cxx @@ -2,11 +2,13 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmQtAutoGenerator.h" +#include "cmsys/FStream.hxx" + +#include "cm_jsoncpp_reader.h" + #include "cmQtAutoGen.h" #include "cmStringAlgorithms.h" #include "cmSystemTools.h" -#include "cm_jsoncpp_reader.h" -#include "cmsys/FStream.hxx" cmQtAutoGenerator::Logger::Logger() { diff --git a/Source/cmQtAutoGenerator.h b/Source/cmQtAutoGenerator.h index 71ee9ce64c..bbe6dd0159 100644 --- a/Source/cmQtAutoGenerator.h +++ b/Source/cmQtAutoGenerator.h @@ -5,18 +5,19 @@ #include "cmConfigure.h" // IWYU pragma: keep -#include "cmFileTime.h" -#include "cmQtAutoGen.h" -#include "cm_jsoncpp_value.h" - -#include <cm/string_view> - #include <istream> #include <mutex> #include <string> #include <unordered_set> #include <vector> +#include <cm/string_view> + +#include "cm_jsoncpp_value.h" + +#include "cmFileTime.h" +#include "cmQtAutoGen.h" + /** \class cmQtAutoGenerator * \brief Base class for QtAutoGen generators */ diff --git a/Source/cmQtAutoMocUic.cxx b/Source/cmQtAutoMocUic.cxx index 3b0f717ab1..127421ab5c 100644 --- a/Source/cmQtAutoMocUic.cxx +++ b/Source/cmQtAutoMocUic.cxx @@ -2,22 +2,6 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmQtAutoMocUic.h" -#include "cmAlgorithms.h" -#include "cmCryptoHash.h" -#include "cmFileTime.h" -#include "cmGeneratedFileStream.h" -#include "cmQtAutoGen.h" -#include "cmQtAutoGenerator.h" -#include "cmStringAlgorithms.h" -#include "cmSystemTools.h" -#include "cmWorkerPool.h" -#include "cm_jsoncpp_value.h" -#include "cmsys/FStream.hxx" -#include "cmsys/RegularExpression.hxx" - -#include <cm/memory> -#include <cm/string_view> - #include <algorithm> #include <atomic> #include <cstddef> @@ -30,6 +14,24 @@ #include <utility> #include <vector> +#include <cm/memory> +#include <cm/string_view> + +#include "cmsys/FStream.hxx" +#include "cmsys/RegularExpression.hxx" + +#include "cm_jsoncpp_value.h" + +#include "cmAlgorithms.h" +#include "cmCryptoHash.h" +#include "cmFileTime.h" +#include "cmGeneratedFileStream.h" +#include "cmQtAutoGen.h" +#include "cmQtAutoGenerator.h" +#include "cmStringAlgorithms.h" +#include "cmSystemTools.h" +#include "cmWorkerPool.h" + #if defined(__APPLE__) # include <unistd.h> #endif diff --git a/Source/cmQtAutoRcc.cxx b/Source/cmQtAutoRcc.cxx index 4a3ecfa8b6..3af81ad38a 100644 --- a/Source/cmQtAutoRcc.cxx +++ b/Source/cmQtAutoRcc.cxx @@ -2,6 +2,10 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmQtAutoRcc.h" +#include <algorithm> +#include <string> +#include <vector> + #include "cmAlgorithms.h" #include "cmCryptoHash.h" #include "cmDuration.h" @@ -14,10 +18,6 @@ #include "cmStringAlgorithms.h" #include "cmSystemTools.h" -#include <algorithm> -#include <string> -#include <vector> - namespace { /** \class cmQtAutoRccT diff --git a/Source/cmRST.cxx b/Source/cmRST.cxx index edbb3dee46..7f4abf9047 100644 --- a/Source/cmRST.cxx +++ b/Source/cmRST.cxx @@ -2,19 +2,20 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmRST.h" -#include "cmAlgorithms.h" -#include "cmRange.h" -#include "cmStringAlgorithms.h" -#include "cmSystemTools.h" -#include "cmVersion.h" - -#include "cmsys/FStream.hxx" #include <algorithm> #include <cctype> #include <cstddef> #include <iterator> #include <utility> +#include "cmsys/FStream.hxx" + +#include "cmAlgorithms.h" +#include "cmRange.h" +#include "cmStringAlgorithms.h" +#include "cmSystemTools.h" +#include "cmVersion.h" + cmRST::cmRST(std::ostream& os, std::string docroot) : OS(os) , DocRoot(std::move(docroot)) diff --git a/Source/cmRST.h b/Source/cmRST.h index d8d2a0bab5..6b5d416d86 100644 --- a/Source/cmRST.h +++ b/Source/cmRST.h @@ -5,13 +5,14 @@ #include "cmConfigure.h" // IWYU pragma: keep -#include "cmsys/RegularExpression.hxx" #include <iosfwd> #include <map> #include <set> #include <string> #include <vector> +#include "cmsys/RegularExpression.hxx" + /** \class cmRST * \brief Perform basic .rst processing for command-line help * diff --git a/Source/cmRuntimeDependencyArchive.cxx b/Source/cmRuntimeDependencyArchive.cxx index ed2e3e481d..7a987c27e9 100644 --- a/Source/cmRuntimeDependencyArchive.cxx +++ b/Source/cmRuntimeDependencyArchive.cxx @@ -17,8 +17,9 @@ # ifndef CMAKE_BOOTSTRAP # include "cmGlobalVisualStudioVersionedGenerator.h" # endif -# include "cmVSSetupHelper.h" # include "cmsys/Glob.hxx" + +# include "cmVSSetupHelper.h" #endif #include <algorithm> diff --git a/Source/cmRuntimeDependencyArchive.h b/Source/cmRuntimeDependencyArchive.h index e063121f18..9e2dfb6c21 100644 --- a/Source/cmRuntimeDependencyArchive.h +++ b/Source/cmRuntimeDependencyArchive.h @@ -4,16 +4,16 @@ #ifndef cmRuntimeDependencyArchive_h #define cmRuntimeDependencyArchive_h -#include "cmBinUtilsLinker.h" - -#include "cmsys/RegularExpression.hxx" - #include <map> #include <memory> #include <set> #include <string> #include <vector> +#include "cmsys/RegularExpression.hxx" + +#include "cmBinUtilsLinker.h" + class cmExecutionStatus; class cmMakefile; diff --git a/Source/cmScriptGenerator.cxx b/Source/cmScriptGenerator.cxx index 1438f073b2..adc06792dc 100644 --- a/Source/cmScriptGenerator.cxx +++ b/Source/cmScriptGenerator.cxx @@ -2,11 +2,11 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmScriptGenerator.h" +#include <utility> + #include "cmStringAlgorithms.h" #include "cmSystemTools.h" -#include <utility> - cmScriptGenerator::cmScriptGenerator(std::string config_var, std::vector<std::string> configurations) : RuntimeConfigVariable(std::move(config_var)) diff --git a/Source/cmServer.cxx b/Source/cmServer.cxx index f150cf37cf..3b2e5f3225 100644 --- a/Source/cmServer.cxx +++ b/Source/cmServer.cxx @@ -2,17 +2,6 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmServer.h" -#include "cmConnection.h" -#include "cmFileMonitor.h" -#include "cmJsonObjectDictionary.h" -#include "cmServerDictionary.h" -#include "cmServerProtocol.h" -#include "cmSystemTools.h" -#include "cm_jsoncpp_reader.h" -#include "cm_jsoncpp_writer.h" -#include "cmake.h" -#include "cmsys/FStream.hxx" - #include <algorithm> #include <cassert> #include <cstdint> @@ -23,6 +12,19 @@ #include <cm/memory> #include <cm/shared_mutex> +#include "cmsys/FStream.hxx" + +#include "cm_jsoncpp_reader.h" +#include "cm_jsoncpp_writer.h" + +#include "cmConnection.h" +#include "cmFileMonitor.h" +#include "cmJsonObjectDictionary.h" +#include "cmServerDictionary.h" +#include "cmServerProtocol.h" +#include "cmSystemTools.h" +#include "cmake.h" + void on_signal(uv_signal_t* signal, int signum) { auto conn = static_cast<cmServerBase*>(signal->data); diff --git a/Source/cmServer.h b/Source/cmServer.h index 9b1260436d..3d7027b399 100644 --- a/Source/cmServer.h +++ b/Source/cmServer.h @@ -4,17 +4,17 @@ #include "cmConfigure.h" // IWYU pragma: keep +#include <memory> +#include <string> +#include <vector> + +#include <cm/shared_mutex> + #include "cm_jsoncpp_value.h" #include "cm_uv.h" #include "cmUVHandlePtr.h" -#include <cm/shared_mutex> - -#include <memory> -#include <string> -#include <vector> - class cmConnection; class cmFileMonitor; class cmServerProtocol; diff --git a/Source/cmServerConnection.cxx b/Source/cmServerConnection.cxx index a878890dad..279197214a 100644 --- a/Source/cmServerConnection.cxx +++ b/Source/cmServerConnection.cxx @@ -1,11 +1,13 @@ /* Distributed under the OSI-approved BSD 3-Clause License. See accompanying file Copyright.txt or https://cmake.org/licensing for details. */ +#include "cmConfigure.h" + #include "cmServerConnection.h" -#include "cmConfigure.h" +#include "cm_uv.h" + #include "cmServer.h" #include "cmServerDictionary.h" -#include "cm_uv.h" #ifdef _WIN32 # include "io.h" diff --git a/Source/cmServerProtocol.cxx b/Source/cmServerProtocol.cxx index f889129ef2..56003df75f 100644 --- a/Source/cmServerProtocol.cxx +++ b/Source/cmServerProtocol.cxx @@ -2,6 +2,17 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmServerProtocol.h" +#include <algorithm> +#include <cassert> +#include <functional> +#include <string> +#include <utility> +#include <vector> + +#include <cm/memory> + +#include "cm_uv.h" + #include "cmAlgorithms.h" #include "cmExternalMakefileProjectGenerator.h" #include "cmFileMonitor.h" @@ -13,18 +24,8 @@ #include "cmServerDictionary.h" #include "cmState.h" #include "cmSystemTools.h" -#include "cm_uv.h" #include "cmake.h" -#include <algorithm> -#include <cassert> -#include <functional> -#include <string> -#include <utility> -#include <vector> - -#include <cm/memory> - // Get rid of some windows macros: #undef max diff --git a/Source/cmServerProtocol.h b/Source/cmServerProtocol.h index 5da43447d0..8446c3e76a 100644 --- a/Source/cmServerProtocol.h +++ b/Source/cmServerProtocol.h @@ -4,13 +4,14 @@ #include "cmConfigure.h" // IWYU pragma: keep -#include "cm_jsoncpp_value.h" -#include "cmake.h" - #include <memory> #include <string> #include <utility> +#include "cm_jsoncpp_value.h" + +#include "cmake.h" + class cmConnection; class cmFileMonitor; class cmServer; diff --git a/Source/cmSourceFile.h b/Source/cmSourceFile.h index 6ef41672c9..82a3625b8b 100644 --- a/Source/cmSourceFile.h +++ b/Source/cmSourceFile.h @@ -5,16 +5,16 @@ #include "cmConfigure.h" // IWYU pragma: keep +#include <memory> +#include <string> +#include <vector> + #include "cmCustomCommand.h" #include "cmListFileCache.h" #include "cmPropertyMap.h" #include "cmSourceFileLocation.h" #include "cmSourceFileLocationKind.h" -#include <memory> -#include <string> -#include <vector> - class cmMakefile; /** \class cmSourceFile diff --git a/Source/cmSourceFileLocation.cxx b/Source/cmSourceFileLocation.cxx index bd75c14a1a..df702b050f 100644 --- a/Source/cmSourceFileLocation.cxx +++ b/Source/cmSourceFileLocation.cxx @@ -2,6 +2,8 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmSourceFileLocation.h" +#include <cassert> + #include "cmGlobalGenerator.h" #include "cmMakefile.h" #include "cmMessageType.h" @@ -9,8 +11,6 @@ #include "cmSystemTools.h" #include "cmake.h" -#include <cassert> - cmSourceFileLocation::cmSourceFileLocation() = default; cmSourceFileLocation::cmSourceFileLocation(const cmSourceFileLocation& loc) diff --git a/Source/cmSourceGroup.cxx b/Source/cmSourceGroup.cxx index 418a40fb5b..8c3ec9fec8 100644 --- a/Source/cmSourceGroup.cxx +++ b/Source/cmSourceGroup.cxx @@ -2,10 +2,10 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmSourceGroup.h" -#include "cmStringAlgorithms.h" - #include <utility> +#include "cmStringAlgorithms.h" + class cmSourceGroupInternals { public: diff --git a/Source/cmSourceGroup.h b/Source/cmSourceGroup.h index 7c65494463..581dc5dee9 100644 --- a/Source/cmSourceGroup.h +++ b/Source/cmSourceGroup.h @@ -5,11 +5,12 @@ #include "cmConfigure.h" // IWYU pragma: keep -#include "cmsys/RegularExpression.hxx" #include <set> #include <string> #include <vector> +#include "cmsys/RegularExpression.hxx" + class cmSourceFile; class cmSourceGroupInternals; diff --git a/Source/cmState.cxx b/Source/cmState.cxx index 6de312ce33..f9b5ed1c08 100644 --- a/Source/cmState.cxx +++ b/Source/cmState.cxx @@ -2,7 +2,6 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmState.h" -#include "cmsys/RegularExpression.hxx" #include <algorithm> #include <cassert> #include <cstdlib> @@ -11,6 +10,8 @@ #include <cm/memory> +#include "cmsys/RegularExpression.hxx" + #include "cmCacheManager.h" #include "cmCommand.h" #include "cmDefinitions.h" diff --git a/Source/cmString.hxx b/Source/cmString.hxx index 6223b78400..073f4c940a 100644 --- a/Source/cmString.hxx +++ b/Source/cmString.hxx @@ -5,9 +5,6 @@ #include "cmConfigure.h" // IWYU pragma: keep -#include "cm_static_string_view.hxx" -#include <cm/string_view> - #include <algorithm> #include <cstddef> #include <functional> @@ -18,6 +15,10 @@ #include <type_traits> #include <utility> +#include <cm/string_view> + +#include "cm_static_string_view.hxx" + namespace cm { class String; diff --git a/Source/cmStringAlgorithms.h b/Source/cmStringAlgorithms.h index 6631e98251..0e405dea62 100644 --- a/Source/cmStringAlgorithms.h +++ b/Source/cmStringAlgorithms.h @@ -5,10 +5,6 @@ #include "cmConfigure.h" // IWYU pragma: keep -#include "cmRange.h" - -#include <cm/string_view> - #include <cctype> #include <cstring> #include <initializer_list> @@ -17,6 +13,10 @@ #include <utility> #include <vector> +#include <cm/string_view> + +#include "cmRange.h" + /** String range type. */ using cmStringRange = cmRange<std::vector<std::string>::const_iterator>; diff --git a/Source/cmStringCommand.cxx b/Source/cmStringCommand.cxx index 28616c2e64..9212195f5a 100644 --- a/Source/cmStringCommand.cxx +++ b/Source/cmStringCommand.cxx @@ -4,7 +4,6 @@ #include "cmStringCommand.h" -#include "cmsys/RegularExpression.hxx" #include <algorithm> #include <cctype> #include <cstdio> @@ -13,6 +12,8 @@ #include <cm/iterator> +#include "cmsys/RegularExpression.hxx" + #include "cm_static_string_view.hxx" #include "cmCryptoHash.h" diff --git a/Source/cmStringReplaceHelper.cxx b/Source/cmStringReplaceHelper.cxx index 4a6298782d..998c135e8c 100644 --- a/Source/cmStringReplaceHelper.cxx +++ b/Source/cmStringReplaceHelper.cxx @@ -3,10 +3,11 @@ #include "cmStringReplaceHelper.h" -#include "cmMakefile.h" #include <sstream> #include <utility> +#include "cmMakefile.h" + cmStringReplaceHelper::cmStringReplaceHelper(const std::string& regex, std::string replace_expr, cmMakefile* makefile) diff --git a/Source/cmStringReplaceHelper.h b/Source/cmStringReplaceHelper.h index b3e4704168..74d481d70d 100644 --- a/Source/cmStringReplaceHelper.h +++ b/Source/cmStringReplaceHelper.h @@ -3,12 +3,12 @@ #ifndef cmStringReplaceHelper_h #define cmStringReplaceHelper_h -#include "cmsys/RegularExpression.hxx" - #include <string> #include <utility> #include <vector> +#include "cmsys/RegularExpression.hxx" + class cmMakefile; class cmStringReplaceHelper diff --git a/Source/cmSubcommandTable.h b/Source/cmSubcommandTable.h index 6e39a1f4e5..65eb8c794a 100644 --- a/Source/cmSubcommandTable.h +++ b/Source/cmSubcommandTable.h @@ -5,15 +5,15 @@ #include "cmConfigure.h" // IWYU pragma: keep -#include "cm_static_string_view.hxx" - -#include <cm/string_view> - #include <initializer_list> #include <string> #include <utility> #include <vector> +#include <cm/string_view> + +#include "cm_static_string_view.hxx" + class cmExecutionStatus; class cmSubcommandTable diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx index 62a8d8f952..a50e8291b1 100644 --- a/Source/cmSystemTools.cxx +++ b/Source/cmSystemTools.cxx @@ -2,17 +2,19 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmSystemTools.h" +#include "cm_uv.h" + #include "cmAlgorithms.h" #include "cmDuration.h" #include "cmProcessOutput.h" #include "cmRange.h" #include "cmStringAlgorithms.h" -#include "cm_uv.h" #if !defined(CMAKE_BOOTSTRAP) +# include "cm_libarchive.h" + # include "cmArchiveWrite.h" # include "cmLocale.h" -# include "cm_libarchive.h" # ifndef __LA_INT64_T # define __LA_INT64_T la_int64_t # endif @@ -33,12 +35,6 @@ # include "cmMachO.h" #endif -#include "cmsys/Directory.hxx" -#include "cmsys/Encoding.hxx" -#include "cmsys/FStream.hxx" -#include "cmsys/RegularExpression.hxx" -#include "cmsys/System.h" -#include "cmsys/Terminal.h" #include <algorithm> #include <cassert> #include <cctype> @@ -47,19 +43,28 @@ #include <cstdlib> #include <cstring> #include <ctime> -#include <fcntl.h> #include <iostream> #include <sstream> #include <utility> #include <vector> +#include <fcntl.h> + +#include "cmsys/Directory.hxx" +#include "cmsys/Encoding.hxx" +#include "cmsys/FStream.hxx" +#include "cmsys/RegularExpression.hxx" +#include "cmsys/System.h" +#include "cmsys/Terminal.h" + #if defined(_WIN32) # include <windows.h> // include wincrypt.h after windows.h # include <wincrypt.h> #else -# include <sys/time.h> # include <unistd.h> + +# include <sys/time.h> #endif #if defined(_WIN32) && \ diff --git a/Source/cmSystemTools.h b/Source/cmSystemTools.h index 108215cde7..ee149a029a 100644 --- a/Source/cmSystemTools.h +++ b/Source/cmSystemTools.h @@ -5,17 +5,20 @@ #include "cmConfigure.h" // IWYU pragma: keep -#include "cmCryptoHash.h" -#include "cmDuration.h" -#include "cmProcessOutput.h" -#include "cmsys/Process.h" -#include "cmsys/SystemTools.hxx" // IWYU pragma: export -#include <cm/string_view> #include <cstddef> #include <functional> #include <string> #include <vector> +#include <cm/string_view> + +#include "cmsys/Process.h" +#include "cmsys/SystemTools.hxx" // IWYU pragma: export + +#include "cmCryptoHash.h" +#include "cmDuration.h" +#include "cmProcessOutput.h" + /** \class cmSystemTools * \brief A collection of useful functions for CMake. * diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx index 62ead60d4d..1d36f83f30 100644 --- a/Source/cmTarget.cxx +++ b/Source/cmTarget.cxx @@ -2,7 +2,6 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmTarget.h" -#include "cmsys/RegularExpression.hxx" #include <algorithm> #include <cassert> #include <cstring> @@ -14,6 +13,8 @@ #include <cm/memory> +#include "cmsys/RegularExpression.hxx" + #include "cmAlgorithms.h" #include "cmCustomCommand.h" #include "cmGeneratorExpression.h" diff --git a/Source/cmTargetPrecompileHeadersCommand.cxx b/Source/cmTargetPrecompileHeadersCommand.cxx index 887d9738cf..c6e2e5c4fe 100644 --- a/Source/cmTargetPrecompileHeadersCommand.cxx +++ b/Source/cmTargetPrecompileHeadersCommand.cxx @@ -2,6 +2,8 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmTargetPrecompileHeadersCommand.h" +#include <utility> + #include "cmGeneratorExpression.h" #include "cmMakefile.h" #include "cmMessageType.h" @@ -10,8 +12,6 @@ #include "cmTarget.h" #include "cmTargetPropCommandBase.h" -#include <utility> - namespace { std::vector<std::string> ConvertToAbsoluteContent( diff --git a/Source/cmTest.h b/Source/cmTest.h index 02d8f46e67..dd246c4e6b 100644 --- a/Source/cmTest.h +++ b/Source/cmTest.h @@ -5,12 +5,12 @@ #include "cmConfigure.h" // IWYU pragma: keep -#include "cmListFileCache.h" -#include "cmPropertyMap.h" - #include <string> #include <vector> +#include "cmListFileCache.h" +#include "cmPropertyMap.h" + class cmMakefile; /** \class cmTest diff --git a/Source/cmTestGenerator.h b/Source/cmTestGenerator.h index 7ac68eb76f..e388c1643d 100644 --- a/Source/cmTestGenerator.h +++ b/Source/cmTestGenerator.h @@ -5,12 +5,12 @@ #include "cmConfigure.h" // IWYU pragma: keep -#include "cmScriptGenerator.h" - #include <iosfwd> #include <string> #include <vector> +#include "cmScriptGenerator.h" + class cmGeneratorExpression; class cmLocalGenerator; class cmTest; diff --git a/Source/cmTryRunCommand.cxx b/Source/cmTryRunCommand.cxx index 73354ec83a..0e8e986ab3 100644 --- a/Source/cmTryRunCommand.cxx +++ b/Source/cmTryRunCommand.cxx @@ -2,9 +2,10 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmTryRunCommand.h" -#include "cmsys/FStream.hxx" #include <cstdio> +#include "cmsys/FStream.hxx" + #include "cmDuration.h" #include "cmMakefile.h" #include "cmMessageType.h" diff --git a/Source/cmUVProcessChain.cxx b/Source/cmUVProcessChain.cxx index 3adc47a7a4..543c3308a1 100644 --- a/Source/cmUVProcessChain.cxx +++ b/Source/cmUVProcessChain.cxx @@ -2,19 +2,19 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmUVProcessChain.h" -#include "cmGetPipes.h" -#include "cmUVHandlePtr.h" -#include "cmUVStreambuf.h" -#include "cm_uv.h" - #include <cassert> - #include <istream> // IWYU pragma: keep #include <iterator> #include <utility> #include <cm/memory> +#include "cm_uv.h" + +#include "cmGetPipes.h" +#include "cmUVHandlePtr.h" +#include "cmUVStreambuf.h" + struct cmUVProcessChain::InternalData { struct BasicStreamData diff --git a/Source/cmUVProcessChain.h b/Source/cmUVProcessChain.h index 8a19bc3372..05a7cc82c9 100644 --- a/Source/cmUVProcessChain.h +++ b/Source/cmUVProcessChain.h @@ -3,8 +3,6 @@ #ifndef cmUVProcessChain_h #define cmUVProcessChain_h -#include "cm_uv.h" - #include <array> #include <cstddef> #include <cstdint> @@ -13,6 +11,8 @@ #include <string> #include <vector> +#include "cm_uv.h" + class cmUVProcessChain; class cmUVProcessChainBuilder diff --git a/Source/cmUVStreambuf.h b/Source/cmUVStreambuf.h index 0737629a28..1c8a7717cd 100644 --- a/Source/cmUVStreambuf.h +++ b/Source/cmUVStreambuf.h @@ -3,15 +3,15 @@ #ifndef cmUVStreambuf_h #define cmUVStreambuf_h -#include "cmUVHandlePtr.h" - -#include "cm_uv.h" - #include <algorithm> #include <cstring> #include <streambuf> #include <vector> +#include "cm_uv.h" + +#include "cmUVHandlePtr.h" + /* * This file is based on example code from: * diff --git a/Source/cmUuid.cxx b/Source/cmUuid.cxx index f0f2c51203..cd52b3f309 100644 --- a/Source/cmUuid.cxx +++ b/Source/cmUuid.cxx @@ -2,11 +2,11 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmUuid.h" -#include "cmCryptoHash.h" - #include <array> #include <cstring> +#include "cmCryptoHash.h" + static const std::array<int, 5> kUuidGroups = { { 4, 2, 2, 2, 6 } }; std::string cmUuid::FromMd5(std::vector<unsigned char> const& uuidNamespace, diff --git a/Source/cmVSSetupHelper.cxx b/Source/cmVSSetupHelper.cxx index 707ceac7b7..dd9f058b89 100644 --- a/Source/cmVSSetupHelper.cxx +++ b/Source/cmVSSetupHelper.cxx @@ -2,11 +2,12 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmVSSetupHelper.h" -#include "cmStringAlgorithms.h" -#include "cmSystemTools.h" #include "cmsys/Encoding.hxx" #include "cmsys/FStream.hxx" +#include "cmStringAlgorithms.h" +#include "cmSystemTools.h" + #ifndef VSSetupConstants # define VSSetupConstants /* clang-format off */ diff --git a/Source/cmVSSetupHelper.h b/Source/cmVSSetupHelper.h index ad46c75994..0980cef53a 100644 --- a/Source/cmVSSetupHelper.h +++ b/Source/cmVSSetupHelper.h @@ -8,13 +8,13 @@ #endif // Published by Visual Studio Setup team -#include "cmvssetup/Setup.Configuration.h" - #include <string> #include <vector> #include <windows.h> +#include "cmvssetup/Setup.Configuration.h" + template <class T> class SmartCOMPtr { diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx index 176e790836..d5f0c61d27 100644 --- a/Source/cmVisualStudio10TargetGenerator.cxx +++ b/Source/cmVisualStudio10TargetGenerator.cxx @@ -2,6 +2,13 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmVisualStudio10TargetGenerator.h" +#include <iterator> +#include <set> + +#include <cm/memory> + +#include "windows.h" + #include "cmAlgorithms.h" #include "cmComputeLinkInformation.h" #include "cmCustomCommand.h" @@ -16,12 +23,6 @@ #include "cmSourceFile.h" #include "cmSystemTools.h" #include "cmVisualStudioGeneratorOptions.h" -#include "windows.h" - -#include <iterator> -#include <set> - -#include <cm/memory> static void ConvertToWindowsSlash(std::string& s); diff --git a/Source/cmVisualStudioSlnParser.cxx b/Source/cmVisualStudioSlnParser.cxx index 05ef517fb1..4533e9b69d 100644 --- a/Source/cmVisualStudioSlnParser.cxx +++ b/Source/cmVisualStudioSlnParser.cxx @@ -2,13 +2,14 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmVisualStudioSlnParser.h" +#include <cassert> +#include <stack> + +#include "cmsys/FStream.hxx" + #include "cmStringAlgorithms.h" #include "cmSystemTools.h" #include "cmVisualStudioSlnData.h" -#include "cmsys/FStream.hxx" - -#include <cassert> -#include <stack> namespace { enum LineFormat diff --git a/Source/cmVisualStudioSlnParser.h b/Source/cmVisualStudioSlnParser.h index 166f788708..6c05633b82 100644 --- a/Source/cmVisualStudioSlnParser.h +++ b/Source/cmVisualStudioSlnParser.h @@ -7,9 +7,10 @@ #include <bitset> #include <iosfwd> -#include <stddef.h> #include <string> +#include <stddef.h> + class cmSlnData; class cmVisualStudioSlnParser diff --git a/Source/cmVisualStudioWCEPlatformParser.h b/Source/cmVisualStudioWCEPlatformParser.h index c19691aa21..60a66113ec 100644 --- a/Source/cmVisualStudioWCEPlatformParser.h +++ b/Source/cmVisualStudioWCEPlatformParser.h @@ -6,10 +6,11 @@ #include "cmConfigure.h" // IWYU pragma: keep #include <map> -#include <stddef.h> #include <string> #include <vector> +#include <stddef.h> + #include "cmXMLParser.h" // This class is used to parse XML with configuration diff --git a/Source/cmWhileCommand.cxx b/Source/cmWhileCommand.cxx index bd715462aa..26e7c7537b 100644 --- a/Source/cmWhileCommand.cxx +++ b/Source/cmWhileCommand.cxx @@ -2,6 +2,9 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmWhileCommand.h" +#include <string> +#include <utility> + #include <cm/memory> #include <cm/string_view> @@ -16,9 +19,6 @@ #include "cmMessageType.h" #include "cmSystemTools.h" -#include <string> -#include <utility> - class cmWhileFunctionBlocker : public cmFunctionBlocker { public: diff --git a/Source/cmWorkerPool.cxx b/Source/cmWorkerPool.cxx index 9d279ab62a..aa0d6b3d5b 100644 --- a/Source/cmWorkerPool.cxx +++ b/Source/cmWorkerPool.cxx @@ -2,12 +2,6 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmWorkerPool.h" -#include "cmRange.h" -#include "cmStringAlgorithms.h" -#include "cmUVHandlePtr.h" -#include "cmUVSignalHackRAII.h" // IWYU pragma: keep -#include "cm_uv.h" - #include <algorithm> #include <array> #include <condition_variable> @@ -19,6 +13,13 @@ #include <cm/memory> +#include "cm_uv.h" + +#include "cmRange.h" +#include "cmStringAlgorithms.h" +#include "cmUVHandlePtr.h" +#include "cmUVSignalHackRAII.h" // IWYU pragma: keep + /** * @brief libuv pipe buffer class */ diff --git a/Source/cmWorkingDirectory.cxx b/Source/cmWorkingDirectory.cxx index 816f1044ca..5700b1cc77 100644 --- a/Source/cmWorkingDirectory.cxx +++ b/Source/cmWorkingDirectory.cxx @@ -2,10 +2,10 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmWorkingDirectory.h" -#include "cmSystemTools.h" - #include <cerrno> +#include "cmSystemTools.h" + cmWorkingDirectory::cmWorkingDirectory(std::string const& newdir) { this->OldDir = cmSystemTools::GetCurrentWorkingDirectory(); diff --git a/Source/cmWriteFileCommand.cxx b/Source/cmWriteFileCommand.cxx index 264dd3f37c..34e21b2f22 100644 --- a/Source/cmWriteFileCommand.cxx +++ b/Source/cmWriteFileCommand.cxx @@ -2,10 +2,10 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmWriteFileCommand.h" -#include "cm_sys_stat.h" - #include "cmsys/FStream.hxx" +#include "cm_sys_stat.h" + #include "cmExecutionStatus.h" #include "cmMakefile.h" #include "cmStringAlgorithms.h" diff --git a/Source/cmXCodeObject.cxx b/Source/cmXCodeObject.cxx index 1747c9c994..b301ab1213 100644 --- a/Source/cmXCodeObject.cxx +++ b/Source/cmXCodeObject.cxx @@ -2,9 +2,10 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmXCodeObject.h" -#include <CoreFoundation/CoreFoundation.h> #include <ostream> +#include <CoreFoundation/CoreFoundation.h> + #include "cmSystemTools.h" const char* cmXCodeObject::PBXTypeNames[] = { diff --git a/Source/cmXMLParser.cxx b/Source/cmXMLParser.cxx index 1f69032825..ad5c4ba284 100644 --- a/Source/cmXMLParser.cxx +++ b/Source/cmXMLParser.cxx @@ -2,13 +2,15 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmXMLParser.h" -#include "cm_expat.h" -#include "cmsys/FStream.hxx" #include <cctype> #include <cstring> #include <iostream> #include <sstream> +#include "cmsys/FStream.hxx" + +#include "cm_expat.h" + cmXMLParser::cmXMLParser() { this->Parser = nullptr; diff --git a/Source/cmXMLSafe.cxx b/Source/cmXMLSafe.cxx index 7c3b30647b..8cd5f6e0d2 100644 --- a/Source/cmXMLSafe.cxx +++ b/Source/cmXMLSafe.cxx @@ -2,12 +2,12 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmXMLSafe.h" -#include "cm_utf8.h" - #include <cstdio> #include <cstring> #include <sstream> +#include "cm_utf8.h" + cmXMLSafe::cmXMLSafe(const char* s) : Data(s) , Size(static_cast<unsigned long>(strlen(s))) diff --git a/Source/cmXMLWriter.cxx b/Source/cmXMLWriter.cxx index f1ce60814a..0811bd0294 100644 --- a/Source/cmXMLWriter.cxx +++ b/Source/cmXMLWriter.cxx @@ -2,9 +2,10 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmXMLWriter.h" -#include "cmsys/FStream.hxx" #include <cassert> +#include "cmsys/FStream.hxx" + cmXMLWriter::cmXMLWriter(std::ostream& output, std::size_t level) : Output(output) , IndentationElement(1, '\t') diff --git a/Source/cmXMLWriter.h b/Source/cmXMLWriter.h index c4103cc467..bc445aa5ba 100644 --- a/Source/cmXMLWriter.h +++ b/Source/cmXMLWriter.h @@ -5,8 +5,6 @@ #include "cmConfigure.h" // IWYU pragma: keep -#include "cmXMLSafe.h" - #include <chrono> #include <cstddef> #include <ctime> @@ -15,6 +13,8 @@ #include <string> #include <vector> +#include "cmXMLSafe.h" + class cmXMLWriter { public: diff --git a/Source/cm_codecvt.cxx b/Source/cm_codecvt.cxx index 821c112b3b..122e02283c 100644 --- a/Source/cm_codecvt.cxx +++ b/Source/cm_codecvt.cxx @@ -3,9 +3,10 @@ #include "cm_codecvt.hxx" #if defined(_WIN32) +# include <windows.h> + # include <assert.h> # include <string.h> -# include <windows.h> # undef max # include "cmsys/Encoding.hxx" #endif diff --git a/Source/cm_static_string_view.hxx b/Source/cm_static_string_view.hxx index 8351cd75af..708ac9579b 100644 --- a/Source/cm_static_string_view.hxx +++ b/Source/cm_static_string_view.hxx @@ -5,10 +5,10 @@ #include "cmConfigure.h" // IWYU pragma: keep -#include <cm/string_view> - #include <cstddef> +#include <cm/string_view> + namespace cm { /** A string_view that only binds to static storage. diff --git a/Source/cmake.cxx b/Source/cmake.cxx index b96eedbb71..02606c22a7 100644 --- a/Source/cmake.cxx +++ b/Source/cmake.cxx @@ -36,12 +36,13 @@ #include "cmWorkingDirectory.h" #if !defined(CMAKE_BOOTSTRAP) +# include <unordered_map> + # include "cm_jsoncpp_writer.h" # include "cmFileAPI.h" # include "cmGraphVizWriter.h" # include "cmVariableWatch.h" -# include <unordered_map> #endif #if !defined(CMAKE_BOOTSTRAP) @@ -105,9 +106,6 @@ # include <sys/time.h> #endif -#include "cmsys/FStream.hxx" -#include "cmsys/Glob.hxx" -#include "cmsys/RegularExpression.hxx" #include <algorithm> #include <cstdio> #include <cstdlib> @@ -117,6 +115,10 @@ #include <sstream> #include <utility> +#include "cmsys/FStream.hxx" +#include "cmsys/Glob.hxx" +#include "cmsys/RegularExpression.hxx" + namespace { #if !defined(CMAKE_BOOTSTRAP) diff --git a/Source/cmakemain.cxx b/Source/cmakemain.cxx index 252c6d6d0b..cc00c81373 100644 --- a/Source/cmakemain.cxx +++ b/Source/cmakemain.cxx @@ -17,9 +17,9 @@ # include "cmDynamicLoader.h" #endif -#include "cm_uv.h" - #include "cmsys/Encoding.hxx" + +#include "cm_uv.h" #if defined(_WIN32) && !defined(CMAKE_BOOTSTRAP) # include "cmsys/ConsoleBuf.hxx" #endif diff --git a/Source/cmcldeps.cxx b/Source/cmcldeps.cxx index 19d0d38438..caf6453019 100644 --- a/Source/cmcldeps.cxx +++ b/Source/cmcldeps.cxx @@ -18,13 +18,15 @@ // /showIncludes is equivalent to -MD, not -MMD, that is, system headers are // included. -#include "cmSystemTools.h" -#include "cmsys/Encoding.hxx" - #include <algorithm> #include <sstream> + #include <windows.h> +#include "cmsys/Encoding.hxx" + +#include "cmSystemTools.h" + // We don't want any wildcard expansion. // See http://msdn.microsoft.com/en-us/library/zay8tzh6(v=vs.85).aspx void _setargv() diff --git a/Source/cmcmd.cxx b/Source/cmcmd.cxx index 7bb3dce4ca..d05e3c81ba 100644 --- a/Source/cmcmd.cxx +++ b/Source/cmcmd.cxx @@ -26,19 +26,17 @@ #endif #if !defined(CMAKE_BOOTSTRAP) && defined(_WIN32) -# include "bindexplib.h" -# include "cmFileTime.h" # include "cmsys/ConsoleBuf.hxx" + +# include "cmFileTime.h" + +# include "bindexplib.h" #endif #if !defined(CMAKE_BOOTSTRAP) && defined(_WIN32) && !defined(__CYGWIN__) # include "cmVisualStudioWCEPlatformParser.h" #endif -#include "cmsys/Directory.hxx" -#include "cmsys/FStream.hxx" -#include "cmsys/Process.h" -#include "cmsys/Terminal.h" #include <array> #include <cstdio> #include <cstdlib> @@ -51,6 +49,11 @@ #include <cm/string_view> +#include "cmsys/Directory.hxx" +#include "cmsys/FStream.hxx" +#include "cmsys/Process.h" +#include "cmsys/Terminal.h" + class cmConnection; int cmcmd_cmake_ninja_depends(std::vector<std::string>::const_iterator argBeg, diff --git a/Source/cmcmd.h b/Source/cmcmd.h index 69a7ecbb14..17f2f9a529 100644 --- a/Source/cmcmd.h +++ b/Source/cmcmd.h @@ -4,11 +4,12 @@ #define cmcmd_h #include "cmConfigure.h" // IWYU pragma: keep -#include "cmCryptoHash.h" #include <string> #include <vector> +#include "cmCryptoHash.h" + class cmcmd { public: diff --git a/Source/ctest.cxx b/Source/ctest.cxx index 7be6746295..54549a13ae 100644 --- a/Source/ctest.cxx +++ b/Source/ctest.cxx @@ -1,13 +1,14 @@ /* Distributed under the OSI-approved BSD 3-Clause License. See accompanying file Copyright.txt or https://cmake.org/licensing for details. */ -#include "CTest/cmCTestLaunch.h" -#include "CTest/cmCTestScriptHandler.h" +#include "cmsys/Encoding.hxx" + #include "cmCTest.h" #include "cmDocumentation.h" #include "cmSystemTools.h" -#include "cmsys/Encoding.hxx" +#include "CTest/cmCTestLaunch.h" +#include "CTest/cmCTestScriptHandler.h" #if defined(_WIN32) && !defined(CMAKE_BOOTSTRAP) # include "cmsys/ConsoleBuf.hxx" #endif diff --git a/Tests/BuildDepends/Project/ninjadep.cpp b/Tests/BuildDepends/Project/ninjadep.cpp index e794448f21..d3447e2e20 100644 --- a/Tests/BuildDepends/Project/ninjadep.cpp +++ b/Tests/BuildDepends/Project/ninjadep.cpp @@ -1,6 +1,7 @@ -#include "dir/header.h" #include <stdio.h> +#include "dir/header.h" + int main() { printf("HEADER_STRING: %s\n", HEADER_STRING); diff --git a/Tests/BundleTest/BundleLib.cxx b/Tests/BundleTest/BundleLib.cxx index 2e4325cf91..b7fd70d9af 100644 --- a/Tests/BundleTest/BundleLib.cxx +++ b/Tests/BundleTest/BundleLib.cxx @@ -1,10 +1,9 @@ +#include <CoreFoundation/CoreFoundation.h> #include <stdio.h> #include <stdlib.h> #include <string.h> #include <unistd.h> -#include <CoreFoundation/CoreFoundation.h> - int fileExists(char* filename) { #ifndef R_OK diff --git a/Tests/BundleTest/BundleTest.cxx b/Tests/BundleTest/BundleTest.cxx index a5e8f5997c..9b70e526e7 100644 --- a/Tests/BundleTest/BundleTest.cxx +++ b/Tests/BundleTest/BundleTest.cxx @@ -1,6 +1,5 @@ -#include <stdio.h> - #include <CoreFoundation/CoreFoundation.h> +#include <stdio.h> extern int foo(char* exec); diff --git a/Tests/BundleUtilities/framework.cpp b/Tests/BundleUtilities/framework.cpp index abda195edb..b5a95d89d4 100644 --- a/Tests/BundleUtilities/framework.cpp +++ b/Tests/BundleUtilities/framework.cpp @@ -1,5 +1,6 @@ #include "framework.h" + #include "stdio.h" void framework() diff --git a/Tests/BundleUtilities/module.cpp b/Tests/BundleUtilities/module.cpp index 51730d9de3..64bc369af4 100644 --- a/Tests/BundleUtilities/module.cpp +++ b/Tests/BundleUtilities/module.cpp @@ -1,5 +1,6 @@ #include "module.h" + #include "shared2.h" #include "stdio.h" diff --git a/Tests/BundleUtilities/shared.cpp b/Tests/BundleUtilities/shared.cpp index e5e7dc5aeb..13791c2692 100644 --- a/Tests/BundleUtilities/shared.cpp +++ b/Tests/BundleUtilities/shared.cpp @@ -1,5 +1,6 @@ #include "shared.h" + #include "stdio.h" void shared() diff --git a/Tests/BundleUtilities/shared2.cpp b/Tests/BundleUtilities/shared2.cpp index 84af5d0617..bed19048be 100644 --- a/Tests/BundleUtilities/shared2.cpp +++ b/Tests/BundleUtilities/shared2.cpp @@ -1,5 +1,6 @@ #include "shared2.h" + #include "stdio.h" void shared2() diff --git a/Tests/CMakeCommands/target_include_directories/consumer.cpp b/Tests/CMakeCommands/target_include_directories/consumer.cpp index 267b0a342c..d349650228 100644 --- a/Tests/CMakeCommands/target_include_directories/consumer.cpp +++ b/Tests/CMakeCommands/target_include_directories/consumer.cpp @@ -1,5 +1,6 @@ #include "consumer.h" + #include "common.h" #include "cxx_only.h" #include "interfaceinclude.h" diff --git a/Tests/CMakeCommands/target_link_libraries/cmp0022/cmp0022lib.h b/Tests/CMakeCommands/target_link_libraries/cmp0022/cmp0022lib.h index 3235b9bf19..e939013358 100644 --- a/Tests/CMakeCommands/target_link_libraries/cmp0022/cmp0022lib.h +++ b/Tests/CMakeCommands/target_link_libraries/cmp0022/cmp0022lib.h @@ -1,6 +1,5 @@ -#include "cmp0022lib_export.h" - #include "cmp0022ifacelib.h" +#include "cmp0022lib_export.h" CMP0022Iface CMP0022LIB_EXPORT cmp0022(); diff --git a/Tests/CMakeCommands/target_link_libraries/depB.cpp b/Tests/CMakeCommands/target_link_libraries/depB.cpp index 4f46552d7c..276a91ae4b 100644 --- a/Tests/CMakeCommands/target_link_libraries/depB.cpp +++ b/Tests/CMakeCommands/target_link_libraries/depB.cpp @@ -2,7 +2,6 @@ #include "depB.h" #include "depA.h" - #include "libgenex.h" int DepB::foo() diff --git a/Tests/CMakeCommands/target_link_libraries/depC.h b/Tests/CMakeCommands/target_link_libraries/depC.h index 01c9e06bb1..af7bfa3d9e 100644 --- a/Tests/CMakeCommands/target_link_libraries/depC.h +++ b/Tests/CMakeCommands/target_link_libraries/depC.h @@ -1,7 +1,6 @@ -#include "depc_export.h" - #include "depA.h" +#include "depc_export.h" struct DEPC_EXPORT DepC { diff --git a/Tests/CMakeCommands/target_link_libraries/depD.h b/Tests/CMakeCommands/target_link_libraries/depD.h index d24ff5f7ca..e3700c36a3 100644 --- a/Tests/CMakeCommands/target_link_libraries/depD.h +++ b/Tests/CMakeCommands/target_link_libraries/depD.h @@ -1,7 +1,6 @@ -#include "depd_export.h" - #include "depA.h" +#include "depd_export.h" struct DEPD_EXPORT DepD { diff --git a/Tests/CMakeCommands/target_link_libraries/newsignature1.cpp b/Tests/CMakeCommands/target_link_libraries/newsignature1.cpp index 1caa516ad4..b23b7a0aac 100644 --- a/Tests/CMakeCommands/target_link_libraries/newsignature1.cpp +++ b/Tests/CMakeCommands/target_link_libraries/newsignature1.cpp @@ -2,7 +2,6 @@ #include "depB.h" #include "depC.h" #include "depIfaceOnly.h" - #include "subdirlib.h" int main(int, char**) diff --git a/Tests/CMakeCommands/target_link_libraries/targetA.cpp b/Tests/CMakeCommands/target_link_libraries/targetA.cpp index 1caa516ad4..b23b7a0aac 100644 --- a/Tests/CMakeCommands/target_link_libraries/targetA.cpp +++ b/Tests/CMakeCommands/target_link_libraries/targetA.cpp @@ -2,7 +2,6 @@ #include "depB.h" #include "depC.h" #include "depIfaceOnly.h" - #include "subdirlib.h" int main(int, char**) diff --git a/Tests/CMakeCommands/target_link_libraries/targetC.cpp b/Tests/CMakeCommands/target_link_libraries/targetC.cpp index cae02b9cd2..11efb3d5fc 100644 --- a/Tests/CMakeCommands/target_link_libraries/targetC.cpp +++ b/Tests/CMakeCommands/target_link_libraries/targetC.cpp @@ -1,7 +1,6 @@ -#include "depG.h" - #include "bar.h" +#include "depG.h" #include "foo.h" #ifndef TEST_DEF diff --git a/Tests/CMakeLib/run_compile_commands.cxx b/Tests/CMakeLib/run_compile_commands.cxx index 4a79c80411..2c77accf13 100644 --- a/Tests/CMakeLib/run_compile_commands.cxx +++ b/Tests/CMakeLib/run_compile_commands.cxx @@ -1,6 +1,5 @@ #include "cmConfigure.h" // IWYU pragma: keep -#include "cmsys/FStream.hxx" #include <cstdlib> #include <iostream> #include <map> @@ -8,6 +7,8 @@ #include <utility> #include <vector> +#include "cmsys/FStream.hxx" + #include "cmSystemTools.h" class CompileCommandParser diff --git a/Tests/CMakeLib/testAffinity.cxx b/Tests/CMakeLib/testAffinity.cxx index 4b8228092e..6c6857079d 100644 --- a/Tests/CMakeLib/testAffinity.cxx +++ b/Tests/CMakeLib/testAffinity.cxx @@ -1,11 +1,11 @@ /* Distributed under the OSI-approved BSD 3-Clause License. See accompanying file Copyright.txt or https://cmake.org/licensing for details. */ -#include "cmAffinity.h" - #include <cstddef> #include <iostream> #include <set> +#include "cmAffinity.h" + int main() { std::set<size_t> cpus = cmAffinity::GetProcessorsAvailable(); diff --git a/Tests/CMakeLib/testArgumentParser.cxx b/Tests/CMakeLib/testArgumentParser.cxx index 909f71b8f1..20f98c2a2c 100644 --- a/Tests/CMakeLib/testArgumentParser.cxx +++ b/Tests/CMakeLib/testArgumentParser.cxx @@ -1,16 +1,17 @@ /* Distributed under the OSI-approved BSD 3-Clause License. See accompanying file Copyright.txt or https://cmake.org/licensing for details. */ -#include "cmArgumentParser.h" - -#include "cm_static_string_view.hxx" -#include <cm/string_view> - #include <initializer_list> #include <iostream> #include <string> #include <vector> +#include <cm/string_view> + +#include "cm_static_string_view.hxx" + +#include "cmArgumentParser.h" + namespace { struct Result diff --git a/Tests/CMakeLib/testEncoding.cxx b/Tests/CMakeLib/testEncoding.cxx index d608e86d75..4936898ed0 100644 --- a/Tests/CMakeLib/testEncoding.cxx +++ b/Tests/CMakeLib/testEncoding.cxx @@ -1,7 +1,8 @@ -#include "cmsys/FStream.hxx" #include <iostream> #include <string> +#include "cmsys/FStream.hxx" + #ifdef _WIN32 # include "cmsys/ConsoleBuf.hxx" #endif diff --git a/Tests/CMakeLib/testGeneratedFileStream.cxx b/Tests/CMakeLib/testGeneratedFileStream.cxx index 1d2ec32664..de44a0b716 100644 --- a/Tests/CMakeLib/testGeneratedFileStream.cxx +++ b/Tests/CMakeLib/testGeneratedFileStream.cxx @@ -1,11 +1,11 @@ /* Distributed under the OSI-approved BSD 3-Clause License. See accompanying file Copyright.txt or https://cmake.org/licensing for details. */ -#include "cmGeneratedFileStream.h" -#include "cmSystemTools.h" - #include <iostream> #include <string> +#include "cmGeneratedFileStream.h" +#include "cmSystemTools.h" + #define cmFailed(m1, m2) \ std::cout << "FAILED: " << (m1) << (m2) << "\n"; \ failed = 1 diff --git a/Tests/CMakeLib/testOptional.cxx b/Tests/CMakeLib/testOptional.cxx index cefe9fa380..3050332f94 100644 --- a/Tests/CMakeLib/testOptional.cxx +++ b/Tests/CMakeLib/testOptional.cxx @@ -1,10 +1,10 @@ -#include <cm/optional> -#include <cm/utility> - #include <iostream> #include <type_traits> #include <vector> +#include <cm/optional> +#include <cm/utility> + class EventLogger; class Event diff --git a/Tests/CMakeLib/testRST.cxx b/Tests/CMakeLib/testRST.cxx index 889127650e..28d80a5f61 100644 --- a/Tests/CMakeLib/testRST.cxx +++ b/Tests/CMakeLib/testRST.cxx @@ -1,12 +1,13 @@ /* Distributed under the OSI-approved BSD 3-Clause License. See accompanying file Copyright.txt or https://cmake.org/licensing for details. */ -#include "cmRST.h" -#include "cmSystemTools.h" - -#include "cmsys/FStream.hxx" #include <iostream> #include <string> +#include "cmsys/FStream.hxx" + +#include "cmRST.h" +#include "cmSystemTools.h" + void reportLine(std::ostream& os, bool ret, std::string const& line, bool eol) { if (ret) { diff --git a/Tests/CMakeLib/testRange.cxx b/Tests/CMakeLib/testRange.cxx index b26b07b8c6..4efe98e266 100644 --- a/Tests/CMakeLib/testRange.cxx +++ b/Tests/CMakeLib/testRange.cxx @@ -1,12 +1,12 @@ /* Distributed under the OSI-approved BSD 3-Clause License. See accompanying file Copyright.txt or https://cmake.org/licensing for details. */ -#include "cmRange.h" - #include <iostream> #include <string> #include <vector> +#include "cmRange.h" + #define ASSERT_TRUE(x) \ do { \ if (!(x)) { \ diff --git a/Tests/CMakeLib/testString.cxx b/Tests/CMakeLib/testString.cxx index 3b47a9c938..d7b3200391 100644 --- a/Tests/CMakeLib/testString.cxx +++ b/Tests/CMakeLib/testString.cxx @@ -1,11 +1,6 @@ /* Distributed under the OSI-approved BSD 3-Clause License. See accompanying file Copyright.txt or https://cmake.org/licensing for details. */ -#include "cmString.hxx" - -#include "cm_static_string_view.hxx" -#include <cm/string_view> - #include <cstddef> #include <cstring> #include <iostream> @@ -16,6 +11,12 @@ #include <type_traits> #include <utility> +#include <cm/string_view> + +#include "cm_static_string_view.hxx" + +#include "cmString.hxx" + #define ASSERT_TRUE(x) \ do { \ if (!(x)) { \ diff --git a/Tests/CMakeLib/testStringAlgorithms.cxx b/Tests/CMakeLib/testStringAlgorithms.cxx index 4e48f6e8aa..63826cf287 100644 --- a/Tests/CMakeLib/testStringAlgorithms.cxx +++ b/Tests/CMakeLib/testStringAlgorithms.cxx @@ -3,13 +3,13 @@ #include <cmConfigure.h> // IWYU pragma: keep -#include <cm/string_view> - #include <iostream> #include <sstream> #include <string> #include <vector> +#include <cm/string_view> + #include "cmStringAlgorithms.h" int testStringAlgorithms(int /*unused*/, char* /*unused*/ []) diff --git a/Tests/CMakeLib/testSystemTools.cxx b/Tests/CMakeLib/testSystemTools.cxx index 0a757df55c..92f5275cd9 100644 --- a/Tests/CMakeLib/testSystemTools.cxx +++ b/Tests/CMakeLib/testSystemTools.cxx @@ -4,10 +4,11 @@ #include <cmConfigure.h> // IWYU pragma: keep #include <iostream> -#include <stddef.h> #include <string> #include <vector> +#include <stddef.h> + #include "cmSystemTools.h" #define cmPassed(m) std::cout << "Passed: " << (m) << "\n" diff --git a/Tests/CMakeLib/testUTF8.cxx b/Tests/CMakeLib/testUTF8.cxx index a0bb5cd23d..986f5956ef 100644 --- a/Tests/CMakeLib/testUTF8.cxx +++ b/Tests/CMakeLib/testUTF8.cxx @@ -1,8 +1,9 @@ /* Distributed under the OSI-approved BSD 3-Clause License. See accompanying file Copyright.txt or https://cmake.org/licensing for details. */ -#include <cm_utf8.h> #include <stdio.h> +#include <cm_utf8.h> + typedef char test_utf8_char[5]; static void test_utf8_char_print(test_utf8_char const c) diff --git a/Tests/CMakeLib/testUVProcessChain.cxx b/Tests/CMakeLib/testUVProcessChain.cxx index 8cee49dcb4..71a17647e3 100644 --- a/Tests/CMakeLib/testUVProcessChain.cxx +++ b/Tests/CMakeLib/testUVProcessChain.cxx @@ -1,22 +1,20 @@ -#include "cmUVProcessChain.h" - -#include "cmGetPipes.h" -#include "cmUVHandlePtr.h" -#include "cmUVStreambuf.h" - -#include "cm_uv.h" - #include <algorithm> +#include <csignal> #include <functional> #include <iostream> #include <sstream> #include <string> #include <vector> -#include <csignal> - #include <cm/memory> +#include "cm_uv.h" + +#include "cmGetPipes.h" +#include "cmUVHandlePtr.h" +#include "cmUVProcessChain.h" +#include "cmUVStreambuf.h" + struct ExpectedStatus { bool Finished; diff --git a/Tests/CMakeLib/testUVProcessChainHelper.cxx b/Tests/CMakeLib/testUVProcessChainHelper.cxx index a77ec90aee..9c258342eb 100644 --- a/Tests/CMakeLib/testUVProcessChainHelper.cxx +++ b/Tests/CMakeLib/testUVProcessChainHelper.cxx @@ -1,13 +1,12 @@ +#include <cctype> #include <chrono> +#include <cstdlib> #include <iostream> #include <set> #include <sstream> #include <string> #include <thread> -#include <cctype> -#include <cstdlib> - std::string getStdin() { char buffer[1024]; diff --git a/Tests/CMakeLib/testUVRAII.cxx b/Tests/CMakeLib/testUVRAII.cxx index 2aeaf2c023..cb05ace157 100644 --- a/Tests/CMakeLib/testUVRAII.cxx +++ b/Tests/CMakeLib/testUVRAII.cxx @@ -1,5 +1,3 @@ -#include "cmUVHandlePtr.h" - #include <chrono> #include <iostream> #include <thread> @@ -7,6 +5,8 @@ #include "cm_uv.h" +#include "cmUVHandlePtr.h" + static void signal_reset_fn(uv_async_t* handle) { auto ptr = static_cast<cm::uv_async_ptr*>(handle->data); diff --git a/Tests/CMakeLib/testUVStreambuf.cxx b/Tests/CMakeLib/testUVStreambuf.cxx index 39655f3722..cd9c9d4faf 100644 --- a/Tests/CMakeLib/testUVStreambuf.cxx +++ b/Tests/CMakeLib/testUVStreambuf.cxx @@ -1,18 +1,16 @@ -#include "cmUVStreambuf.h" - -#include "cmGetPipes.h" -#include "cmUVHandlePtr.h" - -#include "cm_uv.h" - +#include <cstring> #include <iostream> #include <string> #include <vector> -#include <cstring> - #include <stdint.h> +#include "cm_uv.h" + +#include "cmGetPipes.h" +#include "cmUVHandlePtr.h" +#include "cmUVStreambuf.h" + #define TEST_STR_LINE_1 "This string must be exactly 128 characters long so" #define TEST_STR_LINE_2 "that we can test CMake's std::streambuf integration" #define TEST_STR_LINE_3 "with libuv's uv_stream_t." diff --git a/Tests/CMakeLib/testVisualStudioSlnParser.cxx b/Tests/CMakeLib/testVisualStudioSlnParser.cxx index c7fd585cc0..3c069600c8 100644 --- a/Tests/CMakeLib/testVisualStudioSlnParser.cxx +++ b/Tests/CMakeLib/testVisualStudioSlnParser.cxx @@ -1,10 +1,10 @@ #include "testVisualStudioSlnParser.h" +#include <iostream> + #include "cmVisualStudioSlnData.h" #include "cmVisualStudioSlnParser.h" -#include <iostream> - static bool parsedRight(cmVisualStudioSlnParser& parser, const std::string& file, cmSlnData& data, cmVisualStudioSlnParser::ParseResult expected = diff --git a/Tests/CMakeLib/testXMLParser.cxx b/Tests/CMakeLib/testXMLParser.cxx index d5e9764f98..8617cc118b 100644 --- a/Tests/CMakeLib/testXMLParser.cxx +++ b/Tests/CMakeLib/testXMLParser.cxx @@ -1,9 +1,9 @@ #include "testXMLParser.h" -#include "cmXMLParser.h" - #include <iostream> +#include "cmXMLParser.h" + int testXMLParser(int /*unused*/, char* /*unused*/ []) { // TODO: Derive from parser and check attributes. diff --git a/Tests/CMakeLib/testXMLSafe.cxx b/Tests/CMakeLib/testXMLSafe.cxx index 21bb95292a..dc62eb9c96 100644 --- a/Tests/CMakeLib/testXMLSafe.cxx +++ b/Tests/CMakeLib/testXMLSafe.cxx @@ -4,9 +4,10 @@ #include "cmConfigure.h" // IWYU pragma: keep #include <sstream> -#include <stdio.h> #include <string> +#include <stdio.h> + #include "cmXMLSafe.h" struct test_pair diff --git a/Tests/CMakeServerLib/testServerBuffering.cpp b/Tests/CMakeServerLib/testServerBuffering.cpp index 8b0b89b7fb..6f22940678 100644 --- a/Tests/CMakeServerLib/testServerBuffering.cpp +++ b/Tests/CMakeServerLib/testServerBuffering.cpp @@ -1,11 +1,11 @@ -#include "cmConnection.h" -#include "cmServerConnection.h" - #include <iostream> #include <memory> #include <string> #include <vector> +#include "cmConnection.h" +#include "cmServerConnection.h" + void print_error(const std::vector<std::string>& input, const std::vector<std::string>& output) { diff --git a/Tests/COnly/conly.c b/Tests/COnly/conly.c index 7bd8e8e15f..2ae8a1acc8 100644 --- a/Tests/COnly/conly.c +++ b/Tests/COnly/conly.c @@ -1,10 +1,9 @@ -#include "foo.h" +#include <stdio.h> +#include "foo.h" #include "libc1.h" #include "libc2.h" -#include <stdio.h> - int main() { int class = 0; diff --git a/Tests/CPackComponents/mylib.cpp b/Tests/CPackComponents/mylib.cpp index 8ddac198c1..8d63071645 100644 --- a/Tests/CPackComponents/mylib.cpp +++ b/Tests/CPackComponents/mylib.cpp @@ -1,4 +1,5 @@ #include "mylib.h" + #include "stdio.h" void mylib_function() diff --git a/Tests/CPackComponentsDEB/mylib.cpp b/Tests/CPackComponentsDEB/mylib.cpp index 8ddac198c1..8d63071645 100644 --- a/Tests/CPackComponentsDEB/mylib.cpp +++ b/Tests/CPackComponentsDEB/mylib.cpp @@ -1,4 +1,5 @@ #include "mylib.h" + #include "stdio.h" void mylib_function() diff --git a/Tests/CPackComponentsForAll/mylib.cpp b/Tests/CPackComponentsForAll/mylib.cpp index 8ddac198c1..8d63071645 100644 --- a/Tests/CPackComponentsForAll/mylib.cpp +++ b/Tests/CPackComponentsForAll/mylib.cpp @@ -1,4 +1,5 @@ #include "mylib.h" + #include "stdio.h" void mylib_function() diff --git a/Tests/CPackWiXGenerator/mylib.cpp b/Tests/CPackWiXGenerator/mylib.cpp index 8ddac198c1..8d63071645 100644 --- a/Tests/CPackWiXGenerator/mylib.cpp +++ b/Tests/CPackWiXGenerator/mylib.cpp @@ -1,4 +1,5 @@ #include "mylib.h" + #include "stdio.h" void mylib_function() diff --git a/Tests/Complex/Executable/complex.cxx b/Tests/Complex/Executable/complex.cxx index 9ddf005385..49e97d5856 100644 --- a/Tests/Complex/Executable/complex.cxx +++ b/Tests/Complex/Executable/complex.cxx @@ -1,20 +1,22 @@ -#include "Aout.h" -#include "ExtraSources/file1.h" #include "cmTestConfigure.h" #include "cmTestConfigureEscape.h" #include "cmTestGeneratedHeader.h" #include "cmVersion.h" + +#include "Aout.h" +#include "ExtraSources/file1.h" #include "file2.h" #include "sharedFile.h" extern "C" { #include "testConly.h" } #include <iostream> -#include <string.h> #include <string> #include <vector> #include <stdio.h> +#include <string.h> + #include <sys/stat.h> #if !defined(S_ISDIR) # define S_ISDIR(mode) ((mode)&_S_IFDIR) diff --git a/Tests/Complex/Library/testConly.c b/Tests/Complex/Library/testConly.c index a7d20b0b58..eb933a26f2 100644 --- a/Tests/Complex/Library/testConly.c +++ b/Tests/Complex/Library/testConly.c @@ -1,4 +1,5 @@ #include "testConly.h" + #include <stdio.h> int CsharedFunction() diff --git a/Tests/ComplexOneConfig/Executable/complex.cxx b/Tests/ComplexOneConfig/Executable/complex.cxx index 5b50899603..54c18f4ab9 100644 --- a/Tests/ComplexOneConfig/Executable/complex.cxx +++ b/Tests/ComplexOneConfig/Executable/complex.cxx @@ -1,20 +1,22 @@ -#include "Aout.h" -#include "ExtraSources/file1.h" #include "cmTestConfigure.h" #include "cmTestConfigureEscape.h" #include "cmTestGeneratedHeader.h" #include "cmVersion.h" + +#include "Aout.h" +#include "ExtraSources/file1.h" #include "file2.h" #include "sharedFile.h" extern "C" { #include "testConly.h" } #include <iostream> -#include <string.h> #include <string> #include <vector> #include <stdio.h> +#include <string.h> + #include <sys/stat.h> #if !defined(S_ISDIR) # define S_ISDIR(mode) ((mode)&_S_IFDIR) diff --git a/Tests/ComplexOneConfig/Library/testConly.c b/Tests/ComplexOneConfig/Library/testConly.c index a7d20b0b58..eb933a26f2 100644 --- a/Tests/ComplexOneConfig/Library/testConly.c +++ b/Tests/ComplexOneConfig/Library/testConly.c @@ -1,4 +1,5 @@ #include "testConly.h" + #include <stdio.h> int CsharedFunction() diff --git a/Tests/Cuda/Complex/dynamic.cu b/Tests/Cuda/Complex/dynamic.cu index c3d8affa82..9da8853eec 100644 --- a/Tests/Cuda/Complex/dynamic.cu +++ b/Tests/Cuda/Complex/dynamic.cu @@ -1,8 +1,9 @@ -#include <cuda.h> #include <iostream> #include <string> +#include <cuda.h> + #ifdef _WIN32 # define EXPORT __declspec(dllexport) #else diff --git a/Tests/Cuda/ObjectLibrary/Conflicts/static.cu b/Tests/Cuda/ObjectLibrary/Conflicts/static.cu index 586e8c62b7..30aa121b7d 100644 --- a/Tests/Cuda/ObjectLibrary/Conflicts/static.cu +++ b/Tests/Cuda/ObjectLibrary/Conflicts/static.cu @@ -1,7 +1,8 @@ +#include <iostream> + #include <cuda.h> #include <cuda_runtime.h> -#include <iostream> int __host__ cu2_sq_func(int x) { diff --git a/Tests/Cuda/ObjectLibrary/static.cu b/Tests/Cuda/ObjectLibrary/static.cu index 37bb8391e7..530a114a56 100644 --- a/Tests/Cuda/ObjectLibrary/static.cu +++ b/Tests/Cuda/ObjectLibrary/static.cu @@ -1,7 +1,8 @@ +#include <iostream> + #include <cuda.h> #include <cuda_runtime.h> -#include <iostream> int __host__ cu1_sq_func(int x) { diff --git a/Tests/Cuda/ProperDeviceLibraries/main.cu b/Tests/Cuda/ProperDeviceLibraries/main.cu index 8ceb0ccb4a..397804cf96 100644 --- a/Tests/Cuda/ProperDeviceLibraries/main.cu +++ b/Tests/Cuda/ProperDeviceLibraries/main.cu @@ -1,7 +1,8 @@ +#include <iostream> + #include <cublas_v2.h> #include <cuda_runtime.h> -#include <iostream> #if defined(USE_THREADS_POSIX) && defined(HAVE_PTHREAD_H) diff --git a/Tests/Cuda/WithC/cuda.cu b/Tests/Cuda/WithC/cuda.cu index 06bd7b975b..d1be2d4815 100644 --- a/Tests/Cuda/WithC/cuda.cu +++ b/Tests/Cuda/WithC/cuda.cu @@ -1,7 +1,7 @@ -#include <cuda.h> - #include <iostream> +#include <cuda.h> + extern "C" int use_cuda(void) { int nDevices = 0; diff --git a/Tests/CudaOnly/GPUDebugFlag/main.cu b/Tests/CudaOnly/GPUDebugFlag/main.cu index 1f3fc129fb..ced3789128 100644 --- a/Tests/CudaOnly/GPUDebugFlag/main.cu +++ b/Tests/CudaOnly/GPUDebugFlag/main.cu @@ -1,6 +1,7 @@ +#include <iostream> + #include <cuda.h> #include <cuda_runtime.h> -#include <iostream> static __global__ void debug_kernel(bool* has_debug) { diff --git a/Tests/CudaOnly/WithDefs/main.notcu b/Tests/CudaOnly/WithDefs/main.notcu index 68a296b2c8..a5f4ed6526 100644 --- a/Tests/CudaOnly/WithDefs/main.notcu +++ b/Tests/CudaOnly/WithDefs/main.notcu @@ -1,7 +1,7 @@ -#include <cuda.h> -#include <cuda_runtime.h> #include <iostream> +#include <cuda.h> +#include <cuda_runtime.h> #include <inc_cuda.h> #ifndef INC_CUDA # error "INC_CUDA not defined!" diff --git a/Tests/ExportImport/Export/testSharedLibDepends.h b/Tests/ExportImport/Export/testSharedLibDepends.h index e84fb54544..73dafae63a 100644 --- a/Tests/ExportImport/Export/testSharedLibDepends.h +++ b/Tests/ExportImport/Export/testSharedLibDepends.h @@ -2,10 +2,9 @@ #ifndef TESTSHAREDLIBDEPENDS_H #define TESTSHAREDLIBDEPENDS_H -#include "testsharedlibdepends_export.h" - #include "renamed.h" #include "testSharedLibRequired.h" +#include "testsharedlibdepends_export.h" struct TESTSHAREDLIBDEPENDS_EXPORT TestSharedLibDepends { diff --git a/Tests/ExportImport/Export/testSharedLibRequiredUser2.h b/Tests/ExportImport/Export/testSharedLibRequiredUser2.h index a132940289..e1c8a05bda 100644 --- a/Tests/ExportImport/Export/testSharedLibRequiredUser2.h +++ b/Tests/ExportImport/Export/testSharedLibRequiredUser2.h @@ -2,9 +2,8 @@ #ifndef TESTSHAREDLIBREQUIREDUSER2_H #define TESTSHAREDLIBREQUIREDUSER2_H -#include "testsharedlibrequireduser2_export.h" - #include "testSharedLibRequired.h" +#include "testsharedlibrequireduser2_export.h" struct TESTSHAREDLIBREQUIREDUSER2_EXPORT TestSharedLibRequiredUser2 { diff --git a/Tests/ExportImport/Import/A/deps_iface.c b/Tests/ExportImport/Import/A/deps_iface.c index e2d973c2f6..afb1af01f5 100644 --- a/Tests/ExportImport/Import/A/deps_iface.c +++ b/Tests/ExportImport/Import/A/deps_iface.c @@ -1,9 +1,4 @@ -#include "testLibIncludeRequired1.h" -#include "testLibIncludeRequired2.h" -#include "testLibIncludeRequired6.h" -#include "testLibIncludeRequired7.h" - #include "installIncludesTest.h" #include "installIncludesTest2.h" #include "installIncludesTest3.h" @@ -12,6 +7,10 @@ #include "installIncludesTest6.h" #include "installIncludesTest7.h" #include "installIncludesTest8.h" +#include "testLibIncludeRequired1.h" +#include "testLibIncludeRequired2.h" +#include "testLibIncludeRequired6.h" +#include "testLibIncludeRequired7.h" #ifndef testLibRequired_IFACE_DEFINE # error Expected testLibRequired_IFACE_DEFINE diff --git a/Tests/ExternalProjectLocal/Step5/MathFunctions/mysqrt.cxx b/Tests/ExternalProjectLocal/Step5/MathFunctions/mysqrt.cxx index 458ed63a15..a44aba0209 100644 --- a/Tests/ExternalProjectLocal/Step5/MathFunctions/mysqrt.cxx +++ b/Tests/ExternalProjectLocal/Step5/MathFunctions/mysqrt.cxx @@ -1,12 +1,13 @@ +#include <stdio.h> + #include "MathFunctions.h" #include "TutorialConfig.h" -#include <stdio.h> // include the generated table -#include "Table.h" - #include <math.h> +#include "Table.h" + // a hack square root calculation using simple operations double mysqrt(double x) { diff --git a/Tests/ExternalProjectLocal/Step5/tutorial.cxx b/Tests/ExternalProjectLocal/Step5/tutorial.cxx index 37f6ac4567..8d077b29c1 100644 --- a/Tests/ExternalProjectLocal/Step5/tutorial.cxx +++ b/Tests/ExternalProjectLocal/Step5/tutorial.cxx @@ -1,9 +1,10 @@ // A simple program that computes the square root of a number -#include "TutorialConfig.h" #include <math.h> #include <stdio.h> #include <stdlib.h> +#include "TutorialConfig.h" + #ifdef USE_MYMATH # include "MathFunctions.h" #endif diff --git a/Tests/FindGIF/Test/main.c b/Tests/FindGIF/Test/main.c index 4ed72ec1b3..656a99c046 100644 --- a/Tests/FindGIF/Test/main.c +++ b/Tests/FindGIF/Test/main.c @@ -1,9 +1,8 @@ #include <assert.h> +#include <gif_lib.h> #include <stdio.h> #include <string.h> -#include <gif_lib.h> - // GIFLIB before version 5 didn't know this macro #ifndef GIFLIB_MAJOR # define GIFLIB_MAJOR 4 diff --git a/Tests/FindGSL/rng/main.cc b/Tests/FindGSL/rng/main.cc index af131255a2..050caacc73 100644 --- a/Tests/FindGSL/rng/main.cc +++ b/Tests/FindGSL/rng/main.cc @@ -1,6 +1,7 @@ -#include "gsl/gsl_rng.h" #include <math.h> +#include "gsl/gsl_rng.h" + int main() { // return code diff --git a/Tests/FindGTK2/cairomm/main.cpp b/Tests/FindGTK2/cairomm/main.cpp index 44326012b6..48e5e3930b 100644 --- a/Tests/FindGTK2/cairomm/main.cpp +++ b/Tests/FindGTK2/cairomm/main.cpp @@ -8,13 +8,13 @@ # define _USE_MATH_DEFINES #endif -#include <cairomm/context.h> -#include <cairomm/surface.h> -#include <cairommconfig.h> +#include <cmath> #include <iostream> #include <string> -#include <cmath> +#include <cairomm/context.h> +#include <cairomm/surface.h> +#include <cairommconfig.h> int main() { diff --git a/Tests/FindGTK2/gtkmm/helloworld.cpp b/Tests/FindGTK2/gtkmm/helloworld.cpp index 5f4e0aecef..45c942227f 100644 --- a/Tests/FindGTK2/gtkmm/helloworld.cpp +++ b/Tests/FindGTK2/gtkmm/helloworld.cpp @@ -1,4 +1,5 @@ #include "helloworld.h" + #include <iostream> HelloWorld::HelloWorld() diff --git a/Tests/FindGTK2/gtkmm/main.cpp b/Tests/FindGTK2/gtkmm/main.cpp index 1637da28e1..29e23fd80e 100644 --- a/Tests/FindGTK2/gtkmm/main.cpp +++ b/Tests/FindGTK2/gtkmm/main.cpp @@ -1,6 +1,7 @@ -#include "helloworld.h" #include <gtkmm.h> +#include "helloworld.h" + int main(int argc, char* argv[]) { Gtk::Main kit(argc, argv); diff --git a/Tests/FindGTK2/sigc++/main.cpp b/Tests/FindGTK2/sigc++/main.cpp index e56b910373..4dae4f4335 100644 --- a/Tests/FindGTK2/sigc++/main.cpp +++ b/Tests/FindGTK2/sigc++/main.cpp @@ -1,6 +1,7 @@ // Taken from https://developer.gnome.org/libsigc++-tutorial/stable/ch02.html #include <iostream> + #include <sigc++/sigc++.h> class AlienDetector diff --git a/Tests/FindGnuTLS/Test/main.c b/Tests/FindGnuTLS/Test/main.c index 122fb2dcc4..110535856c 100644 --- a/Tests/FindGnuTLS/Test/main.c +++ b/Tests/FindGnuTLS/Test/main.c @@ -1,9 +1,8 @@ #include <assert.h> +#include <gnutls/gnutls.h> #include <stdio.h> #include <string.h> -#include <gnutls/gnutls.h> - int main() { // test the linker diff --git a/Tests/FindICU/Test/main.cpp b/Tests/FindICU/Test/main.cpp index 64cc5d3750..606e94ef80 100644 --- a/Tests/FindICU/Test/main.cpp +++ b/Tests/FindICU/Test/main.cpp @@ -1,10 +1,9 @@ -#include <unicode/uclean.h> -#include <unicode/ustring.h> -#include <unicode/utypes.h> - #include <unicode/ucal.h> +#include <unicode/uclean.h> #include <unicode/ucnv.h> #include <unicode/udat.h> +#include <unicode/ustring.h> +#include <unicode/utypes.h> int main() { diff --git a/Tests/FindProtobuf/Test/main-desc.cxx b/Tests/FindProtobuf/Test/main-desc.cxx index a26e562d55..dc768ab994 100644 --- a/Tests/FindProtobuf/Test/main-desc.cxx +++ b/Tests/FindProtobuf/Test/main-desc.cxx @@ -1,11 +1,12 @@ #include <fstream> -#include <google/protobuf/descriptor.h> #include <google/protobuf/descriptor.pb.h> -#include <google/protobuf/dynamic_message.h> -#include <google/protobuf/text_format.h> #include <iostream> #include <string> +#include <google/protobuf/descriptor.h> +#include <google/protobuf/dynamic_message.h> +#include <google/protobuf/text_format.h> + int main(int argc, char* argv[]) { std::ifstream fs; diff --git a/Tests/FindPython/NumPy/arraytest.c b/Tests/FindPython/NumPy/arraytest.c index db259e55a3..51db7bc349 100644 --- a/Tests/FindPython/NumPy/arraytest.c +++ b/Tests/FindPython/NumPy/arraytest.c @@ -1,10 +1,10 @@ #include "Python.h" #define NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION -#include "numpy/arrayobject.h" - #include <math.h> +#include "numpy/arrayobject.h" + static PyObject* vecsq(PyObject* self, PyObject* args); static PyMethodDef arraytestMethods[] = { { "vecsq", vecsq, METH_VARARGS }, diff --git a/Tests/FindSQLite3/Test/main.c b/Tests/FindSQLite3/Test/main.c index aeb4940635..fb17c672ae 100644 --- a/Tests/FindSQLite3/Test/main.c +++ b/Tests/FindSQLite3/Test/main.c @@ -1,6 +1,5 @@ -#include <string.h> - #include <sqlite3.h> +#include <string.h> int main() { diff --git a/Tests/GoogleTest/Test/main1.cxx b/Tests/GoogleTest/Test/main1.cxx index 03d604b910..c353d9146a 100644 --- a/Tests/GoogleTest/Test/main1.cxx +++ b/Tests/GoogleTest/Test/main1.cxx @@ -1,7 +1,7 @@ -#include <gtest/gtest.h> - #include <string> +#include <gtest/gtest.h> + namespace { bool shouldFail = false; } diff --git a/Tests/IncludeDirectories/SystemIncludeDirectories/consumer.cpp b/Tests/IncludeDirectories/SystemIncludeDirectories/consumer.cpp index be18ebf522..a13f08fdc0 100644 --- a/Tests/IncludeDirectories/SystemIncludeDirectories/consumer.cpp +++ b/Tests/IncludeDirectories/SystemIncludeDirectories/consumer.cpp @@ -1,7 +1,6 @@ -#include "upstream.h" - #include "config_iface.h" +#include "upstream.h" int consumer() { diff --git a/Tests/InterfaceLibrary/libsdir/sharedlib/sharedlib.h b/Tests/InterfaceLibrary/libsdir/sharedlib/sharedlib.h index 5b3c7db732..3e1894138d 100644 --- a/Tests/InterfaceLibrary/libsdir/sharedlib/sharedlib.h +++ b/Tests/InterfaceLibrary/libsdir/sharedlib/sharedlib.h @@ -2,9 +2,8 @@ #ifndef SHAREDLIB_H #define SHAREDLIB_H -#include "sharedlib_export.h" - #include "shareddependlib.h" +#include "sharedlib_export.h" struct SHAREDLIB_EXPORT SharedLibObject { diff --git a/Tests/JavaJavah/B.cpp b/Tests/JavaJavah/B.cpp index 491107efbf..86d8aa8698 100644 --- a/Tests/JavaJavah/B.cpp +++ b/Tests/JavaJavah/B.cpp @@ -1,9 +1,9 @@ +#include "B.h" + #include <jni.h> #include <stdio.h> -#include "B.h" - JNIEXPORT void JNICALL Java_B_printName(JNIEnv*, jobject) { printf("B\n"); diff --git a/Tests/JavaJavah/C.cpp b/Tests/JavaJavah/C.cpp index 0a3178f95d..569eab54a4 100644 --- a/Tests/JavaJavah/C.cpp +++ b/Tests/JavaJavah/C.cpp @@ -1,9 +1,9 @@ +#include "C.h" + #include <jni.h> #include <stdio.h> -#include "C.h" - JNIEXPORT void JNICALL Java_C_printName(JNIEnv*, jobject) { printf("C\n"); diff --git a/Tests/JavaNativeHeaders/D.cpp b/Tests/JavaNativeHeaders/D.cpp index 2a90a080cb..018386c230 100644 --- a/Tests/JavaNativeHeaders/D.cpp +++ b/Tests/JavaNativeHeaders/D.cpp @@ -1,9 +1,9 @@ +#include "D.h" + #include <jni.h> #include <stdio.h> -#include "D.h" - JNIEXPORT void JNICALL Java_D_printName(JNIEnv*, jobject) { printf("D\n"); diff --git a/Tests/JavaNativeHeaders/E.cpp b/Tests/JavaNativeHeaders/E.cpp index fb98946db1..3a8e0acffe 100644 --- a/Tests/JavaNativeHeaders/E.cpp +++ b/Tests/JavaNativeHeaders/E.cpp @@ -1,9 +1,9 @@ +#include "E.h" + #include <jni.h> #include <stdio.h> -#include "E.h" - JNIEXPORT void JNICALL Java_E_printName(JNIEnv*, jobject) { printf("E\n"); diff --git a/Tests/LoadCommand/CMakeCommands/cmTestCommand.c b/Tests/LoadCommand/CMakeCommands/cmTestCommand.c index 3558f894b9..99f0de925d 100644 --- a/Tests/LoadCommand/CMakeCommands/cmTestCommand.c +++ b/Tests/LoadCommand/CMakeCommands/cmTestCommand.c @@ -1,8 +1,9 @@ -#include "cmCPluginAPI.h" #include <stdio.h> #include <stdlib.h> #include <string.h> +#include "cmCPluginAPI.h" + typedef struct { char* LibraryName; diff --git a/Tests/LoadCommandOneConfig/CMakeCommands/cmTestCommand.c b/Tests/LoadCommandOneConfig/CMakeCommands/cmTestCommand.c index 3558f894b9..99f0de925d 100644 --- a/Tests/LoadCommandOneConfig/CMakeCommands/cmTestCommand.c +++ b/Tests/LoadCommandOneConfig/CMakeCommands/cmTestCommand.c @@ -1,8 +1,9 @@ -#include "cmCPluginAPI.h" #include <stdio.h> #include <stdlib.h> #include <string.h> +#include "cmCPluginAPI.h" + typedef struct { char* LibraryName; diff --git a/Tests/MFC/mfc1/stdafx.h b/Tests/MFC/mfc1/stdafx.h index 2680f26329..b36908593a 100644 --- a/Tests/MFC/mfc1/stdafx.h +++ b/Tests/MFC/mfc1/stdafx.h @@ -61,11 +61,10 @@ // messages #define _AFX_ALL_WARNINGS -#include <afxdisp.h> // MFC Automation classes -#include <afxext.h> // MFC extensions -#include <afxwin.h> // MFC core and standard components - +#include <afxdisp.h> // MFC Automation classes #include <afxdtctl.h> // MFC support for Internet Explorer 4 Common Controls +#include <afxext.h> // MFC extensions +#include <afxwin.h> // MFC core and standard components #ifndef _AFX_NO_AFXCMN_SUPPORT # include <afxcmn.h> // MFC support for Windows Common Controls #endif // _AFX_NO_AFXCMN_SUPPORT diff --git a/Tests/MacRuntimePath/A/framework.cpp b/Tests/MacRuntimePath/A/framework.cpp index abda195edb..b5a95d89d4 100644 --- a/Tests/MacRuntimePath/A/framework.cpp +++ b/Tests/MacRuntimePath/A/framework.cpp @@ -1,5 +1,6 @@ #include "framework.h" + #include "stdio.h" void framework() diff --git a/Tests/MacRuntimePath/A/framework2.cpp b/Tests/MacRuntimePath/A/framework2.cpp index d3c2c458d2..0a1beecabe 100644 --- a/Tests/MacRuntimePath/A/framework2.cpp +++ b/Tests/MacRuntimePath/A/framework2.cpp @@ -1,5 +1,6 @@ #include "framework2.h" + #include "stdio.h" void framework2() diff --git a/Tests/MacRuntimePath/A/shared.cpp b/Tests/MacRuntimePath/A/shared.cpp index e5e7dc5aeb..13791c2692 100644 --- a/Tests/MacRuntimePath/A/shared.cpp +++ b/Tests/MacRuntimePath/A/shared.cpp @@ -1,5 +1,6 @@ #include "shared.h" + #include "stdio.h" void shared() diff --git a/Tests/NewlineArgs/cxxonly.cxx b/Tests/NewlineArgs/cxxonly.cxx index 9e6f918202..33b26dc29c 100644 --- a/Tests/NewlineArgs/cxxonly.cxx +++ b/Tests/NewlineArgs/cxxonly.cxx @@ -1,8 +1,8 @@ +#include <stdio.h> + #include "libcxx1.h" #include "libcxx2.h" -#include <stdio.h> - int main() { if (LibCxx1Class::Method() != 2.0) { diff --git a/Tests/Plugin/src/example_exe.cxx b/Tests/Plugin/src/example_exe.cxx index fd810a966d..bc4c727f15 100644 --- a/Tests/Plugin/src/example_exe.cxx +++ b/Tests/Plugin/src/example_exe.cxx @@ -1,14 +1,12 @@ -#include "DynamicLoader.hxx" - -#include <example.h> - -#include <example_exe.h> - #include <iostream> #include <string> +#include <example.h> +#include <example_exe.h> #include <stdio.h> +#include "DynamicLoader.hxx" + // Implement the ABI used by plugins. extern "C" int example_exe_function() { diff --git a/Tests/Plugin/src/example_mod_1.c b/Tests/Plugin/src/example_mod_1.c index 87b559d2f5..2b740b8db3 100644 --- a/Tests/Plugin/src/example_mod_1.c +++ b/Tests/Plugin/src/example_mod_1.c @@ -1,5 +1,4 @@ #include <example.h> - #include <stdio.h> #if defined(_WIN32) diff --git a/Tests/Qt4Targets/main.cpp b/Tests/Qt4Targets/main.cpp index f8eacdcdc3..fc7f580bdf 100644 --- a/Tests/Qt4Targets/main.cpp +++ b/Tests/Qt4Targets/main.cpp @@ -1,8 +1,7 @@ #include <QApplication> -#include <QWidget> - #include <QString> +#include <QWidget> #ifndef QT_CORE_LIB # error Expected QT_CORE_LIB diff --git a/Tests/QtAutogen/AutogenOriginDependsOff/a_qt.cpp b/Tests/QtAutogen/AutogenOriginDependsOff/a_qt.cpp index e498969e9c..c7c6863d5b 100644 --- a/Tests/QtAutogen/AutogenOriginDependsOff/a_qt.cpp +++ b/Tests/QtAutogen/AutogenOriginDependsOff/a_qt.cpp @@ -1,5 +1,6 @@ #include "a_qt.hpp" + #include <a_mc.hpp> namespace a_qt { diff --git a/Tests/QtAutogen/AutogenOriginDependsOff/a_qt.hpp b/Tests/QtAutogen/AutogenOriginDependsOff/a_qt.hpp index e2387ee113..fafc8a20e7 100644 --- a/Tests/QtAutogen/AutogenOriginDependsOff/a_qt.hpp +++ b/Tests/QtAutogen/AutogenOriginDependsOff/a_qt.hpp @@ -1,10 +1,12 @@ #ifndef A_QT_HPP #define A_QT_HPP -#include <QObject> -#include <config.hpp> #include <string> +#include <config.hpp> + +#include <QObject> + namespace a_qt { /// @brief A header local QObject based class diff --git a/Tests/QtAutogen/AutogenOriginDependsOff/b_qt.cpp b/Tests/QtAutogen/AutogenOriginDependsOff/b_qt.cpp index f72f6ca9fe..c5adaebda5 100644 --- a/Tests/QtAutogen/AutogenOriginDependsOff/b_qt.cpp +++ b/Tests/QtAutogen/AutogenOriginDependsOff/b_qt.cpp @@ -1,5 +1,6 @@ #include "b_qt.hpp" + #include <b_mc.hpp> namespace b_qt { diff --git a/Tests/QtAutogen/AutogenOriginDependsOff/b_qt.hpp b/Tests/QtAutogen/AutogenOriginDependsOff/b_qt.hpp index d7f0311a61..b798e71ca4 100644 --- a/Tests/QtAutogen/AutogenOriginDependsOff/b_qt.hpp +++ b/Tests/QtAutogen/AutogenOriginDependsOff/b_qt.hpp @@ -1,10 +1,12 @@ #ifndef B_QT_HPP #define B_QT_HPP -#include <QObject> -#include <config.hpp> #include <string> +#include <config.hpp> + +#include <QObject> + namespace b_qt { /// @brief A header local QObject based class diff --git a/Tests/QtAutogen/AutogenOriginDependsOff/main.cpp b/Tests/QtAutogen/AutogenOriginDependsOff/main.cpp index a3425f14c0..3fb6c70951 100644 --- a/Tests/QtAutogen/AutogenOriginDependsOff/main.cpp +++ b/Tests/QtAutogen/AutogenOriginDependsOff/main.cpp @@ -1,7 +1,8 @@ +#include <string> + #include <a_qt.hpp> #include <b_qt.hpp> -#include <string> int main() { diff --git a/Tests/QtAutogen/AutogenOriginDependsOn/testGenLib.hpp b/Tests/QtAutogen/AutogenOriginDependsOn/testGenLib.hpp index 408335bd25..55457d2128 100644 --- a/Tests/QtAutogen/AutogenOriginDependsOn/testGenLib.hpp +++ b/Tests/QtAutogen/AutogenOriginDependsOn/testGenLib.hpp @@ -1,9 +1,10 @@ #ifndef TEST3_HPP #define TEST3_HPP -#include "simpleLib.hpp" #include <QObject> +#include "simpleLib.hpp" + // This object triggers the AUTOMOC on this file class LObject : public QObject { diff --git a/Tests/QtAutogen/Complex/Adir/libA.h b/Tests/QtAutogen/Complex/Adir/libA.h index c4eb9f7dc1..a8ca209076 100644 --- a/Tests/QtAutogen/Complex/Adir/libA.h +++ b/Tests/QtAutogen/Complex/Adir/libA.h @@ -2,10 +2,10 @@ #ifndef LIBA_H #define LIBA_H -#include "liba_export.h" - #include <QObject> +#include "liba_export.h" + class LIBA_EXPORT LibA : public QObject { Q_OBJECT diff --git a/Tests/QtAutogen/Complex/Bdir/libB.h b/Tests/QtAutogen/Complex/Bdir/libB.h index e4ab788c01..38dae87cbd 100644 --- a/Tests/QtAutogen/Complex/Bdir/libB.h +++ b/Tests/QtAutogen/Complex/Bdir/libB.h @@ -2,10 +2,10 @@ #ifndef LIBB_H #define LIBB_H -#include "libb_export.h" +#include <QObject> #include "libA.h" -#include <QObject> +#include "libb_export.h" class LIBB_EXPORT LibB : public QObject { diff --git a/Tests/QtAutogen/Complex/abc.cpp b/Tests/QtAutogen/Complex/abc.cpp index 2929b92ee2..4c7dc52cb3 100644 --- a/Tests/QtAutogen/Complex/abc.cpp +++ b/Tests/QtAutogen/Complex/abc.cpp @@ -1,10 +1,11 @@ /* Distributed under the OSI-approved BSD 3-Clause License. See accompanying file Copyright.txt or https://cmake.org/licensing for details. */ #include "abc.h" -#include "abc_p.h" #include <stdio.h> +#include "abc_p.h" + class PrintAbc : public QObject { Q_OBJECT diff --git a/Tests/QtAutogen/Complex/abc_p.h b/Tests/QtAutogen/Complex/abc_p.h index be984876c9..1f6102cd0e 100644 --- a/Tests/QtAutogen/Complex/abc_p.h +++ b/Tests/QtAutogen/Complex/abc_p.h @@ -3,10 +3,10 @@ #ifndef ABC_P_H #define ABC_P_H -#include <QObject> - #include <stdio.h> +#include <QObject> + class AbcP : public QObject { Q_OBJECT diff --git a/Tests/QtAutogen/Complex/calwidget.cpp b/Tests/QtAutogen/Complex/calwidget.cpp index 8ce53f14af..f58b182478 100644 --- a/Tests/QtAutogen/Complex/calwidget.cpp +++ b/Tests/QtAutogen/Complex/calwidget.cpp @@ -38,6 +38,8 @@ ** ****************************************************************************/ +#include "calwidget.h" + #include <QCalendarWidget> #include <QCheckBox> #include <QComboBox> @@ -47,8 +49,6 @@ #include <QLabel> #include <QTextCharFormat> -#include "calwidget.h" - #include "ui_calwidget.h" #ifdef UI_CALWIDGET_H # error Definition of UI_CALWIDGET_H should be disabled by file option. diff --git a/Tests/QtAutogen/Complex/codeeditor.cpp b/Tests/QtAutogen/Complex/codeeditor.cpp index 0caf8a7df9..bb6f405ad2 100644 --- a/Tests/QtAutogen/Complex/codeeditor.cpp +++ b/Tests/QtAutogen/Complex/codeeditor.cpp @@ -38,10 +38,10 @@ ** ****************************************************************************/ -#include <QtGui> - #include "codeeditor.h" +#include <QtGui> + CodeEditor::CodeEditor(QWidget* parent) : QPlainTextEdit(parent) { diff --git a/Tests/QtAutogen/Complex/debug_class.cpp b/Tests/QtAutogen/Complex/debug_class.cpp index 46b09e7052..3aaf79a08b 100644 --- a/Tests/QtAutogen/Complex/debug_class.cpp +++ b/Tests/QtAutogen/Complex/debug_class.cpp @@ -1,5 +1,6 @@ #include "debug_class.h" + #include "ui_debug_class.h" DebugClass::DebugClass(QWidget* parent) diff --git a/Tests/QtAutogen/Complex/libC.h b/Tests/QtAutogen/Complex/libC.h index 3bc2bad546..51ea48d9eb 100644 --- a/Tests/QtAutogen/Complex/libC.h +++ b/Tests/QtAutogen/Complex/libC.h @@ -2,10 +2,10 @@ #ifndef LIBC_H #define LIBC_H -#include "libc_export.h" +#include <QObject> #include "libB.h" -#include <QObject> +#include "libc_export.h" class LIBC_EXPORT LibC : public QObject { diff --git a/Tests/QtAutogen/Complex/main.cpp b/Tests/QtAutogen/Complex/main.cpp index b5b6ed1734..12f649f031 100644 --- a/Tests/QtAutogen/Complex/main.cpp +++ b/Tests/QtAutogen/Complex/main.cpp @@ -52,8 +52,9 @@ #include "xyz.h" #include "yaf.h" #ifdef TEST_DEBUG_CLASS -# include "debug_class.h" # include <iostream> + +# include "debug_class.h" #endif int main(int argv, char** args) diff --git a/Tests/QtAutogen/Complex/second_widget.cpp b/Tests/QtAutogen/Complex/second_widget.cpp index c575f1013e..9f51a80cd8 100644 --- a/Tests/QtAutogen/Complex/second_widget.cpp +++ b/Tests/QtAutogen/Complex/second_widget.cpp @@ -1,5 +1,6 @@ #include "second_widget.h" + #include "ui_second_widget.h" SecondWidget::SecondWidget(QWidget* parent) diff --git a/Tests/QtAutogen/Complex/yaf.cpp b/Tests/QtAutogen/Complex/yaf.cpp index 70e26aa95f..10448c1bc2 100644 --- a/Tests/QtAutogen/Complex/yaf.cpp +++ b/Tests/QtAutogen/Complex/yaf.cpp @@ -1,10 +1,11 @@ /* Distributed under the OSI-approved BSD 3-Clause License. See accompanying file Copyright.txt or https://cmake.org/licensing for details. */ #include "yaf.h" -#include "yaf_p.h" #include <stdio.h> +#include "yaf_p.h" + Yaf::Yaf() { } diff --git a/Tests/QtAutogen/Complex/yaf_p.h b/Tests/QtAutogen/Complex/yaf_p.h index ea5eed69cf..48fdd301cd 100644 --- a/Tests/QtAutogen/Complex/yaf_p.h +++ b/Tests/QtAutogen/Complex/yaf_p.h @@ -3,10 +3,10 @@ #ifndef YAF_P_H #define YAF_P_H -#include <QObject> - #include <stdio.h> +#include <QObject> + class YafP : public QObject { Q_OBJECT diff --git a/Tests/QtAutogen/LowMinimumVersion/item.cpp b/Tests/QtAutogen/LowMinimumVersion/item.cpp index e2f19b2042..511a1caa84 100644 --- a/Tests/QtAutogen/LowMinimumVersion/item.cpp +++ b/Tests/QtAutogen/LowMinimumVersion/item.cpp @@ -1,4 +1,5 @@ #include "item.hpp" + #include <ui_view.h> class MocLocal : public QObject diff --git a/Tests/QtAutogen/MacOsFW/test/testMacosFWLib.cpp b/Tests/QtAutogen/MacOsFW/test/testMacosFWLib.cpp index 3476d61767..edc93764a2 100644 --- a/Tests/QtAutogen/MacOsFW/test/testMacosFWLib.cpp +++ b/Tests/QtAutogen/MacOsFW/test/testMacosFWLib.cpp @@ -1,8 +1,9 @@ +#include "testMacosFWLib.h" + #include <QObject> #include <QString> #include "macos_fw_lib.h" -#include "testMacosFWLib.h" class TestMacosFWLib : public QObject { diff --git a/Tests/QtAutogen/MocCMP0071/Obj.cpp b/Tests/QtAutogen/MocCMP0071/Obj.cpp index 1ae50edc94..25a291d317 100644 --- a/Tests/QtAutogen/MocCMP0071/Obj.cpp +++ b/Tests/QtAutogen/MocCMP0071/Obj.cpp @@ -1,4 +1,5 @@ #include "Obj.hpp" + #include "Obj_p.h" ObjPrivate::ObjPrivate() diff --git a/Tests/QtAutogen/MocInclude/Common/InIncludes.in/SubOwnDot.cpp b/Tests/QtAutogen/MocInclude/Common/InIncludes.in/SubOwnDot.cpp index af357110ff..275754dbb3 100644 --- a/Tests/QtAutogen/MocInclude/Common/InIncludes.in/SubOwnDot.cpp +++ b/Tests/QtAutogen/MocInclude/Common/InIncludes.in/SubOwnDot.cpp @@ -1,4 +1,5 @@ #include "SubOwnDot.hpp" + #include "SubOwnDot_p.hpp" namespace InIncludes { diff --git a/Tests/QtAutogen/MocInclude/Common/MixedSkipped.cpp b/Tests/QtAutogen/MocInclude/Common/MixedSkipped.cpp index df08ff1fc8..6919ebcf24 100644 --- a/Tests/QtAutogen/MocInclude/Common/MixedSkipped.cpp +++ b/Tests/QtAutogen/MocInclude/Common/MixedSkipped.cpp @@ -1,4 +1,5 @@ #include "MixedSkipped.hpp" + #include "MixedCustom.hpp" class MixedSkippedLocal : public QObject diff --git a/Tests/QtAutogen/MocInclude/Common/None.cpp b/Tests/QtAutogen/MocInclude/Common/None.cpp index d01d5ec668..286ddb6cc3 100644 --- a/Tests/QtAutogen/MocInclude/Common/None.cpp +++ b/Tests/QtAutogen/MocInclude/Common/None.cpp @@ -1,4 +1,5 @@ #include "None.hpp" + #include "None_p.h" NonePrivate::NonePrivate() diff --git a/Tests/QtAutogen/MocInclude/Common/OtherUnderscore.cpp b/Tests/QtAutogen/MocInclude/Common/OtherUnderscore.cpp index 219619fcf8..df1c428a1b 100644 --- a/Tests/QtAutogen/MocInclude/Common/OtherUnderscore.cpp +++ b/Tests/QtAutogen/MocInclude/Common/OtherUnderscore.cpp @@ -1,4 +1,5 @@ #include "OtherUnderscore.hpp" + #include "OtherUnderscoreExtra.hpp" #include "OtherUnderscore_p.hpp" diff --git a/Tests/QtAutogen/MocInclude/Common/OtherUnderscoreExtra.cpp b/Tests/QtAutogen/MocInclude/Common/OtherUnderscoreExtra.cpp index 4ccf0805fe..11ebd8104d 100644 --- a/Tests/QtAutogen/MocInclude/Common/OtherUnderscoreExtra.cpp +++ b/Tests/QtAutogen/MocInclude/Common/OtherUnderscoreExtra.cpp @@ -1,4 +1,5 @@ #include "OtherUnderscoreExtra.hpp" + #include "OtherUnderscoreExtra_p.hpp" OtherUnderscoreExtraPrivate::OtherUnderscoreExtraPrivate() diff --git a/Tests/QtAutogen/MocInclude/Common/OtherUnderscoreSub.cpp b/Tests/QtAutogen/MocInclude/Common/OtherUnderscoreSub.cpp index 28850aa2d7..712c540c3b 100644 --- a/Tests/QtAutogen/MocInclude/Common/OtherUnderscoreSub.cpp +++ b/Tests/QtAutogen/MocInclude/Common/OtherUnderscoreSub.cpp @@ -1,4 +1,5 @@ #include "OtherUnderscoreSub.hpp" + #include "OtherUnderscoreSubDir/SubExtra.hpp" #include "OtherUnderscoreSub_p.hpp" diff --git a/Tests/QtAutogen/MocInclude/Common/OtherUnderscoreSubDir/SubExtra.cpp b/Tests/QtAutogen/MocInclude/Common/OtherUnderscoreSubDir/SubExtra.cpp index e323ed82e4..22501e44df 100644 --- a/Tests/QtAutogen/MocInclude/Common/OtherUnderscoreSubDir/SubExtra.cpp +++ b/Tests/QtAutogen/MocInclude/Common/OtherUnderscoreSubDir/SubExtra.cpp @@ -1,4 +1,5 @@ #include "SubExtra.hpp" + #include "SubExtra_p.hpp" SubExtraPrivate::SubExtraPrivate() diff --git a/Tests/QtAutogen/MocInclude/Common/OwnDot.cpp b/Tests/QtAutogen/MocInclude/Common/OwnDot.cpp index 1cce2722c4..b7b7d854c8 100644 --- a/Tests/QtAutogen/MocInclude/Common/OwnDot.cpp +++ b/Tests/QtAutogen/MocInclude/Common/OwnDot.cpp @@ -1,4 +1,5 @@ #include "OwnDot.hpp" + #include "OwnDot_p.h" class OwnDotLocal : public QObject diff --git a/Tests/QtAutogen/MocInclude/Common/OwnDotUnderscore.cpp b/Tests/QtAutogen/MocInclude/Common/OwnDotUnderscore.cpp index 2a0b8add83..056c0db84e 100644 --- a/Tests/QtAutogen/MocInclude/Common/OwnDotUnderscore.cpp +++ b/Tests/QtAutogen/MocInclude/Common/OwnDotUnderscore.cpp @@ -1,4 +1,5 @@ #include "OwnDotUnderscore.hpp" + #include "OwnDotUnderscore_p.h" class OwnDotUnderscoreLocal : public QObject diff --git a/Tests/QtAutogen/MocInclude/Common/OwnUnderscore.cpp b/Tests/QtAutogen/MocInclude/Common/OwnUnderscore.cpp index ebbcf45461..cb8f12c9bc 100644 --- a/Tests/QtAutogen/MocInclude/Common/OwnUnderscore.cpp +++ b/Tests/QtAutogen/MocInclude/Common/OwnUnderscore.cpp @@ -1,4 +1,5 @@ #include "OwnUnderscore.hpp" + #include "OwnUnderscore_p.h" OwnUnderscorePrivate::OwnUnderscorePrivate() diff --git a/Tests/QtAutogen/MocInclude/Relaxed/RObjB.cpp b/Tests/QtAutogen/MocInclude/Relaxed/RObjB.cpp index c56d10f049..57d7daf16c 100644 --- a/Tests/QtAutogen/MocInclude/Relaxed/RObjB.cpp +++ b/Tests/QtAutogen/MocInclude/Relaxed/RObjB.cpp @@ -1,4 +1,5 @@ #include "RObjB.hpp" + #include "RObjBExtra.hpp" RObjBExtra::RObjBExtra() diff --git a/Tests/QtAutogen/MocInclude/Relaxed/RObjC.cpp b/Tests/QtAutogen/MocInclude/Relaxed/RObjC.cpp index 4ba32f54bf..3275216665 100644 --- a/Tests/QtAutogen/MocInclude/Relaxed/RObjC.cpp +++ b/Tests/QtAutogen/MocInclude/Relaxed/RObjC.cpp @@ -1,4 +1,5 @@ #include "RObjC.hpp" + #include <QObject> class RObjCPrivate : public QObject diff --git a/Tests/QtAutogen/MocOnly/main.cpp b/Tests/QtAutogen/MocOnly/main.cpp index b83b8063b6..ec8da214e5 100644 --- a/Tests/QtAutogen/MocOnly/main.cpp +++ b/Tests/QtAutogen/MocOnly/main.cpp @@ -1,8 +1,9 @@ +#include <iostream> + #include "IncA.hpp" #include "IncB.hpp" #include "StyleA.hpp" #include "StyleB.hpp" -#include <iostream> int main(int argv, char** args) { diff --git a/Tests/QtAutogen/MocOsMacros/TestClass.cpp b/Tests/QtAutogen/MocOsMacros/TestClass.cpp index 13f8fd93aa..babc08b128 100644 --- a/Tests/QtAutogen/MocOsMacros/TestClass.cpp +++ b/Tests/QtAutogen/MocOsMacros/TestClass.cpp @@ -1,4 +1,5 @@ #include "TestClass.hpp" + #include <iostream> void TestClass::open() diff --git a/Tests/QtAutogen/MocOsMacros/main.cpp b/Tests/QtAutogen/MocOsMacros/main.cpp index f8eec3cbc4..c427345be4 100644 --- a/Tests/QtAutogen/MocOsMacros/main.cpp +++ b/Tests/QtAutogen/MocOsMacros/main.cpp @@ -1,6 +1,7 @@ -#include "TestClass.hpp" #include <QtGlobal> +#include "TestClass.hpp" + int main() { TestClass a; diff --git a/Tests/QtAutogen/ObjectLibrary/a/classa.cpp b/Tests/QtAutogen/ObjectLibrary/a/classa.cpp index 4f08fda840..a548652dde 100644 --- a/Tests/QtAutogen/ObjectLibrary/a/classa.cpp +++ b/Tests/QtAutogen/ObjectLibrary/a/classa.cpp @@ -1,4 +1,5 @@ #include "classa.h" + #include <QDebug> void ClassA::slotDoSomething() diff --git a/Tests/QtAutogen/ObjectLibrary/b/classb.cpp b/Tests/QtAutogen/ObjectLibrary/b/classb.cpp index 26e09261cc..e5cc2e77ec 100644 --- a/Tests/QtAutogen/ObjectLibrary/b/classb.cpp +++ b/Tests/QtAutogen/ObjectLibrary/b/classb.cpp @@ -1,4 +1,5 @@ #include "classb.h" + #include <QDebug> void ClassB::slotDoSomething() diff --git a/Tests/QtAutogen/RerunMocPlugin/MocPlugin/StyleA.hpp b/Tests/QtAutogen/RerunMocPlugin/MocPlugin/StyleA.hpp index 35158a4b01..e1fdf0bbd1 100644 --- a/Tests/QtAutogen/RerunMocPlugin/MocPlugin/StyleA.hpp +++ b/Tests/QtAutogen/RerunMocPlugin/MocPlugin/StyleA.hpp @@ -1,9 +1,10 @@ #ifndef STYLEA_HPP #define STYLEA_HPP -#include "UtilityMacros.hpp" #include <QStylePlugin> +#include "UtilityMacros.hpp" + class StyleA : public QStylePlugin { Q_OBJECT diff --git a/Tests/QtAutogen/RerunMocPlugin/MocPlugin/StyleB.hpp b/Tests/QtAutogen/RerunMocPlugin/MocPlugin/StyleB.hpp index 15b79c5983..7550d0c3b6 100644 --- a/Tests/QtAutogen/RerunMocPlugin/MocPlugin/StyleB.hpp +++ b/Tests/QtAutogen/RerunMocPlugin/MocPlugin/StyleB.hpp @@ -1,9 +1,10 @@ #ifndef STYLEB_HPP #define STYLEB_HPP -#include "UtilityMacros.hpp" #include <QStylePlugin> +#include "UtilityMacros.hpp" + class StyleB : public QStylePlugin { Q_OBJECT diff --git a/Tests/QtAutogen/RerunMocPlugin/MocPlugin/StyleC.hpp b/Tests/QtAutogen/RerunMocPlugin/MocPlugin/StyleC.hpp index b0a41150b7..ec71becdac 100644 --- a/Tests/QtAutogen/RerunMocPlugin/MocPlugin/StyleC.hpp +++ b/Tests/QtAutogen/RerunMocPlugin/MocPlugin/StyleC.hpp @@ -1,9 +1,10 @@ #ifndef STYLEC_HPP #define STYLEC_HPP -#include "UtilityMacros.hpp" #include <QStylePlugin> +#include "UtilityMacros.hpp" + class StyleC : public QStylePlugin { Q_OBJECT diff --git a/Tests/QtAutogen/RerunMocPlugin/MocPlugin/StyleD.hpp b/Tests/QtAutogen/RerunMocPlugin/MocPlugin/StyleD.hpp index 9696aaa26e..3c093b914b 100644 --- a/Tests/QtAutogen/RerunMocPlugin/MocPlugin/StyleD.hpp +++ b/Tests/QtAutogen/RerunMocPlugin/MocPlugin/StyleD.hpp @@ -1,9 +1,10 @@ #ifndef STYLED_HPP #define STYLED_HPP -#include "UtilityMacros.hpp" #include <QStylePlugin> +#include "UtilityMacros.hpp" + class StyleD : public QStylePlugin { Q_OBJECT diff --git a/Tests/QtAutogen/RerunMocPlugin/MocPlugin/StyleEInclude.hpp b/Tests/QtAutogen/RerunMocPlugin/MocPlugin/StyleEInclude.hpp index f9734db4d6..5f10fb4a07 100644 --- a/Tests/QtAutogen/RerunMocPlugin/MocPlugin/StyleEInclude.hpp +++ b/Tests/QtAutogen/RerunMocPlugin/MocPlugin/StyleEInclude.hpp @@ -1,9 +1,10 @@ #ifndef STYLEE_INCLUDE_HPP #define STYLEE_INCLUDE_HPP -#include "UtilityMacros.hpp" #include <QStylePlugin> +#include "UtilityMacros.hpp" + class StyleE : public QStylePlugin { Q_OBJECT diff --git a/Tests/QtAutogen/StaticLibraryCycle/a.cpp b/Tests/QtAutogen/StaticLibraryCycle/a.cpp index faa52e610c..8dd1803f16 100644 --- a/Tests/QtAutogen/StaticLibraryCycle/a.cpp +++ b/Tests/QtAutogen/StaticLibraryCycle/a.cpp @@ -1,4 +1,5 @@ #include "a.h" + #include "b.h" bool A::recursed = false; diff --git a/Tests/QtAutogen/StaticLibraryCycle/b.cpp b/Tests/QtAutogen/StaticLibraryCycle/b.cpp index a807d89cfb..dee26177a1 100644 --- a/Tests/QtAutogen/StaticLibraryCycle/b.cpp +++ b/Tests/QtAutogen/StaticLibraryCycle/b.cpp @@ -1,4 +1,5 @@ #include "b.h" + #include "c.h" B::B() diff --git a/Tests/QtAutogen/StaticLibraryCycle/c.cpp b/Tests/QtAutogen/StaticLibraryCycle/c.cpp index 7d427c234f..2871f62f6b 100644 --- a/Tests/QtAutogen/StaticLibraryCycle/c.cpp +++ b/Tests/QtAutogen/StaticLibraryCycle/c.cpp @@ -1,4 +1,5 @@ #include "c.h" + #include "a.h" C::C() diff --git a/Tests/QtAutogen/UicInterface/libwidget.h b/Tests/QtAutogen/UicInterface/libwidget.h index a7ad14f626..532ff1db11 100644 --- a/Tests/QtAutogen/UicInterface/libwidget.h +++ b/Tests/QtAutogen/UicInterface/libwidget.h @@ -2,9 +2,10 @@ #ifndef LIBWIDGET_H #define LIBWIDGET_H -#include <QWidget> #include <memory> +#include <QWidget> + #if QT_VERSION < QT_VERSION_CHECK(5, 3, 0) # include <klocalizedstring.h> #endif diff --git a/Tests/QtAutogen/UicInterface/mywidget.h b/Tests/QtAutogen/UicInterface/mywidget.h index 1d31ce7a72..320d433bac 100644 --- a/Tests/QtAutogen/UicInterface/mywidget.h +++ b/Tests/QtAutogen/UicInterface/mywidget.h @@ -2,9 +2,10 @@ #ifndef MYWIDGET_H #define MYWIDGET_H -#include <QWidget> #include <memory> +#include <QWidget> + #if QT_VERSION < QT_VERSION_CHECK(5, 3, 0) # include <klocalizedstring.h> #endif diff --git a/Tests/QtAutogen/UicSkipSource/skipUicGen.cpp b/Tests/QtAutogen/UicSkipSource/skipUicGen.cpp index d2a55a6f11..ab3c454c74 100644 --- a/Tests/QtAutogen/UicSkipSource/skipUicGen.cpp +++ b/Tests/QtAutogen/UicSkipSource/skipUicGen.cpp @@ -1,5 +1,6 @@ #include "skipUicGen.hpp" + #include "ui_uigen2.h" void skipGen() diff --git a/Tests/QtAutogen/UicSkipSource/skipUicNoGen1.cpp b/Tests/QtAutogen/UicSkipSource/skipUicNoGen1.cpp index f591a42ba1..d648d94e72 100644 --- a/Tests/QtAutogen/UicSkipSource/skipUicNoGen1.cpp +++ b/Tests/QtAutogen/UicSkipSource/skipUicNoGen1.cpp @@ -1,5 +1,6 @@ #include "skipUicNoGen1.hpp" + #include "ui_nogen2.h" void skipNoGen1() diff --git a/Tests/QtAutogen/UicSkipSource/skipUicNoGen2.cpp b/Tests/QtAutogen/UicSkipSource/skipUicNoGen2.cpp index 8c1c3241c5..aca58a4638 100644 --- a/Tests/QtAutogen/UicSkipSource/skipUicNoGen2.cpp +++ b/Tests/QtAutogen/UicSkipSource/skipUicNoGen2.cpp @@ -1,5 +1,6 @@ #include "skipUicNoGen2.hpp" + #include "ui_nogen2.h" void skipNoGen2() diff --git a/Tests/RunCMake/AutoExportDll/hello.cxx b/Tests/RunCMake/AutoExportDll/hello.cxx index 533fd3e72d..74e7a4e948 100644 --- a/Tests/RunCMake/AutoExportDll/hello.cxx +++ b/Tests/RunCMake/AutoExportDll/hello.cxx @@ -1,4 +1,5 @@ #include "hello.h" + #include <stdio.h> int Hello::Data = 0; void Hello::real() diff --git a/Tests/RunCMake/AutoExportDll/say.cxx b/Tests/RunCMake/AutoExportDll/say.cxx index c8bfcc7bd3..654b5e03d2 100644 --- a/Tests/RunCMake/AutoExportDll/say.cxx +++ b/Tests/RunCMake/AutoExportDll/say.cxx @@ -1,5 +1,6 @@ -#include "hello.h" #include <stdio.h> + +#include "hello.h" #ifdef _MSC_VER # include "windows.h" #else diff --git a/Tests/RunCMake/GenerateExportHeader/exportheader_test.cpp b/Tests/RunCMake/GenerateExportHeader/exportheader_test.cpp index 7e3e0e43fa..ba77679863 100644 --- a/Tests/RunCMake/GenerateExportHeader/exportheader_test.cpp +++ b/Tests/RunCMake/GenerateExportHeader/exportheader_test.cpp @@ -1,13 +1,13 @@ -#include "libshared.h" - -#include "libstatic.h" - #include <fstream> #include <iostream> -#include <stdlib.h> #include <string> +#include <stdlib.h> + +#include "libshared.h" +#include "libstatic.h" + void compare(const char* refName, const char* testName) { std::ifstream ref; diff --git a/Tests/RunCMake/PrecompileHeaders/foo.c b/Tests/RunCMake/PrecompileHeaders/foo.c index 85ea230fa0..eb88726f07 100644 --- a/Tests/RunCMake/PrecompileHeaders/foo.c +++ b/Tests/RunCMake/PrecompileHeaders/foo.c @@ -1,4 +1,5 @@ #include "foo.h" + #include "foo2.h" int foo() diff --git a/Tests/SystemInformation/DumpInformation.cxx b/Tests/SystemInformation/DumpInformation.cxx index e0cc0ce6d1..43286753bc 100644 --- a/Tests/SystemInformation/DumpInformation.cxx +++ b/Tests/SystemInformation/DumpInformation.cxx @@ -1,5 +1,7 @@ #include "DumpInformation.h" + #include <stdio.h> + #include <sys/stat.h> void cmDumpInformationPrintFile(const char* name, FILE* fout) diff --git a/Tests/TestsWorkingDirectory/main.c b/Tests/TestsWorkingDirectory/main.c index 8755c0ef3c..ca72f2102c 100644 --- a/Tests/TestsWorkingDirectory/main.c +++ b/Tests/TestsWorkingDirectory/main.c @@ -37,9 +37,10 @@ static const char* Getcwd(char* buf, unsigned int len) #else # include <fcntl.h> -# include <sys/types.h> # include <unistd.h> +# include <sys/types.h> + static const char* Getcwd(char* buf, unsigned int len) { const char* ret = getcwd(buf, len); diff --git a/Tests/VSExternalInclude/Lib2/lib2.cpp b/Tests/VSExternalInclude/Lib2/lib2.cpp index adc2d29afe..37180172bb 100644 --- a/Tests/VSExternalInclude/Lib2/lib2.cpp +++ b/Tests/VSExternalInclude/Lib2/lib2.cpp @@ -1,5 +1,6 @@ #include "lib2.h" + #include "lib1.h" int add1_and_mult2(int num) diff --git a/Tests/VSMidl/src/main.cpp b/Tests/VSMidl/src/main.cpp index 68089adc4d..ae114fe09d 100644 --- a/Tests/VSMidl/src/main.cpp +++ b/Tests/VSMidl/src/main.cpp @@ -1,6 +1,7 @@ +#include <test_i.c> + #include <stdio.h> #include <test.h> -#include <test_i.c> int main(int argc, char** argv) { diff --git a/Tests/VSNsightTegra/jni/second.c b/Tests/VSNsightTegra/jni/second.c index 12fcdb6a9e..30bdc17b03 100644 --- a/Tests/VSNsightTegra/jni/second.c +++ b/Tests/VSNsightTegra/jni/second.c @@ -14,9 +14,10 @@ * limitations under the License. * */ -#include "first.h" #include <jni.h> +#include "first.h" + jint Java_com_example_twolibs_TwoLibs_add(JNIEnv* env, jobject this, jint x, jint y) { diff --git a/Tests/VSResource/main.cpp b/Tests/VSResource/main.cpp index b2b5ac99c3..6de7adc6ea 100644 --- a/Tests/VSResource/main.cpp +++ b/Tests/VSResource/main.cpp @@ -1,6 +1,7 @@ -#include <stdio.h> #include <windows.h> +#include <stdio.h> + extern int lib(); struct x diff --git a/Tests/VSWinStorePhone/CxxDLL/cxxdll.cpp b/Tests/VSWinStorePhone/CxxDLL/cxxdll.cpp index d82a792d78..1438e8a881 100644 --- a/Tests/VSWinStorePhone/CxxDLL/cxxdll.cpp +++ b/Tests/VSWinStorePhone/CxxDLL/cxxdll.cpp @@ -1,4 +1,5 @@ #include "cxxdll.h" + #include <iostream> void CxxDllClass::SomeMethod() diff --git a/Tests/VSWinStorePhone/Direct3DApp1/pch.h b/Tests/VSWinStorePhone/Direct3DApp1/pch.h index 78ebea3472..d80cdb75ad 100644 --- a/Tests/VSWinStorePhone/Direct3DApp1/pch.h +++ b/Tests/VSWinStorePhone/Direct3DApp1/pch.h @@ -1,7 +1,8 @@ #pragma once +#include <memory> + #include <DirectXMath.h> #include <agile.h> #include <d3d11_1.h> -#include <memory> #include <wrl/client.h> diff --git a/Tests/VSXaml/App.xaml.cpp b/Tests/VSXaml/App.xaml.cpp index 549b7ef28a..f9ae27e60e 100644 --- a/Tests/VSXaml/App.xaml.cpp +++ b/Tests/VSXaml/App.xaml.cpp @@ -3,9 +3,8 @@ // Implementation of the App class. // -#include "pch.h" - #include "MainPage.xaml.h" +#include "pch.h" using namespace VSXaml; diff --git a/Tests/VSXaml/MainPage.xaml.cpp b/Tests/VSXaml/MainPage.xaml.cpp index 51da237706..f372772d4d 100644 --- a/Tests/VSXaml/MainPage.xaml.cpp +++ b/Tests/VSXaml/MainPage.xaml.cpp @@ -3,10 +3,10 @@ // Implementation of the MainPage class. // -#include "pch.h" - #include "MainPage.xaml.h" +#include "pch.h" + using namespace VSXaml; using namespace Platform; diff --git a/Tests/X11/HelloWorldX11.cxx b/Tests/X11/HelloWorldX11.cxx index e59248b49b..f18f8c84e6 100644 --- a/Tests/X11/HelloWorldX11.cxx +++ b/Tests/X11/HelloWorldX11.cxx @@ -14,6 +14,7 @@ # define MAIN_H 1 # include <iostream> + # include <stdlib.h> /* include the X library headers */ diff --git a/Utilities/Release/WiX/CustomAction/detect_nsis_overwrite.cpp b/Utilities/Release/WiX/CustomAction/detect_nsis_overwrite.cpp index 593822abaa..4ced987387 100644 --- a/Utilities/Release/WiX/CustomAction/detect_nsis_overwrite.cpp +++ b/Utilities/Release/WiX/CustomAction/detect_nsis_overwrite.cpp @@ -1,11 +1,11 @@ +#include <string> +#include <vector> + #include <windows.h> #include <msi.h> #include <msiquery.h> -#include <string> -#include <vector> - std::wstring get_property(MSIHANDLE msi_handle, std::wstring const& name) { DWORD size = 0; diff --git a/Utilities/std/cm/bits/string_view.cxx b/Utilities/std/cm/bits/string_view.cxx index 3b283da4aa..e345fd3ac1 100644 --- a/Utilities/std/cm/bits/string_view.cxx +++ b/Utilities/std/cm/bits/string_view.cxx @@ -5,12 +5,12 @@ #ifndef CMake_HAVE_CXX_STRING_VIEW -# include "cm_kwiml.h" - # include <algorithm> # include <ostream> # include <stdexcept> +# include "cm_kwiml.h" + namespace cm { string_view::const_reference string_view::at(size_type pos) const |