diff options
author | Ben Boeckel <ben.boeckel@kitware.com> | 2023-05-26 13:34:52 (GMT) |
---|---|---|
committer | Ben Boeckel <ben.boeckel@kitware.com> | 2023-05-31 14:57:11 (GMT) |
commit | 6ff5cdc533a7c9281c97c9d22dd9cd3e05494f3a (patch) | |
tree | 109af6d3021aae795af9a6520f65be545c5b2a6d /Source/cmTarget.cxx | |
parent | 26240066084b9cbe37956cee4b3be1e75e144ce5 (diff) | |
download | CMake-6ff5cdc533a7c9281c97c9d22dd9cd3e05494f3a.zip CMake-6ff5cdc533a7c9281c97c9d22dd9cd3e05494f3a.tar.gz CMake-6ff5cdc533a7c9281c97c9d22dd9cd3e05494f3a.tar.bz2 |
cxxmodules: remove support for `CXX_MODULE_HEADER_UNITS` filesets
There's no backing implementation for header units anyways, so just
remove it for now.
Diffstat (limited to 'Source/cmTarget.cxx')
-rw-r--r-- | Source/cmTarget.cxx | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx index b55554d..4025967 100644 --- a/Source/cmTarget.cxx +++ b/Source/cmTarget.cxx @@ -675,7 +675,6 @@ public: FileSetType HeadersFileSets; FileSetType CxxModulesFileSets; - FileSetType CxxModuleHeadersFileSets; cmTargetInternals(); @@ -734,13 +733,6 @@ cmTargetInternals::cmTargetInternals() "The default C++ module set"_s, "C++ module set"_s, FileSetEntries("CXX_MODULE_SETS"_s), FileSetEntries("INTERFACE_CXX_MODULE_SETS"_s)) - , CxxModuleHeadersFileSets( - "CXX_MODULE_HEADER_UNITS"_s, "CXX_MODULE_HEADER_UNIT_DIRS"_s, - "CXX_MODULE_HEADER_UNIT_SET"_s, "CXX_MODULE_HEADER_UNIT_DIRS_"_s, - "CXX_MODULE_HEADER_UNIT_SET_"_s, "C++ module header"_s, - "The default C++ module header set"_s, "C++ module header set"_s, - FileSetEntries("CXX_MODULE_HEADER_UNIT_SETS"_s), - FileSetEntries("INTERFACE_CXX_MODULE_HEADER_UNIT_SETS"_s)) { } @@ -1751,11 +1743,6 @@ cmBTStringRange cmTarget::GetCxxModuleSetsEntries() const return cmMakeRange(this->impl->CxxModulesFileSets.SelfEntries.Entries); } -cmBTStringRange cmTarget::GetCxxModuleHeaderSetsEntries() const -{ - return cmMakeRange(this->impl->CxxModuleHeadersFileSets.SelfEntries.Entries); -} - cmBTStringRange cmTarget::GetInterfaceHeaderSetsEntries() const { return cmMakeRange(this->impl->HeadersFileSets.InterfaceEntries.Entries); @@ -1766,12 +1753,6 @@ cmBTStringRange cmTarget::GetInterfaceCxxModuleSetsEntries() const return cmMakeRange(this->impl->CxxModulesFileSets.InterfaceEntries.Entries); } -cmBTStringRange cmTarget::GetInterfaceCxxModuleHeaderSetsEntries() const -{ - return cmMakeRange( - this->impl->CxxModuleHeadersFileSets.InterfaceEntries.Entries); -} - namespace { #define MAKE_PROP(PROP) const std::string prop##PROP = #PROP MAKE_PROP(C_STANDARD); @@ -1875,7 +1856,6 @@ void cmTarget::SetProperty(const std::string& prop, cmValue value) FileSetType* fileSetTypes[] = { &this->impl->HeadersFileSets, &this->impl->CxxModulesFileSets, - &this->impl->CxxModuleHeadersFileSets, }; for (auto* fileSetType : fileSetTypes) { @@ -2049,7 +2029,6 @@ void cmTarget::AppendProperty(const std::string& prop, FileSetType* fileSetTypes[] = { &this->impl->HeadersFileSets, &this->impl->CxxModulesFileSets, - &this->impl->CxxModuleHeadersFileSets, }; for (auto* fileSetType : fileSetTypes) { @@ -2545,7 +2524,6 @@ cmValue cmTarget::GetProperty(const std::string& prop) const FileSetType* fileSetTypes[] = { &this->impl->HeadersFileSets, &this->impl->CxxModulesFileSets, - &this->impl->CxxModuleHeadersFileSets, }; for (auto* fileSetType : fileSetTypes) { @@ -2891,9 +2869,6 @@ std::pair<cmFileSet*, bool> cmTarget::GetOrCreateFileSet( this->impl->HeadersFileSets.AddFileSet(name, vis, std::move(bt)); } else if (type == this->impl->CxxModulesFileSets.TypeName) { this->impl->CxxModulesFileSets.AddFileSet(name, vis, std::move(bt)); - } else if (type == this->impl->CxxModuleHeadersFileSets.TypeName) { - this->impl->CxxModuleHeadersFileSets.AddFileSet(name, vis, - std::move(bt)); } } return std::make_pair(&result.first->second, result.second); @@ -2907,9 +2882,6 @@ std::string cmTarget::GetFileSetsPropertyName(const std::string& type) if (type == "CXX_MODULES") { return "CXX_MODULE_SETS"; } - if (type == "CXX_MODULE_HEADER_UNITS") { - return "CXX_MODULE_HEADER_UNIT_SETS"; - } return ""; } @@ -2921,9 +2893,6 @@ std::string cmTarget::GetInterfaceFileSetsPropertyName(const std::string& type) if (type == "CXX_MODULES") { return "INTERFACE_CXX_MODULE_SETS"; } - if (type == "CXX_MODULE_HEADER_UNITS") { - return "INTERFACE_CXX_MODULE_HEADER_UNIT_SETS"; - } return ""; } @@ -2952,7 +2921,6 @@ std::vector<std::string> cmTarget::GetAllInterfaceFileSets() const appendEntries(this->impl->HeadersFileSets.InterfaceEntries.Entries); appendEntries(this->impl->CxxModulesFileSets.InterfaceEntries.Entries); - appendEntries(this->impl->CxxModuleHeadersFileSets.InterfaceEntries.Entries); return result; } |