Merge topic 'include-style'

1d829c86 Use quotes for non-system includes 26ee9e42 CPack: drop CPack prefix for includes 5afac50f cmConfigure: Ensure separate include block in headers Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !691
2024-11-28 22:10:32 +00:00 · 2017-04-13 12:12:33 +00:00 · 2017-04-13 12:12:33 +00:00 · 8456ec833a
commit 8456ec833a
parent f79b8fad09 1d829c862c
556 changed files with 867 additions and 750 deletions
--- a/Source/CMakeLists.txt
+++ b/Source/CMakeLists.txt
@ -888,6 +888,12 @@ set(CTEST_SRCS cmCTest.cxx
 add_library(CTestLib ${CTEST_SRCS})
 target_link_libraries(CTestLib CMakeLib ${CMAKE_CURL_LIBRARIES} ${CMAKE_XMLRPC_LIBRARIES})

+#
+# CPack
+#
+include_directories(
+  "${CMake_SOURCE_DIR}/Source/CPack"
+  )
 #
 # Sources for CPack
 #
--- a/Source/CPack/IFW/cmCPackIFWGenerator.cxx
+++ b/Source/CPack/IFW/cmCPackIFWGenerator.cxx
@ -2,12 +2,12 @@
   file Copyright.txt or https://cmake.org/licensing for details.  */
 #include "cmCPackIFWGenerator.h"

-#include "CPack/cmCPackComponentGroup.h"
-#include "CPack/cmCPackGenerator.h"
-#include "CPack/cmCPackLog.h"
+#include "cmCPackComponentGroup.h"
+#include "cmCPackGenerator.h"
 #include "cmCPackIFWInstaller.h"
 #include "cmCPackIFWPackage.h"
 #include "cmCPackIFWRepository.h"
+#include "cmCPackLog.h"
 #include "cmGeneratedFileStream.h"
 #include "cmSystemTools.h"
 #include "cmTimestamp.h"
--- a/Source/CPack/IFW/cmCPackIFWGenerator.h
+++ b/Source/CPack/IFW/cmCPackIFWGenerator.h
@ -3,10 +3,10 @@
 #ifndef cmCPackIFWGenerator_h
 #define cmCPackIFWGenerator_h

-#include <cmConfigure.h>
+#include "cmConfigure.h"

-#include "CPack/cmCPackComponentGroup.h"
-#include "CPack/cmCPackGenerator.h"
+#include "cmCPackComponentGroup.h"
+#include "cmCPackGenerator.h"
 #include "cmCPackIFWInstaller.h"
 #include "cmCPackIFWPackage.h"
 #include "cmCPackIFWRepository.h"
--- a/Source/CPack/IFW/cmCPackIFWInstaller.cxx
+++ b/Source/CPack/IFW/cmCPackIFWInstaller.cxx
@ -2,16 +2,16 @@
   file Copyright.txt or https://cmake.org/licensing for details.  */
 #include "cmCPackIFWInstaller.h"

-#include <cmConfigure.h>
+#include "cmConfigure.h"
 #include <sstream>
 #include <stddef.h>
 #include <utility>

-#include "CPack/cmCPackGenerator.h"
-#include "CPack/cmCPackLog.h"
+#include "cmCPackGenerator.h"
 #include "cmCPackIFWGenerator.h"
 #include "cmCPackIFWPackage.h"
 #include "cmCPackIFWRepository.h"
+#include "cmCPackLog.h"
 #include "cmGeneratedFileStream.h"
 #include "cmSystemTools.h"
 #include "cmXMLParser.h"
--- a/Source/CPack/IFW/cmCPackIFWInstaller.h
+++ b/Source/CPack/IFW/cmCPackIFWInstaller.h
@ -3,7 +3,7 @@
 #ifndef cmCPackIFWInstaller_h
 #define cmCPackIFWInstaller_h

-#include <cmConfigure.h> // IWYU pragma: keep
+#include "cmConfigure.h" // IWYU pragma: keep

 #include <map>
 #include <string>
--- a/Source/CPack/IFW/cmCPackIFWPackage.cxx
+++ b/Source/CPack/IFW/cmCPackIFWPackage.cxx
@ -2,17 +2,17 @@
   file Copyright.txt or https://cmake.org/licensing for details.  */
 #include "cmCPackIFWPackage.h"

-#include "CPack/cmCPackComponentGroup.h"
-#include "CPack/cmCPackGenerator.h"
-#include "CPack/cmCPackLog.h"
+#include "cmCPackComponentGroup.h"
+#include "cmCPackGenerator.h"
 #include "cmCPackIFWGenerator.h"
 #include "cmCPackIFWInstaller.h"
+#include "cmCPackLog.h"
 #include "cmGeneratedFileStream.h"
 #include "cmSystemTools.h"
 #include "cmTimestamp.h"
 #include "cmXMLWriter.h"

-#include <cmConfigure.h>
+#include "cmConfigure.h"
 #include <map>
 #include <sstream>
 #include <stddef.h>
--- a/Source/CPack/IFW/cmCPackIFWPackage.h
+++ b/Source/CPack/IFW/cmCPackIFWPackage.h
@ -3,7 +3,7 @@
 #ifndef cmCPackIFWPackage_h
 #define cmCPackIFWPackage_h

-#include <cmConfigure.h> // IWYU pragma: keep
+#include "cmConfigure.h" // IWYU pragma: keep

 #include <set>
 #include <string>
--- 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 "CPack/cmCPackGenerator.h"
+#include "cmCPackGenerator.h"
 #include "cmCPackIFWGenerator.h"
 #include "cmGeneratedFileStream.h"
 #include "cmSystemTools.h"
 #include "cmXMLParser.h"
 #include "cmXMLWriter.h"

-#include <cmConfigure.h>
+#include "cmConfigure.h"
 #include <stddef.h>

 #ifdef cmCPackLogger
--- a/Source/CPack/IFW/cmCPackIFWRepository.h
+++ b/Source/CPack/IFW/cmCPackIFWRepository.h
@ -3,7 +3,7 @@
 #ifndef cmCPackIFWRepository_h
 #define cmCPackIFWRepository_h

-#include <cmConfigure.h> // IWYU pragma: keep
+#include "cmConfigure.h" // IWYU pragma: keep

 #include <string>
 #include <vector>
--- a/Source/CPack/OSXScriptLauncher.cxx
+++ b/Source/CPack/OSXScriptLauncher.cxx
@ -1,8 +1,8 @@
 /* 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 "cmsys/FStream.hxx"
+#include "cmsys/Process.h"
+#include "cmsys/SystemTools.hxx"
 #include <iostream>
 #include <stddef.h>
 #include <string>
--- a/Source/CPack/WiX/cmCPackWIXGenerator.cxx
+++ b/Source/CPack/WiX/cmCPackWIXGenerator.cxx
@ -2,14 +2,14 @@
   file Copyright.txt or https://cmake.org/licensing for details.  */
 #include "cmCPackWIXGenerator.h"

-#include <CPack/cmCPackComponentGroup.h>
-#include <CPack/cmCPackLog.h>
+#include "cmCPackComponentGroup.h"
+#include "cmCPackLog.h"
+#include "cmCryptoHash.h"
+#include "cmGeneratedFileStream.h"
+#include "cmInstalledFile.h"
+#include "cmSystemTools.h"
+#include "cmUuid.h"
 #include <algorithm>
-#include <cmCryptoHash.h>
-#include <cmGeneratedFileStream.h>
-#include <cmInstalledFile.h>
-#include <cmSystemTools.h>
-#include <cmUuid.h>

 #include "cmWIXDirectoriesSourceWriter.h"
 #include "cmWIXFeaturesSourceWriter.h"
@ -17,10 +17,10 @@
 #include "cmWIXRichTextFormatWriter.h"
 #include "cmWIXSourceWriter.h"

-#include <cmsys/Directory.hxx>
-#include <cmsys/Encoding.hxx>
-#include <cmsys/FStream.hxx>
-#include <cmsys/SystemTools.hxx>
+#include "cmsys/Directory.hxx"
+#include "cmsys/Encoding.hxx"
+#include "cmsys/FStream.hxx"
+#include "cmsys/SystemTools.hxx"

 #include <rpc.h> // for GUID generation

--- a/Source/CPack/WiX/cmCPackWIXGenerator.h
+++ b/Source/CPack/WiX/cmCPackWIXGenerator.h
@ -3,7 +3,7 @@
 #ifndef cmCPackWIXGenerator_h
 #define cmCPackWIXGenerator_h

-#include <CPack/cmCPackGenerator.h>
+#include "cmCPackGenerator.h"

 #include "cmWIXPatch.h"
 #include "cmWIXShortcut.h"
--- a/Source/CPack/WiX/cmWIXAccessControlList.cxx
+++ b/Source/CPack/WiX/cmWIXAccessControlList.cxx
@ -2,9 +2,9 @@
   file Copyright.txt or https://cmake.org/licensing for details.  */
 #include "cmWIXAccessControlList.h"

-#include <CPack/cmCPackGenerator.h>
+#include "cmCPackGenerator.h"

-#include <cmSystemTools.h>
+#include "cmSystemTools.h"

 cmWIXAccessControlList::cmWIXAccessControlList(
  cmCPackLog* logger, cmInstalledFile const& installedFile,
--- a/Source/CPack/WiX/cmWIXAccessControlList.h
+++ b/Source/CPack/WiX/cmWIXAccessControlList.h
@ -5,8 +5,8 @@

 #include "cmWIXSourceWriter.h"

-#include <CPack/cmCPackLog.h>
-#include <cmInstalledFile.h>
+#include "cmCPackLog.h"
+#include "cmInstalledFile.h"

 class cmWIXAccessControlList
 {
--- a/Source/CPack/WiX/cmWIXDirectoriesSourceWriter.h
+++ b/Source/CPack/WiX/cmWIXDirectoriesSourceWriter.h
@ -5,7 +5,7 @@

 #include "cmWIXSourceWriter.h"

-#include <CPack/cmCPackGenerator.h>
+#include "cmCPackGenerator.h"

 #include <string>

--- a/Source/CPack/WiX/cmWIXFeaturesSourceWriter.h
+++ b/Source/CPack/WiX/cmWIXFeaturesSourceWriter.h
@ -6,7 +6,7 @@
 #include "cmWIXPatch.h"
 #include "cmWIXSourceWriter.h"

-#include <CPack/cmCPackGenerator.h>
+#include "cmCPackGenerator.h"

 /** \class cmWIXFeaturesSourceWriter
 * \brief Helper class to generate features.wxs
--- a/Source/CPack/WiX/cmWIXFilesSourceWriter.cxx
+++ b/Source/CPack/WiX/cmWIXFilesSourceWriter.cxx
@ -4,10 +4,10 @@

 #include "cmWIXAccessControlList.h"

-#include <cmInstalledFile.h>
+#include "cmInstalledFile.h"

-#include <cmSystemTools.h>
-#include <cmUuid.h>
+#include "cmSystemTools.h"
+#include "cmUuid.h"

 #include "cm_sys_stat.h"

--- a/Source/CPack/WiX/cmWIXFilesSourceWriter.h
+++ b/Source/CPack/WiX/cmWIXFilesSourceWriter.h
@ -8,7 +8,7 @@
 #include "cmWIXPatch.h"
 #include "cmWIXShortcut.h"

-#include <CPack/cmCPackGenerator.h>
+#include "cmCPackGenerator.h"

 /** \class cmWIXFilesSourceWriter
 * \brief Helper class to generate files.wxs
--- a/Source/CPack/WiX/cmWIXPatch.cxx
+++ b/Source/CPack/WiX/cmWIXPatch.cxx
@ -2,7 +2,7 @@
   file Copyright.txt or https://cmake.org/licensing for details.  */
 #include "cmWIXPatch.h"

-#include <CPack/cmCPackGenerator.h>
+#include "cmCPackGenerator.h"

 cmWIXPatch::cmWIXPatch(cmCPackLog* logger)
  : Logger(logger)
--- a/Source/CPack/WiX/cmWIXPatchParser.cxx
+++ b/Source/CPack/WiX/cmWIXPatchParser.cxx
@ -2,9 +2,9 @@
   file Copyright.txt or https://cmake.org/licensing for details.  */
 #include "cmWIXPatchParser.h"

-#include <CPack/cmCPackGenerator.h>
+#include "cmCPackGenerator.h"

-#include <cm_expat.h>
+#include "cm_expat.h"

 cmWIXPatchNode::Type cmWIXPatchText::type()
 {
--- a/Source/CPack/WiX/cmWIXPatchParser.h
+++ b/Source/CPack/WiX/cmWIXPatchParser.h
@ -3,9 +3,9 @@
 #ifndef cmCPackWIXPatchParser_h
 #define cmCPackWIXPatchParser_h

-#include <CPack/cmCPackLog.h>
+#include "cmCPackLog.h"

-#include <cmXMLParser.h>
+#include "cmXMLParser.h"

 #include <list>
 #include <map>
--- a/Source/CPack/WiX/cmWIXRichTextFormatWriter.cxx
+++ b/Source/CPack/WiX/cmWIXRichTextFormatWriter.cxx
@ -2,7 +2,7 @@
   file Copyright.txt or https://cmake.org/licensing for details.  */
 #include "cmWIXRichTextFormatWriter.h"

-#include <cmVersion.h>
+#include "cmVersion.h"

 cmWIXRichTextFormatWriter::cmWIXRichTextFormatWriter(
  std::string const& filename)
--- a/Source/CPack/WiX/cmWIXRichTextFormatWriter.h
+++ b/Source/CPack/WiX/cmWIXRichTextFormatWriter.h
@ -3,9 +3,9 @@
 #ifndef cmWIXRichTextFormatWriter_h
 #define cmWIXRichTextFormatWriter_h

-#include <cmConfigure.h>
+#include "cmConfigure.h"

-#include <cmsys/FStream.hxx>
+#include "cmsys/FStream.hxx"
 #include <string>

 /** \class cmWIXRichtTextFormatWriter
--- a/Source/CPack/WiX/cmWIXShortcut.h
+++ b/Source/CPack/WiX/cmWIXShortcut.h
@ -3,7 +3,7 @@
 #ifndef cmWIXShortcut_h
 #define cmWIXShortcut_h

-#include <cmInstalledFile.h>
+#include "cmInstalledFile.h"

 #include <map>
 #include <set>
--- a/Source/CPack/WiX/cmWIXSourceWriter.cxx
+++ b/Source/CPack/WiX/cmWIXSourceWriter.cxx
@ -2,9 +2,9 @@
   file Copyright.txt or https://cmake.org/licensing for details.  */
 #include "cmWIXSourceWriter.h"

-#include <CPack/cmCPackGenerator.h>
+#include "cmCPackGenerator.h"

-#include <cmUuid.h>
+#include "cmUuid.h"

 #include <windows.h>

--- a/Source/CPack/WiX/cmWIXSourceWriter.h
+++ b/Source/CPack/WiX/cmWIXSourceWriter.h
@ -3,9 +3,9 @@
 #ifndef cmWIXSourceWriter_h
 #define cmWIXSourceWriter_h

-#include <CPack/cmCPackLog.h>
+#include "cmCPackLog.h"

-#include <cmsys/FStream.hxx>
+#include "cmsys/FStream.hxx"

 #include <string>
 #include <vector>
--- a/Source/CPack/cmCPack7zGenerator.h
+++ b/Source/CPack/cmCPack7zGenerator.h
@ -3,7 +3,7 @@
 #ifndef cmCPack7zGenerator_h
 #define cmCPack7zGenerator_h

-#include <cmConfigure.h>
+#include "cmConfigure.h"

 #include "cmCPackArchiveGenerator.h"
 #include "cmCPackGenerator.h"
--- a/Source/CPack/cmCPackArchiveGenerator.h
+++ b/Source/CPack/cmCPackArchiveGenerator.h
@ -3,7 +3,7 @@
 #ifndef cmCPackArchiveGenerator_h
 #define cmCPackArchiveGenerator_h

-#include <cmConfigure.h>
+#include "cmConfigure.h"

 #include "cmArchiveWrite.h"
 #include "cmCPackGenerator.h"
--- a/Source/CPack/cmCPackBundleGenerator.h
+++ b/Source/CPack/cmCPackBundleGenerator.h
@ -3,7 +3,8 @@
 #ifndef cmCPackBundleGenerator_h
 #define cmCPackBundleGenerator_h

-#include <cmConfigure.h>
+#include "cmConfigure.h"
+
 #include <string>

 #include "cmCPackDragNDropGenerator.h"
--- a/Source/CPack/cmCPackComponentGroup.h
+++ b/Source/CPack/cmCPackComponentGroup.h
@ -3,7 +3,7 @@
 #ifndef cmCPackComponentGroup_h
 #define cmCPackComponentGroup_h

-#include <cmConfigure.h>
+#include "cmConfigure.h"

 #include <string>
 #include <vector>
--- a/Source/CPack/cmCPackCygwinBinaryGenerator.cxx
+++ b/Source/CPack/cmCPackCygwinBinaryGenerator.cxx
@ -9,7 +9,7 @@
 #include "cmSystemTools.h"
 #include "cmake.h"

-#include <cmsys/SystemTools.hxx>
+#include "cmsys/SystemTools.hxx"

 cmCPackCygwinBinaryGenerator::cmCPackCygwinBinaryGenerator()
 {
--- a/Source/CPack/cmCPackCygwinSourceGenerator.cxx
+++ b/Source/CPack/cmCPackCygwinSourceGenerator.cxx
@ -9,7 +9,7 @@
 #include "cmSystemTools.h"
 #include "cmake.h"

-#include <cmsys/SystemTools.hxx>
+#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
--- a/Source/CPack/cmCPackDebGenerator.cxx
+++ b/Source/CPack/cmCPackDebGenerator.cxx
@ -10,7 +10,7 @@
 #include "cmSystemTools.h"
 #include "cm_sys_stat.h"

-#include <cmsys/Glob.hxx>
+#include "cmsys/Glob.hxx"
 #include <limits.h>
 #include <map>
 #include <ostream>
--- a/Source/CPack/cmCPackDebGenerator.h
+++ b/Source/CPack/cmCPackDebGenerator.h
@ -3,7 +3,7 @@
 #ifndef cmCPackDebGenerator_h
 #define cmCPackDebGenerator_h

-#include <cmConfigure.h>
+#include "cmConfigure.h"

 #include "cmCPackGenerator.h"

--- a/Source/CPack/cmCPackDragNDropGenerator.cxx
+++ b/Source/CPack/cmCPackDragNDropGenerator.cxx
@ -7,8 +7,8 @@
 #include "cmGeneratedFileStream.h"
 #include "cmSystemTools.h"

-#include <cmsys/FStream.hxx>
-#include <cmsys/RegularExpression.hxx>
+#include "cmsys/FStream.hxx"
+#include "cmsys/RegularExpression.hxx"
 #include <iomanip>
 #include <map>
 #include <stdlib.h>
--- a/Source/CPack/cmCPackDragNDropGenerator.h
+++ b/Source/CPack/cmCPackDragNDropGenerator.h
@ -3,7 +3,8 @@
 #ifndef cmCPackDragNDropGenerator_h
 #define cmCPackDragNDropGenerator_h

-#include <cmConfigure.h>
+#include "cmConfigure.h"
+
 #include <sstream>
 #include <stddef.h>
 #include <string>
--- a/Source/CPack/cmCPackGenerator.cxx
+++ b/Source/CPack/cmCPackGenerator.cxx
@ -2,10 +2,10 @@
   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 <cmsys/FStream.hxx>
-#include <cmsys/Glob.hxx>
-#include <cmsys/RegularExpression.hxx>
 #include <list>
 #include <utility>

--- a/Source/CPack/cmCPackGenerator.h
+++ b/Source/CPack/cmCPackGenerator.h
@ -3,7 +3,7 @@
 #ifndef cmCPackGenerator_h
 #define cmCPackGenerator_h

-#include <cmConfigure.h>
+#include "cmConfigure.h"

 #include <map>
 #include <sstream>
--- a/Source/CPack/cmCPackGeneratorFactory.cxx
+++ b/Source/CPack/cmCPackGeneratorFactory.cxx
@ -2,7 +2,7 @@
   file Copyright.txt or https://cmake.org/licensing for details.  */
 #include "cmCPackGeneratorFactory.h"

-#include <cmConfigure.h>
+#include "cmConfigure.h"
 #include <ostream>
 #include <utility>

--- a/Source/CPack/cmCPackGeneratorFactory.h
+++ b/Source/CPack/cmCPackGeneratorFactory.h
@ -3,7 +3,7 @@
 #ifndef cmCPackGeneratorFactory_h
 #define cmCPackGeneratorFactory_h

-#include <cmConfigure.h> // IWYU pragma: keep
+#include "cmConfigure.h" // IWYU pragma: keep

 #include <map>
 #include <string>
--- a/Source/CPack/cmCPackLog.cxx
+++ b/Source/CPack/cmCPackLog.cxx
@ -2,7 +2,7 @@
   file Copyright.txt or https://cmake.org/licensing for details.  */
 #include "cmCPackLog.h"

-#include <cmConfigure.h>
+#include "cmConfigure.h"
 #include <iostream>

 #include "cmGeneratedFileStream.h"
--- a/Source/CPack/cmCPackLog.h
+++ b/Source/CPack/cmCPackLog.h
@ -3,7 +3,7 @@
 #ifndef cmCPackLog_h
 #define cmCPackLog_h

-#include <cmConfigure.h> // IWYU pragma: keep
+#include "cmConfigure.h" // IWYU pragma: keep

 #include <ostream>
 #include <string.h>
--- a/Source/CPack/cmCPackNSISGenerator.cxx
+++ b/Source/CPack/cmCPackNSISGenerator.cxx
@ -8,9 +8,9 @@
 #include "cmGeneratedFileStream.h"
 #include "cmSystemTools.h"

+#include "cmsys/Directory.hxx"
+#include "cmsys/RegularExpression.hxx"
 #include <algorithm>
-#include <cmsys/Directory.hxx>
-#include <cmsys/RegularExpression.hxx>
 #include <map>
 #include <sstream>
 #include <stdlib.h>
--- a/Source/CPack/cmCPackNSISGenerator.h
+++ b/Source/CPack/cmCPackNSISGenerator.h
@ -3,7 +3,7 @@
 #ifndef cmCPackNSISGenerator_h
 #define cmCPackNSISGenerator_h

-#include <cmConfigure.h>
+#include "cmConfigure.h"

 #include "cmCPackGenerator.h"

--- a/Source/CPack/cmCPackOSXX11Generator.h
+++ b/Source/CPack/cmCPackOSXX11Generator.h
@ -3,7 +3,8 @@
 #ifndef cmCPackOSXX11Generator_h
 #define cmCPackOSXX11Generator_h

-#include <cmConfigure.h>
+#include "cmConfigure.h"
+
 #include <string>

 #include "cmCPackGenerator.h"
--- a/Source/CPack/cmCPackPKGGenerator.h
+++ b/Source/CPack/cmCPackPKGGenerator.h
@ -3,7 +3,8 @@
 #ifndef cmCPackPKGGenerator_h
 #define cmCPackPKGGenerator_h

-#include <cmConfigure.h>
+#include "cmConfigure.h"
+
 #include <set>
 #include <sstream>
 #include <string>
--- a/Source/CPack/cmCPackPackageMakerGenerator.cxx
+++ b/Source/CPack/cmCPackPackageMakerGenerator.cxx
@ -2,9 +2,9 @@
   file Copyright.txt or https://cmake.org/licensing for details.  */
 #include "cmCPackPackageMakerGenerator.h"

+#include "cmsys/FStream.hxx"
+#include "cmsys/RegularExpression.hxx"
 #include <assert.h>
-#include <cmsys/FStream.hxx>
-#include <cmsys/RegularExpression.hxx>
 #include <map>
 #include <sstream>
 #include <stdio.h>
--- a/Source/CPack/cmCPackPackageMakerGenerator.h
+++ b/Source/CPack/cmCPackPackageMakerGenerator.h
@ -3,7 +3,7 @@
 #ifndef cmCPackPackageMakerGenerator_h
 #define cmCPackPackageMakerGenerator_h

-#include <cmConfigure.h>
+#include "cmConfigure.h"

 #include "cmCPackGenerator.h"
 #include "cmCPackPKGGenerator.h"
--- a/Source/CPack/cmCPackProductBuildGenerator.h
+++ b/Source/CPack/cmCPackProductBuildGenerator.h
@ -3,7 +3,8 @@
 #ifndef cmCPackProductBuildGenerator_h
 #define cmCPackProductBuildGenerator_h

-#include <cmConfigure.h>
+#include "cmConfigure.h"
+
 #include <string>

 #include "cmCPackGenerator.h"
--- a/Source/CPack/cmCPackRPMGenerator.h
+++ b/Source/CPack/cmCPackRPMGenerator.h
@ -3,7 +3,7 @@
 #ifndef cmCPackRPMGenerator_h
 #define cmCPackRPMGenerator_h

-#include <cmConfigure.h>
+#include "cmConfigure.h"

 #include "cmCPackGenerator.h"

--- a/Source/CPack/cmCPackSTGZGenerator.cxx
+++ b/Source/CPack/cmCPackSTGZGenerator.cxx
@ -2,7 +2,7 @@
   file Copyright.txt or https://cmake.org/licensing for details.  */
 #include "cmCPackSTGZGenerator.h"

-#include <cmsys/FStream.hxx>
+#include "cmsys/FStream.hxx"
 #include <sstream>
 #include <stdio.h>
 #include <string>
--- a/Source/CPack/cmCPackSTGZGenerator.h
+++ b/Source/CPack/cmCPackSTGZGenerator.h
@ -3,7 +3,7 @@
 #ifndef cmCPackSTGZGenerator_h
 #define cmCPackSTGZGenerator_h

-#include <cmConfigure.h>
+#include "cmConfigure.h"

 #include "cmCPackGenerator.h"
 #include "cmCPackTGZGenerator.h"
--- a/Source/CPack/cmCPackTGZGenerator.h
+++ b/Source/CPack/cmCPackTGZGenerator.h
@ -3,7 +3,7 @@
 #ifndef cmCPackTGZGenerator_h
 #define cmCPackTGZGenerator_h

-#include <cmConfigure.h>
+#include "cmConfigure.h"

 #include "cmCPackArchiveGenerator.h"
 #include "cmCPackGenerator.h"
--- a/Source/CPack/cmCPackTXZGenerator.h
+++ b/Source/CPack/cmCPackTXZGenerator.h
@ -3,7 +3,7 @@
 #ifndef cmCPackTXZGenerator_h
 #define cmCPackTXZGenerator_h

-#include <cmConfigure.h>
+#include "cmConfigure.h"

 #include "cmCPackArchiveGenerator.h"
 #include "cmCPackGenerator.h"
--- a/Source/CPack/cmCPackTarBZip2Generator.h
+++ b/Source/CPack/cmCPackTarBZip2Generator.h
@ -3,7 +3,7 @@
 #ifndef cmCPackTarBZip2Generator_h
 #define cmCPackTarBZip2Generator_h

-#include <cmConfigure.h>
+#include "cmConfigure.h"

 #include "cmCPackArchiveGenerator.h"
 #include "cmCPackGenerator.h"
--- a/Source/CPack/cmCPackTarCompressGenerator.h
+++ b/Source/CPack/cmCPackTarCompressGenerator.h
@ -3,7 +3,7 @@
 #ifndef cmCPackTarCompressGenerator_h
 #define cmCPackTarCompressGenerator_h

-#include <cmConfigure.h>
+#include "cmConfigure.h"

 #include "cmCPackArchiveGenerator.h"
 #include "cmCPackGenerator.h"
--- a/Source/CPack/cmCPackZIPGenerator.h
+++ b/Source/CPack/cmCPackZIPGenerator.h
@ -3,7 +3,7 @@
 #ifndef cmCPackZIPGenerator_h
 #define cmCPackZIPGenerator_h

-#include <cmConfigure.h>
+#include "cmConfigure.h"

 #include "cmCPackArchiveGenerator.h"
 #include "cmCPackGenerator.h"
--- a/Source/CPack/cpack.cxx
+++ b/Source/CPack/cpack.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>
+#include "cmConfigure.h"

-#include <cmsys/CommandLineArguments.hxx>
-#include <cmsys/Encoding.hxx>
+#include "cmsys/CommandLineArguments.hxx"
+#include "cmsys/Encoding.hxx"
 #include <iostream>
 #include <map>
 #include <sstream>
@ -13,7 +13,7 @@
 #include <vector>

 #if defined(_WIN32) && defined(CMAKE_BUILD_WITH_CMAKE)
-#include <cmsys/ConsoleBuf.hxx>
+#include "cmsys/ConsoleBuf.hxx"
 #endif

 #include "cmCPackGenerator.h"
--- a/Source/CTest/cmCTestBZR.cxx
+++ b/Source/CTest/cmCTestBZR.cxx
@ -8,8 +8,8 @@
 #include "cmSystemTools.h"
 #include "cmXMLParser.h"

-#include <cm_expat.h>
-#include <cmsys/RegularExpression.hxx>
+#include "cm_expat.h"
+#include "cmsys/RegularExpression.hxx"
 #include <list>
 #include <map>
 #include <ostream>
--- a/Source/CTest/cmCTestBZR.h
+++ b/Source/CTest/cmCTestBZR.h
@ -3,7 +3,7 @@
 #ifndef cmCTestBZR_h
 #define cmCTestBZR_h

-#include <cmConfigure.h>
+#include "cmConfigure.h"

 #include "cmCTestGlobalVC.h"

--- a/Source/CTest/cmCTestBatchTestHandler.h
+++ b/Source/CTest/cmCTestBatchTestHandler.h
@ -3,10 +3,10 @@
 #ifndef cmCTestBatchTestHandler_h
 #define cmCTestBatchTestHandler_h

-#include <cmConfigure.h>
+#include "cmConfigure.h"

-#include <cmCTestMultiProcessHandler.h>
-#include <cmsys/FStream.hxx>
+#include "cmCTestMultiProcessHandler.h"
+#include "cmsys/FStream.hxx"
 #include <string>

 /** \class cmCTestBatchTestHandler
--- a/Source/CTest/cmCTestBuildAndTestHandler.cxx
+++ b/Source/CTest/cmCTestBuildAndTestHandler.cxx
@ -9,7 +9,7 @@
 #include "cmWorkingDirectory.h"
 #include "cmake.h"

-#include <cmsys/Process.h>
+#include "cmsys/Process.h"
 #include <stdlib.h>

 cmCTestBuildAndTestHandler::cmCTestBuildAndTestHandler()
--- a/Source/CTest/cmCTestBuildAndTestHandler.h
+++ b/Source/CTest/cmCTestBuildAndTestHandler.h
@ -3,7 +3,7 @@
 #ifndef cmCTestBuildAndTestHandler_h
 #define cmCTestBuildAndTestHandler_h

-#include <cmConfigure.h>
+#include "cmConfigure.h"

 #include "cmCTestGenericHandler.h"

--- a/Source/CTest/cmCTestBuildCommand.h
+++ b/Source/CTest/cmCTestBuildCommand.h
@ -3,7 +3,7 @@
 #ifndef cmCTestBuildCommand_h
 #define cmCTestBuildCommand_h

-#include <cmConfigure.h>
+#include "cmConfigure.h"

 #include "cmCTestHandlerCommand.h"

--- a/Source/CTest/cmCTestBuildHandler.cxx
+++ b/Source/CTest/cmCTestBuildHandler.cxx
@ -11,9 +11,9 @@
 #include "cmSystemTools.h"
 #include "cmXMLWriter.h"

-#include <cmsys/Directory.hxx>
-#include <cmsys/FStream.hxx>
-#include <cmsys/Process.h>
+#include "cmsys/Directory.hxx"
+#include "cmsys/FStream.hxx"
+#include "cmsys/Process.h"
 #include <set>
 #include <stdlib.h>
 #include <string.h>
--- a/Source/CTest/cmCTestBuildHandler.h
+++ b/Source/CTest/cmCTestBuildHandler.h
@ -3,12 +3,12 @@
 #ifndef cmCTestBuildHandler_h
 #define cmCTestBuildHandler_h

-#include <cmConfigure.h>
+#include "cmConfigure.h"

 #include "cmCTestGenericHandler.h"

-#include <cmProcessOutput.h>
-#include <cmsys/RegularExpression.hxx>
+#include "cmProcessOutput.h"
+#include "cmsys/RegularExpression.hxx"
 #include <deque>
 #include <iosfwd>
 #include <stddef.h>
--- a/Source/CTest/cmCTestCVS.cxx
+++ b/Source/CTest/cmCTestCVS.cxx
@ -7,8 +7,8 @@
 #include "cmSystemTools.h"
 #include "cmXMLWriter.h"

-#include <cmsys/FStream.hxx>
-#include <cmsys/RegularExpression.hxx>
+#include "cmsys/FStream.hxx"
+#include "cmsys/RegularExpression.hxx"
 #include <utility>

 cmCTestCVS::cmCTestCVS(cmCTest* ct, std::ostream& log)
--- a/Source/CTest/cmCTestCVS.h
+++ b/Source/CTest/cmCTestCVS.h
@ -3,7 +3,7 @@
 #ifndef cmCTestCVS_h
 #define cmCTestCVS_h

-#include <cmConfigure.h>
+#include "cmConfigure.h"

 #include "cmCTestVC.h"

--- a/Source/CTest/cmCTestConfigureCommand.h
+++ b/Source/CTest/cmCTestConfigureCommand.h
@ -3,7 +3,7 @@
 #ifndef cmCTestConfigureCommand_h
 #define cmCTestConfigureCommand_h

-#include <cmConfigure.h>
+#include "cmConfigure.h"

 #include "cmCTestHandlerCommand.h"

--- a/Source/CTest/cmCTestConfigureHandler.h
+++ b/Source/CTest/cmCTestConfigureHandler.h
@ -3,7 +3,7 @@
 #ifndef cmCTestConfigureHandler_h
 #define cmCTestConfigureHandler_h

-#include <cmConfigure.h>
+#include "cmConfigure.h"

 #include "cmCTestGenericHandler.h"

--- a/Source/CTest/cmCTestCoverageCommand.h
+++ b/Source/CTest/cmCTestCoverageCommand.h
@ -3,7 +3,7 @@
 #ifndef cmCTestCoverageCommand_h
 #define cmCTestCoverageCommand_h

-#include <cmConfigure.h>
+#include "cmConfigure.h"

 #include "cmCTestHandlerCommand.h"

--- a/Source/CTest/cmCTestCoverageHandler.cxx
+++ b/Source/CTest/cmCTestCoverageHandler.cxx
@ -16,11 +16,11 @@
 #include "cmXMLWriter.h"
 #include "cmake.h"

+#include "cmsys/FStream.hxx"
+#include "cmsys/Glob.hxx"
+#include "cmsys/Process.h"
+#include "cmsys/RegularExpression.hxx"
 #include <algorithm>
-#include <cmsys/FStream.hxx>
-#include <cmsys/Glob.hxx>
-#include <cmsys/Process.h>
-#include <cmsys/RegularExpression.hxx>
 #include <iomanip>
 #include <iterator>
 #include <sstream>
--- a/Source/CTest/cmCTestCoverageHandler.h
+++ b/Source/CTest/cmCTestCoverageHandler.h
@ -3,11 +3,11 @@
 #ifndef cmCTestCoverageHandler_h
 #define cmCTestCoverageHandler_h

-#include <cmConfigure.h>
+#include "cmConfigure.h"

 #include "cmCTestGenericHandler.h"

-#include <cmsys/RegularExpression.hxx>
+#include "cmsys/RegularExpression.hxx"
 #include <iosfwd>
 #include <map>
 #include <set>
--- a/Source/CTest/cmCTestCurl.cxx
+++ b/Source/CTest/cmCTestCurl.cxx
@ -5,7 +5,7 @@
 #include "cmCTest.h"
 #include "cmSystemTools.h"

-#include <cmConfigure.h>
+#include "cmConfigure.h"
 #include <ostream>
 #include <stdio.h>

--- a/Source/CTest/cmCTestCurl.h
+++ b/Source/CTest/cmCTestCurl.h
@ -3,9 +3,9 @@
 #ifndef cmCTestCurl_h
 #define cmCTestCurl_h

-#include <cmConfigure.h> // IWYU pragma: keep
+#include "cmConfigure.h" // IWYU pragma: keep

-#include <cm_curl.h>
+#include "cm_curl.h"
 #include <string>
 #include <vector>

--- a/Source/CTest/cmCTestEmptyBinaryDirectoryCommand.h
+++ b/Source/CTest/cmCTestEmptyBinaryDirectoryCommand.h
@ -3,7 +3,7 @@
 #ifndef cmCTestEmptyBinaryDirectoryCommand_h
 #define cmCTestEmptyBinaryDirectoryCommand_h

-#include <cmConfigure.h>
+#include "cmConfigure.h"

 #include "cmCTestCommand.h"

--- a/Source/CTest/cmCTestGIT.cxx
+++ b/Source/CTest/cmCTestGIT.cxx
@ -2,8 +2,8 @@
   file Copyright.txt or https://cmake.org/licensing for details.  */
 #include "cmCTestGIT.h"

-#include <cmsys/FStream.hxx>
-#include <cmsys/Process.h>
+#include "cmsys/FStream.hxx"
+#include "cmsys/Process.h"
 #include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
--- a/Source/CTest/cmCTestGIT.h
+++ b/Source/CTest/cmCTestGIT.h
@ -3,7 +3,7 @@
 #ifndef cmCTestGIT_h
 #define cmCTestGIT_h

-#include <cmConfigure.h>
+#include "cmConfigure.h"

 #include "cmCTestGlobalVC.h"

--- a/Source/CTest/cmCTestGenericHandler.cxx
+++ b/Source/CTest/cmCTestGenericHandler.cxx
@ -2,7 +2,7 @@
   file Copyright.txt or https://cmake.org/licensing for details.  */
 #include "cmCTestGenericHandler.h"

-#include <cmConfigure.h>
+#include "cmConfigure.h"
 #include <sstream>
 #include <utility>

--- a/Source/CTest/cmCTestGenericHandler.h
+++ b/Source/CTest/cmCTestGenericHandler.h
@ -3,7 +3,7 @@
 #ifndef cmCTestGenericHandler_h
 #define cmCTestGenericHandler_h

-#include <cmConfigure.h> // IWYU pragma: keep
+#include "cmConfigure.h" // IWYU pragma: keep

 #include <map>
 #include <stddef.h>
--- a/Source/CTest/cmCTestGlobalVC.h
+++ b/Source/CTest/cmCTestGlobalVC.h
@ -3,7 +3,7 @@
 #ifndef cmCTestGlobalVC_h
 #define cmCTestGlobalVC_h

-#include <cmConfigure.h>
+#include "cmConfigure.h"

 #include "cmCTestVC.h"

--- a/Source/CTest/cmCTestHG.cxx
+++ b/Source/CTest/cmCTestHG.cxx
@ -8,7 +8,7 @@
 #include "cmSystemTools.h"
 #include "cmXMLParser.h"

-#include <cmsys/RegularExpression.hxx>
+#include "cmsys/RegularExpression.hxx"
 #include <ostream>
 #include <vector>

--- a/Source/CTest/cmCTestHG.h
+++ b/Source/CTest/cmCTestHG.h
@ -3,7 +3,7 @@
 #ifndef cmCTestHG_h
 #define cmCTestHG_h

-#include <cmConfigure.h>
+#include "cmConfigure.h"

 #include "cmCTestGlobalVC.h"

--- a/Source/CTest/cmCTestHandlerCommand.h
+++ b/Source/CTest/cmCTestHandlerCommand.h
@ -3,7 +3,7 @@
 #ifndef cmCTestHandlerCommand_h
 #define cmCTestHandlerCommand_h

-#include <cmConfigure.h>
+#include "cmConfigure.h"

 #include "cmCTestCommand.h"

--- a/Source/CTest/cmCTestLaunch.cxx
+++ b/Source/CTest/cmCTestLaunch.cxx
@ -2,11 +2,11 @@
   file Copyright.txt or https://cmake.org/licensing for details.  */
 #include "cmCTestLaunch.h"

-#include <cmConfigure.h>
+#include "cmConfigure.h"

-#include <cmsys/FStream.hxx>
-#include <cmsys/Process.h>
-#include <cmsys/RegularExpression.hxx>
+#include "cmsys/FStream.hxx"
+#include "cmsys/Process.h"
+#include "cmsys/RegularExpression.hxx"
 #include <iostream>
 #include <stdlib.h>
 #include <string.h>
--- a/Source/CTest/cmCTestLaunch.h
+++ b/Source/CTest/cmCTestLaunch.h
@ -3,9 +3,9 @@
 #ifndef cmCTestLaunch_h
 #define cmCTestLaunch_h

-#include <cmConfigure.h> // IWYU pragma: keep
+#include "cmConfigure.h" // IWYU pragma: keep

-#include <cmsys/RegularExpression.hxx>
+#include "cmsys/RegularExpression.hxx"
 #include <set>
 #include <string>
 #include <vector>
--- a/Source/CTest/cmCTestMemCheckCommand.h
+++ b/Source/CTest/cmCTestMemCheckCommand.h
@ -3,7 +3,7 @@
 #ifndef cmCTestMemCheckCommand_h
 #define cmCTestMemCheckCommand_h

-#include <cmConfigure.h>
+#include "cmConfigure.h"

 #include "cmCTestTestCommand.h"

--- a/Source/CTest/cmCTestMemCheckHandler.cxx
+++ b/Source/CTest/cmCTestMemCheckHandler.cxx
@ -7,9 +7,9 @@
 #include "cmXMLParser.h"
 #include "cmXMLWriter.h"

-#include <cmsys/FStream.hxx>
-#include <cmsys/Glob.hxx>
-#include <cmsys/RegularExpression.hxx>
+#include "cmsys/FStream.hxx"
+#include "cmsys/Glob.hxx"
+#include "cmsys/RegularExpression.hxx"
 #include <iostream>
 #include <sstream>
 #include <string.h>
--- a/Source/CTest/cmCTestMemCheckHandler.h
+++ b/Source/CTest/cmCTestMemCheckHandler.h
@ -3,7 +3,7 @@
 #ifndef cmCTestMemCheckHandler_h
 #define cmCTestMemCheckHandler_h

-#include <cmConfigure.h>
+#include "cmConfigure.h"

 #include "cmCTestTestHandler.h"

--- a/Source/CTest/cmCTestMultiProcessHandler.cxx
+++ b/Source/CTest/cmCTestMultiProcessHandler.cxx
@ -9,10 +9,10 @@
 #include "cmSystemTools.h"
 #include "cmWorkingDirectory.h"

+#include "cmsys/FStream.hxx"
+#include "cmsys/String.hxx"
+#include "cmsys/SystemInformation.hxx"
 #include <algorithm>
-#include <cmsys/FStream.hxx>
-#include <cmsys/String.hxx>
-#include <cmsys/SystemInformation.hxx>
 #include <iomanip>
 #include <list>
 #include <math.h>
--- a/Source/CTest/cmCTestMultiProcessHandler.h
+++ b/Source/CTest/cmCTestMultiProcessHandler.h
@ -3,9 +3,9 @@
 #ifndef cmCTestMultiProcessHandler_h
 #define cmCTestMultiProcessHandler_h

-#include <cmConfigure.h> // IWYU pragma: keep
+#include "cmConfigure.h" // IWYU pragma: keep

-#include <cmCTestTestHandler.h>
+#include "cmCTestTestHandler.h"
 #include <map>
 #include <set>
 #include <stddef.h>
--- a/Source/CTest/cmCTestP4.cxx
+++ b/Source/CTest/cmCTestP4.cxx
@ -7,8 +7,8 @@
 #include "cmProcessTools.h"
 #include "cmSystemTools.h"

+#include "cmsys/RegularExpression.hxx"
 #include <algorithm>
-#include <cmsys/RegularExpression.hxx>
 #include <ostream>
 #include <time.h>
 #include <utility>
--- a/Source/CTest/cmCTestP4.h
+++ b/Source/CTest/cmCTestP4.h
@ -3,7 +3,7 @@
 #ifndef cmCTestP4_h
 #define cmCTestP4_h

-#include <cmConfigure.h>
+#include "cmConfigure.h"

 #include "cmCTestGlobalVC.h"

--- a/Source/CTest/cmCTestReadCustomFilesCommand.h
+++ b/Source/CTest/cmCTestReadCustomFilesCommand.h
@ -3,7 +3,7 @@
 #ifndef cmCTestReadCustomFilesCommand_h
 #define cmCTestReadCustomFilesCommand_h

-#include <cmConfigure.h>
+#include "cmConfigure.h"

 #include "cmCTestCommand.h"

--- a/Source/CTest/cmCTestRunScriptCommand.h
+++ b/Source/CTest/cmCTestRunScriptCommand.h
@ -3,7 +3,7 @@
 #ifndef cmCTestRunScriptCommand_h
 #define cmCTestRunScriptCommand_h

-#include <cmConfigure.h>
+#include "cmConfigure.h"

 #include "cmCTestCommand.h"

--- a/Source/CTest/cmCTestRunTest.cxx
+++ b/Source/CTest/cmCTestRunTest.cxx
@ -9,12 +9,12 @@
 #include "cmSystemTools.h"
 #include "cmWorkingDirectory.h"

-#include <cmConfigure.h>
-#include <cm_curl.h>
-#include <cm_zlib.h>
-#include <cmsys/Base64.h>
-#include <cmsys/Process.h>
-#include <cmsys/RegularExpression.hxx>
+#include "cmConfigure.h"
+#include "cm_curl.h"
+#include "cm_zlib.h"
+#include "cmsys/Base64.h"
+#include "cmsys/Process.h"
+#include "cmsys/RegularExpression.hxx"
 #include <iomanip>
 #include <sstream>
 #include <stdio.h>
--- a/Source/CTest/cmCTestRunTest.h
+++ b/Source/CTest/cmCTestRunTest.h
@ -3,7 +3,7 @@
 #ifndef cmCTestRunTest_h
 #define cmCTestRunTest_h

-#include <cmConfigure.h> // IWYU pragma: keep
+#include "cmConfigure.h" // IWYU pragma: keep

 #include <set>
 #include <stddef.h>
--- a/Source/CTest/cmCTestSVN.cxx
+++ b/Source/CTest/cmCTestSVN.cxx
@ -9,7 +9,7 @@
 #include "cmXMLParser.h"
 #include "cmXMLWriter.h"

-#include <cmsys/RegularExpression.hxx>
+#include "cmsys/RegularExpression.hxx"
 #include <map>
 #include <ostream>
 #include <stdlib.h>
--- a/Source/CTest/cmCTestSVN.h
+++ b/Source/CTest/cmCTestSVN.h
@ -3,7 +3,7 @@
 #ifndef cmCTestSVN_h
 #define cmCTestSVN_h

-#include <cmConfigure.h>
+#include "cmConfigure.h"

 #include "cmCTestGlobalVC.h"

--- a/Source/CTest/cmCTestScriptHandler.cxx
+++ b/Source/CTest/cmCTestScriptHandler.cxx
@ -2,8 +2,8 @@
   file Copyright.txt or https://cmake.org/licensing for details.  */
 #include "cmCTestScriptHandler.h"

-#include <cmsys/Directory.hxx>
-#include <cmsys/Process.h>
+#include "cmsys/Directory.hxx"
+#include "cmsys/Process.h"
 #include <map>
 #include <sstream>
 #include <stdio.h>
--- a/Show More
+++ b/Show More