From 856a271fb7023e5ee1a251a9ebe55c91072d9cf6 Mon Sep 17 00:00:00 2001 From: Sebastian Holtermann Date: Sat, 23 Mar 2019 15:41:12 +0100 Subject: cmTarget: Move member `SystemIncludeDirectories` to impl --- Source/cmTarget.cxx | 10 ++++++++-- Source/cmTarget.h | 8 ++------ 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx index ae29a05..1638c64 100644 --- a/Source/cmTarget.cxx +++ b/Source/cmTarget.cxx @@ -168,6 +168,7 @@ public: cmStateEnums::TargetType TargetType; cmMakefile* Makefile; cmPropertyMap Properties; + std::set SystemIncludeDirectories; std::vector IncludeDirectoriesEntries; std::vector IncludeDirectoriesBacktraces; std::vector CompileOptionsEntries; @@ -373,7 +374,7 @@ cmTarget::cmTarget(std::string const& name, cmStateEnums::TargetType type, { auto const& sysInc = impl->Makefile->GetSystemIncludeDirectories(); - this->SystemIncludeDirectories.insert(sysInc.begin(), sysInc.end()); + impl->SystemIncludeDirectories.insert(sysInc.begin(), sysInc.end()); } CApp(impl->CompileOptionsEntries, @@ -817,7 +818,12 @@ void cmTarget::AddLinkLibrary(cmMakefile& mf, std::string const& lib, void cmTarget::AddSystemIncludeDirectories(const std::set& incs) { - this->SystemIncludeDirectories.insert(incs.begin(), incs.end()); + impl->SystemIncludeDirectories.insert(incs.begin(), incs.end()); +} + +std::set const& cmTarget::GetSystemIncludeDirectories() const +{ + return impl->SystemIncludeDirectories; } cmStringRange cmTarget::GetIncludeDirectoriesEntries() const diff --git a/Source/cmTarget.h b/Source/cmTarget.h index a1245a8..dca3dd4 100644 --- a/Source/cmTarget.h +++ b/Source/cmTarget.h @@ -250,11 +250,8 @@ public: std::string GetDebugGeneratorExpressions(const std::string& value, cmTargetLinkLibraryType llt) const; - void AddSystemIncludeDirectories(const std::set& incs); - std::set const& GetSystemIncludeDirectories() const - { - return this->SystemIncludeDirectories; - } + void AddSystemIncludeDirectories(std::set const& incs); + std::set const& GetSystemIncludeDirectories() const; cmStringRange GetIncludeDirectoriesEntries() const; cmBacktraceRange GetIncludeDirectoriesBacktraces() const; @@ -304,7 +301,6 @@ private: private: bool IsGeneratorProvided; - std::set SystemIncludeDirectories; std::set> Utilities; cmPolicies::PolicyMap PolicyMap; std::string Name; -- cgit v0.12