mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-05 21:31:08 -06:00
Code Issues Packages Projects Releases Wiki Activity

cmTarget: Move member SystemIncludeDirectories to impl

Browse Source
This commit is contained in:
Sebastian Holtermann
2019-03-23 15:41:12 +01:00
parent 46075091d5
commit 856a271fb7
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Source/cmTarget.cxx
View File

@@ -168,6 +168,7 @@ public:
cmStateEnums::TargetType TargetType;
cmMakefile* Makefile;
cmPropertyMap Properties;
std::set<std::string> SystemIncludeDirectories;
std::vector<std::string> IncludeDirectoriesEntries;
std::vector<cmListFileBacktrace> IncludeDirectoriesBacktraces;
std::vector<std::string> 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<std::string>& incs)
{
this->SystemIncludeDirectories.insert(incs.begin(), incs.end());
impl->SystemIncludeDirectories.insert(incs.begin(), incs.end());
}
std::set<std::string> const& cmTarget::GetSystemIncludeDirectories() const
{
return impl->SystemIncludeDirectories;
}
cmStringRange cmTarget::GetIncludeDirectoriesEntries() const

8
Source/cmTarget.h
View File

@@ -250,11 +250,8 @@ public:
std::string GetDebugGeneratorExpressions(const std::string& value,
cmTargetLinkLibraryType llt) const;
void AddSystemIncludeDirectories(const std::set<std::string>& incs);
std::set<std::string> const& GetSystemIncludeDirectories() const
{
return this->SystemIncludeDirectories;
}
void AddSystemIncludeDirectories(std::set<std::string> const& incs);
std::set<std::string> const& GetSystemIncludeDirectories() const;
cmStringRange GetIncludeDirectoriesEntries() const;
cmBacktraceRange GetIncludeDirectoriesBacktraces() const;
@@ -304,7 +301,6 @@ private:
private:
bool IsGeneratorProvided;
std::set<std::string> SystemIncludeDirectories;
std::set<BT<std::string>> Utilities;
cmPolicies::PolicyMap PolicyMap;
std::string Name;