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

cmMakefile: Remove cacheOnly option from GetDefinitions. 

It is now unused.
This commit is contained in:
Stephen Kelly 2015-06-07 15:12:51 +02:00
parent 046aafff12
commit 4c192fb531
2 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Source/cmMakefile.cxx
View File

@ -2497,18 +2497,11 @@ const char* cmMakefile::GetSafeDefinition(const std::string& def) const
return ret; return ret;
} }
std::vector<std::string> cmMakefile std::vector<std::string> cmMakefile::GetDefinitions() const
::GetDefinitions(int cacheonly /* = 0 */) const
{ {
std::vector<std::string> res; std::vector<std::string> res = this->Internal->ClosureKeys();
if ( !cacheonly ) std::vector<std::string> cacheKeys = this->GetState()->GetCacheEntryKeys();
{
res = this->Internal->ClosureKeys();
}
std::vector<std::string> cacheKeys =
this->GetState()->GetCacheEntryKeys();
res.insert(res.end(), cacheKeys.begin(), cacheKeys.end()); res.insert(res.end(), cacheKeys.begin(), cacheKeys.end());
std::sort(res.begin(), res.end()); std::sort(res.begin(), res.end());
return res; return res;
} }

2
Source/cmMakefile.h
View File

@ -511,7 +511,7 @@ public:
* cacheonly is specified and is greater than 0, then only cache * cacheonly is specified and is greater than 0, then only cache
* variables will be listed. * variables will be listed.
*/ */
std::vector<std::string> GetDefinitions(int cacheonly=0) const; std::vector<std::string> GetDefinitions() const;
/** /**
* Test a boolean variable to see if it is true or false. * Test a boolean variable to see if it is true or false.