diff options
| author | Kitware Robot <kwrobot@kitware.com> | 2019-09-30 10:46:28 -0400 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2019-10-01 12:26:36 -0400 |
| commit | ed98209ddc8d5e9f5b20cd010c69a25d553b2654 (patch) | |
| tree | bacc6e66e49837c6bbe02996caf360e1e9fbc211 /Source/CTest | |
| parent | 185fe49f29f6632a3c26c376fcb4934e91092ff7 (diff) | |
| download | cmake-ed98209ddc8d5e9f5b20cd010c69a25d553b2654.tar.gz | |
Revise include order using clang-format-6.0
Run the `clang-format.bash` script to update our C and C++ code to a new
include order `.clang-format`. Use `clang-format` version 6.0.
Diffstat (limited to 'Source/CTest')
79 files changed, 395 insertions, 349 deletions
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 |