diff options
| author | Ken Martin <ken.martin@kitware.com> | 2007-03-15 17:48:15 (GMT) |
|---|---|---|
| committer | Ken Martin <ken.martin@kitware.com> | 2007-03-15 17:48:15 (GMT) |
| commit | f52d37c26f5fd48cc745b85c3233848d7b664368 (patch) | |
| tree | d758432c6d71e7cdd37845aa7c32c2ece570bfca /Source/cmMakefile.cxx | |
| parent | daacd021fcaa741e88c8cdb1bb55c0d3ffd918da (diff) | |
| download | CMake-f52d37c26f5fd48cc745b85c3233848d7b664368.zip CMake-f52d37c26f5fd48cc745b85c3233848d7b664368.tar.gz CMake-f52d37c26f5fd48cc745b85c3233848d7b664368.tar.bz2 | |
BUG: change in how set cache overrides local definitions. Should mainly be a NOP change for most cases
Diffstat (limited to 'Source/cmMakefile.cxx')
| -rw-r--r-- | Source/cmMakefile.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index 1679568..78b44a4 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -1241,7 +1241,8 @@ void cmMakefile::AddCacheDefinition(const char* name, const char* value, } this->GetCacheManager()->AddCacheEntry(name, val, doc, type); - this->AddDefinition(name, val); + // if there was a definition then remove it + this->Definitions.erase( DefinitionMap::key_type(name)); } |