diff options
| author | Brad King <brad.king@kitware.com> | 2007-05-17 19:12:13 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2007-05-17 19:12:13 (GMT) |
| commit | b8928b0c8e2d6e649cf52d28021cf349194f2485 (patch) | |
| tree | 3ae692d050471c02ff5a2fa7d91ae96c9e0ff13c /Source/cmMakefile.cxx | |
| parent | bdc7792e4003c2737e4b3e5b670795d5f59f667a (diff) | |
| download | CMake-b8928b0c8e2d6e649cf52d28021cf349194f2485.zip CMake-b8928b0c8e2d6e649cf52d28021cf349194f2485.tar.gz CMake-b8928b0c8e2d6e649cf52d28021cf349194f2485.tar.bz2 | |
BUG: Do not complain about missing watched variables when they are accessd with IF(DEFINED VAR).
Diffstat (limited to 'Source/cmMakefile.cxx')
| -rw-r--r-- | Source/cmMakefile.cxx | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index 50270b4..9f05114 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -1633,7 +1633,7 @@ const char* cmMakefile::GetRequiredDefinition(const char* name) const return ret; } -const char* cmMakefile::GetDefinition(const char* name) const +const char* cmMakefile::GetDefinitionNoWatch(const char* name) const { const char* def = 0; 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); } + return def; +} + +const char* cmMakefile::GetDefinition(const char* name) const +{ + const char* def = this->GetDefinitionNoWatch(name); #ifdef CMAKE_BUILD_WITH_CMAKE cmVariableWatch* vv = this->GetVariableWatch(); if ( vv ) |