dilim/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-08-04 14:50:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

cmake.cxx: Organize includes

Browse Source 
Consolidate includes that are predicated on not-BOOTSTRAP, and move some
other conditional includes to be in their own 'group' rather than
interleaved with the bulk of includes. This combines the main block of
includes into an actual, single block which formatting tools can ensure
is lexicographically sorted, rather than being recognized as several,
separate blocks which had led to sorting being somewhat inconsistent.
This commit is contained in:
Matthew Woehlke
2026-04-20 11:11:11 -04:00
parent 1c4ef7291f
commit cba542f32c
1 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
Source/cmake.cxx
View File

@@ -40,14 +40,6 @@
#include "cmCMakePresetsGraph.h"
#include "cmCommandLineArgument.h"
#include "cmCommands.h"
#ifdef CMake_ENABLE_DEBUGGER
# include "cmDebuggerAdapter.h"
# ifdef _WIN32
# include "cmDebuggerWindowsPipeConnection.h"
# else //!_WIN32
# include "cmDebuggerPosixPipeConnection.h"
# endif //_WIN32
#endif
#include "cmDocumentation.h"
#include "cmDocumentationEntry.h"
#include "cmDuration.h"
@@ -57,18 +49,12 @@
#include "cmGlobCacheEntry.h" // IWYU pragma: keep
#include "cmGlobalGenerator.h"
#include "cmGlobalGeneratorFactory.h"
#include "cmJSONState.h"
#include "cmLinkLineComputer.h"
#include "cmList.h"
#include "cmLocalGenerator.h"
#include "cmMakefile.h"
#if !defined(CMAKE_BOOTSTRAP)
# include "cmMakefileProfilingData.h"
#endif
#include "cmJSONState.h"
#include "cmList.h"
#include "cmMessenger.h"
#ifndef CMAKE_BOOTSTRAP
# include "cmSarifLog.h"
#endif
#include "cmState.h"
#include "cmStateDirectory.h"
#include "cmStringAlgorithms.h"
@@ -80,6 +66,15 @@
#include "cmVersionConfig.h"
#include "cmWorkingDirectory.h"
#ifdef CMake_ENABLE_DEBUGGER
# include "cmDebuggerAdapter.h"
# ifdef _WIN32
# include "cmDebuggerWindowsPipeConnection.h"
# else //!_WIN32
# include "cmDebuggerPosixPipeConnection.h"
# endif //_WIN32
#endif
#if !defined(CMAKE_BOOTSTRAP)
# include <unordered_map>
@@ -92,6 +87,8 @@
# include "cmGraphVizWriter.h"
# include "cmInstrumentation.h"
# include "cmInstrumentationQuery.h"
# include "cmMakefileProfilingData.h"
# include "cmSarifLog.h"
# include "cmVariableWatch.h"
#endif