summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKen Martin <ken.martin@kitware.com>2007-03-15 13:48:15 -0400
committerKen Martin <ken.martin@kitware.com>2007-03-15 13:48:15 -0400
commitf52d37c26f5fd48cc745b85c3233848d7b664368 (patch)
treed758432c6d71e7cdd37845aa7c32c2ece570bfca
parentdaacd021fcaa741e88c8cdb1bb55c0d3ffd918da (diff)
downloadcmake-f52d37c26f5fd48cc745b85c3233848d7b664368.tar.gz
BUG: change in how set cache overrides local definitions. Should mainly be a NOP change for most cases
-rw-r--r--Source/cmMakefile.cxx3
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 16795687f9..78b44a4076 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));
}