kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cmTarget: Allow caching of empty genex expansions

This commit is contained in:
Ben Boeckel 2014-04-30 15:41:19 -04:00
parent cd54f1dbeb
commit 23d6520daa
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/cmTarget.cxx
View File

@ -176,10 +176,11 @@ public:
public: public:
TargetPropertyEntry(cmsys::auto_ptr<cmCompiledGeneratorExpression> cge, TargetPropertyEntry(cmsys::auto_ptr<cmCompiledGeneratorExpression> cge,
cmLinkImplItem const& item = NoLinkImplItem) cmLinkImplItem const& item = NoLinkImplItem)
: ge(cge), LinkImplItem(item) : ge(cge), Cached(false), LinkImplItem(item)
{} {}
const cmsys::auto_ptr<cmCompiledGeneratorExpression> ge; const cmsys::auto_ptr<cmCompiledGeneratorExpression> ge;
std::vector<std::string> CachedEntries; std::vector<std::string> CachedEntries;
bool Cached;
cmLinkImplItem const& LinkImplItem; cmLinkImplItem const& LinkImplItem;
}; };
std::vector<TargetPropertyEntry*> IncludeDirectoriesEntries; std::vector<TargetPropertyEntry*> IncludeDirectoriesEntries;
@ -2269,7 +2270,7 @@ static void processCompileOptionsInternal(cmTarget const* tgt,
std::vector<std::string>& entriesRef = (*it)->CachedEntries; std::vector<std::string>& entriesRef = (*it)->CachedEntries;
std::vector<std::string> localEntries; std::vector<std::string> localEntries;
std::vector<std::string>* entryOptions = &entriesRef; std::vector<std::string>* entryOptions = &entriesRef;
if(entryOptions->empty()) if(!(*it)->Cached)
{ {
cmSystemTools::ExpandListArgument((*it)->ge->Evaluate(mf, cmSystemTools::ExpandListArgument((*it)->ge->Evaluate(mf,
config, config,
@ -2282,6 +2283,7 @@ static void processCompileOptionsInternal(cmTarget const* tgt,
{ {
// Cache the result. // Cache the result.
*entryOptions = localEntries; *entryOptions = localEntries;
(*it)->Cached = true;
} }
else else
{ {