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

BUG: Do not complain about missing watched variables when they are accessd with IF(DEFINED VAR).

Browse Source
This commit is contained in:
Brad King 2007-05-17 15:12:13 -04:00
parent bdc7792e40
commit b8928b0c8e
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/cmIfCommand.cxx
View File

@ -315,7 +315,7 @@ bool cmIfCommand::IsTrue(const std::vector<std::string> &args,
} }
else else
{ {
def = makefile->GetDefinition((argP1)->c_str()); def = makefile->GetDefinitionNoWatch((argP1)->c_str());
} }
if(def) if(def)
{ {

8
Source/cmMakefile.cxx
View File

@ -1633,7 +1633,7 @@ const char* cmMakefile::GetRequiredDefinition(const char* name) const
return ret; return ret;
} }
const char* cmMakefile::GetDefinition(const char* name) const const char* cmMakefile::GetDefinitionNoWatch(const char* name) const
{ {
const char* def = 0; const char* def = 0;
DefinitionMap::const_iterator pos = this->Definitions.find(name); DefinitionMap::const_iterator pos = this->Definitions.find(name);
@ -1645,6 +1645,12 @@ const char* cmMakefile::GetDefinition(const char* name) const
{ {
def = this->GetCacheManager()->GetCacheValue(name); def = this->GetCacheManager()->GetCacheValue(name);
} }
return def;
}
const char* cmMakefile::GetDefinition(const char* name) const
{
const char* def = this->GetDefinitionNoWatch(name);
#ifdef CMAKE_BUILD_WITH_CMAKE #ifdef CMAKE_BUILD_WITH_CMAKE
cmVariableWatch* vv = this->GetVariableWatch(); cmVariableWatch* vv = this->GetVariableWatch();
if ( vv ) if ( vv )

1
Source/cmMakefile.h
View File

@ -492,6 +492,7 @@ public:
* cache is then queried. * cache is then queried.
*/ */
const char* GetDefinition(const char*) const; const char* GetDefinition(const char*) const;
const char* GetDefinitionNoWatch(const char*) const;
const char* GetSafeDefinition(const char*) const; const char* GetSafeDefinition(const char*) const;
const char* GetRequiredDefinition(const char* name) const; const char* GetRequiredDefinition(const char* name) const;
/** /**