diff --git a/Source/cmArchiveWrite.cxx b/Source/cmArchiveWrite.cxx index 3da4f28ff7..0504f70696 100644 --- a/Source/cmArchiveWrite.cxx +++ b/Source/cmArchiveWrite.cxx @@ -16,7 +16,11 @@ #include "cm_get_date.h" #include #include +#include #include +#include +#include +#include #ifndef __LA_SSIZE_T #define __LA_SSIZE_T la_ssize_t @@ -268,7 +272,7 @@ bool cmArchiveWrite::AddFile(const char* file, size_t skip, const char* prefix) } if (this->PermissionsMask.IsSet()) { - mode_t perm = archive_entry_perm(e); + int perm = archive_entry_perm(e); archive_entry_set_perm(e, perm & this->PermissionsMask.Get()); } diff --git a/Source/cmArchiveWrite.h b/Source/cmArchiveWrite.h index f847d09b74..120453b134 100644 --- a/Source/cmArchiveWrite.h +++ b/Source/cmArchiveWrite.h @@ -12,7 +12,11 @@ #ifndef cmArchiveWrite_h #define cmArchiveWrite_h -#include "cmStandardIncludes.h" +#include // IWYU pragma: keep + +#include +#include +#include #if !defined(CMAKE_BUILD_WITH_CMAKE) #error "cmArchiveWrite not allowed during bootstrap build!" @@ -94,7 +98,7 @@ public: void SetMTime(std::string const& t) { this->MTime = t; } //! Sets the permissions of the added files/folders - void SetPermissions(mode_t permissions_) + void SetPermissions(int permissions_) { this->Permissions.Set(permissions_); } @@ -107,7 +111,7 @@ public: //! The permissions will be copied from the existing file //! or folder. The mask will then be applied to unset //! some of them - void SetPermissionsMask(mode_t permissionsMask_) + void SetPermissionsMask(int permissionsMask_) { this->PermissionsMask.Set(permissionsMask_); } @@ -177,8 +181,8 @@ private: //!@} //! Permissions on files/folders - cmArchiveWriteOptional Permissions; - cmArchiveWriteOptional PermissionsMask; + cmArchiveWriteOptional Permissions; + cmArchiveWriteOptional PermissionsMask; }; #endif diff --git a/Source/cmCLocaleEnvironmentScope.cxx b/Source/cmCLocaleEnvironmentScope.cxx index e4c74eccab..e38f531608 100644 --- a/Source/cmCLocaleEnvironmentScope.cxx +++ b/Source/cmCLocaleEnvironmentScope.cxx @@ -15,6 +15,7 @@ #include "cmSystemTools.h" #include +#include cmCLocaleEnvironmentScope::cmCLocaleEnvironmentScope() { diff --git a/Source/cmCLocaleEnvironmentScope.h b/Source/cmCLocaleEnvironmentScope.h index b011741a3b..572beafe52 100644 --- a/Source/cmCLocaleEnvironmentScope.h +++ b/Source/cmCLocaleEnvironmentScope.h @@ -13,7 +13,10 @@ #ifndef cmCLocaleEnvironmentScope_h #define cmCLocaleEnvironmentScope_h -#include "cmStandardIncludes.h" +#include // IWYU pragma: keep + +#include +#include class cmCLocaleEnvironmentScope { diff --git a/Source/cmCPackPropertiesGenerator.cxx b/Source/cmCPackPropertiesGenerator.cxx index af01c7d802..ae6b0a1319 100644 --- a/Source/cmCPackPropertiesGenerator.cxx +++ b/Source/cmCPackPropertiesGenerator.cxx @@ -1,8 +1,13 @@ #include "cmCPackPropertiesGenerator.h" -#include "cmLocalGenerator.h" +#include "cmGeneratorExpression.h" +#include "cmInstalledFile.h" #include "cmOutputConverter.h" +#include +#include +#include + cmCPackPropertiesGenerator::cmCPackPropertiesGenerator( cmLocalGenerator* lg, cmInstalledFile const& installedFile, std::vector const& configurations) diff --git a/Source/cmCPackPropertiesGenerator.h b/Source/cmCPackPropertiesGenerator.h index 4d092f6c49..77018b07df 100644 --- a/Source/cmCPackPropertiesGenerator.h +++ b/Source/cmCPackPropertiesGenerator.h @@ -12,9 +12,15 @@ #ifndef cmCPackPropertiesGenerator_h #define cmCPackPropertiesGenerator_h -#include "cmInstalledFile.h" +#include // IWYU pragma: keep + #include "cmScriptGenerator.h" +#include +#include +#include + +class cmInstalledFile; class cmLocalGenerator; /** \class cmCPackPropertiesGenerator diff --git a/Source/cmCacheManager.cxx b/Source/cmCacheManager.cxx index bdd73037ce..5b76162ba3 100644 --- a/Source/cmCacheManager.cxx +++ b/Source/cmCacheManager.cxx @@ -16,10 +16,12 @@ #include "cmVersion.h" #include "cmake.h" -#include +#include #include #include -#include +#include +#include +#include cmCacheManager::cmCacheManager() { diff --git a/Source/cmCacheManager.h b/Source/cmCacheManager.h index 14e0f0a5f6..3e32cf0662 100644 --- a/Source/cmCacheManager.h +++ b/Source/cmCacheManager.h @@ -12,13 +12,19 @@ #ifndef cmCacheManager_h #define cmCacheManager_h -#include "cmStandardIncludes.h" +#include // IWYU pragma: keep #include "cmPropertyMap.h" #include "cmState.h" +#include +#include +#include +#include +#include +#include + class cmake; -class cmMarkAsAdvancedCommand; /** \class cmCacheManager * \brief Control class for cmake's cache diff --git a/Source/cmCommands.h b/Source/cmCommands.h index d0f1ab7796..034c9c7de9 100644 --- a/Source/cmCommands.h +++ b/Source/cmCommands.h @@ -12,7 +12,7 @@ #ifndef cmCommands_h #define cmCommands_h -#include "cmStandardIncludes.h" +#include // IWYU pragma: keep #include diff --git a/Source/cmCommonTargetGenerator.cxx b/Source/cmCommonTargetGenerator.cxx index 7ad18f064f..6167e2c038 100644 --- a/Source/cmCommonTargetGenerator.cxx +++ b/Source/cmCommonTargetGenerator.cxx @@ -11,13 +11,21 @@ ============================================================================*/ #include "cmCommonTargetGenerator.h" +#include +#include +#include +#include +#include + +#include "cmAlgorithms.h" #include "cmComputeLinkInformation.h" #include "cmGeneratorTarget.h" #include "cmGlobalCommonGenerator.h" #include "cmLocalCommonGenerator.h" +#include "cmLocalGenerator.h" #include "cmMakefile.h" #include "cmSourceFile.h" -#include "cmSystemTools.h" +#include "cmState.h" cmCommonTargetGenerator::cmCommonTargetGenerator(cmGeneratorTarget* gt) : GeneratorTarget(gt) diff --git a/Source/cmCommonTargetGenerator.h b/Source/cmCommonTargetGenerator.h index 0bafde9fee..d3f9d64632 100644 --- a/Source/cmCommonTargetGenerator.h +++ b/Source/cmCommonTargetGenerator.h @@ -12,9 +12,13 @@ #ifndef cmCommonTargetGenerator_h #define cmCommonTargetGenerator_h -#include "cmStandardIncludes.h" +#include // IWYU pragma: keep -#include "cmLocalGenerator.h" +#include "cmOutputConverter.h" + +#include +#include +#include class cmGeneratorTarget; class cmGlobalCommonGenerator; diff --git a/Source/cmComputeComponentGraph.h b/Source/cmComputeComponentGraph.h index fb95f9ad69..cc468d9887 100644 --- a/Source/cmComputeComponentGraph.h +++ b/Source/cmComputeComponentGraph.h @@ -12,11 +12,12 @@ #ifndef cmComputeComponentGraph_h #define cmComputeComponentGraph_h -#include "cmStandardIncludes.h" +#include // IWYU pragma: keep #include "cmGraphAdjacencyList.h" #include +#include /** \class cmComputeComponentGraph * \brief Analyze a graph to determine strongly connected components. diff --git a/Source/cmComputeLinkDepends.cxx b/Source/cmComputeLinkDepends.cxx index fffb77d8cc..98405cff70 100644 --- a/Source/cmComputeLinkDepends.cxx +++ b/Source/cmComputeLinkDepends.cxx @@ -13,13 +13,22 @@ #include "cmAlgorithms.h" #include "cmComputeComponentGraph.h" +#include "cmGeneratorTarget.h" #include "cmGlobalGenerator.h" #include "cmLocalGenerator.h" #include "cmMakefile.h" +#include "cmState.h" +#include "cmSystemTools.h" #include "cmTarget.h" #include "cmake.h" +#include #include +#include +#include +#include +#include +#include /* diff --git a/Source/cmComputeLinkDepends.h b/Source/cmComputeLinkDepends.h index 4a33aff618..7cd4140823 100644 --- a/Source/cmComputeLinkDepends.h +++ b/Source/cmComputeLinkDepends.h @@ -12,17 +12,22 @@ #ifndef cmComputeLinkDepends_h #define cmComputeLinkDepends_h -#include "cmStandardIncludes.h" +#include // IWYU pragma: keep #include "cmGraphAdjacencyList.h" #include "cmLinkItem.h" +#include "cmTargetLinkLibraryType.h" +#include #include +#include +#include +#include class cmComputeComponentGraph; +class cmGeneratorTarget; class cmGlobalGenerator; class cmMakefile; -class cmGeneratorTarget; class cmake; /** \class cmComputeLinkDepends diff --git a/Source/cmComputeLinkInformation.cxx b/Source/cmComputeLinkInformation.cxx index 7db5df3be0..82877f3c73 100644 --- a/Source/cmComputeLinkInformation.cxx +++ b/Source/cmComputeLinkInformation.cxx @@ -11,19 +11,25 @@ ============================================================================*/ #include "cmComputeLinkInformation.h" -#include "cmComputeLinkDepends.h" -#include "cmOrderDirectories.h" - #include "cmAlgorithms.h" +#include "cmComputeLinkDepends.h" #include "cmGeneratorTarget.h" #include "cmGlobalGenerator.h" #include "cmLocalGenerator.h" #include "cmMakefile.h" +#include "cmOrderDirectories.h" #include "cmOutputConverter.h" +#include "cmPolicies.h" #include "cmState.h" +#include "cmSystemTools.h" +#include "cmTarget.h" #include "cmake.h" +#include #include +#include +#include +#include //#define CM_COMPUTE_LINK_INFO_DEBUG diff --git a/Source/cmComputeLinkInformation.h b/Source/cmComputeLinkInformation.h index 023c781b61..7a67567d9f 100644 --- a/Source/cmComputeLinkInformation.h +++ b/Source/cmComputeLinkInformation.h @@ -12,15 +12,19 @@ #ifndef cmComputeLinkInformation_h #define cmComputeLinkInformation_h -#include "cmStandardIncludes.h" +#include // IWYU pragma: keep #include +#include +#include +#include +#include -class cmake; +class cmGeneratorTarget; class cmGlobalGenerator; class cmMakefile; -class cmGeneratorTarget; class cmOrderDirectories; +class cmake; /** \class cmComputeLinkInformation * \brief Compute link information for a target in one configuration. diff --git a/Source/cmComputeTargetDepends.cxx b/Source/cmComputeTargetDepends.cxx index ff7eb0b83a..dd07300630 100644 --- a/Source/cmComputeTargetDepends.cxx +++ b/Source/cmComputeTargetDepends.cxx @@ -12,18 +12,25 @@ #include "cmComputeTargetDepends.h" #include "cmComputeComponentGraph.h" +#include "cmGeneratorTarget.h" #include "cmGlobalGenerator.h" +#include "cmLinkItem.h" #include "cmLocalGenerator.h" #include "cmMakefile.h" +#include "cmPolicies.h" #include "cmSourceFile.h" #include "cmState.h" #include "cmSystemTools.h" #include "cmTarget.h" +#include "cmTargetDepend.h" #include "cmake.h" -#include - #include +#include +#include +#include + +class cmListFileBacktrace; /* diff --git a/Source/cmComputeTargetDepends.h b/Source/cmComputeTargetDepends.h index 9e51d4d301..587ac66750 100644 --- a/Source/cmComputeTargetDepends.h +++ b/Source/cmComputeTargetDepends.h @@ -12,16 +12,19 @@ #ifndef cmComputeTargetDepends_h #define cmComputeTargetDepends_h -#include "cmStandardIncludes.h" +#include // IWYU pragma: keep #include "cmGraphAdjacencyList.h" -#include +#include +#include +#include +#include class cmComputeComponentGraph; +class cmGeneratorTarget; class cmGlobalGenerator; class cmLinkItem; -class cmGeneratorTarget; class cmTargetDependSet; /** \class cmComputeTargetDepends