summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Source/cmMakefile.cxx5
1 files changed, 4 insertions, 1 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 3e2e81c..6fa2084 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -173,7 +173,6 @@ void cmMakefile::Print() const
// is "filename" and not "external".
bool cmMakefile::ReadListFile(const char* filename, const char* external)
{
-
// keep track of the current file being read
if (filename)
{
@@ -444,16 +443,20 @@ void cmMakefile::AddIncludeDirectory(const char* inc)
void cmMakefile::AddDefinition(const char* name, const char* value)
{
+ m_Definitions.erase( DefinitionMap::key_type(name));
m_Definitions.insert(DefinitionMap::value_type(name, value));
}
+
void cmMakefile::AddDefinition(const char* name, bool value)
{
if(value)
{
+ m_Definitions.erase( DefinitionMap::key_type(name));
m_Definitions.insert(DefinitionMap::value_type(name, "ON"));
}
else
{
+ m_Definitions.erase( DefinitionMap::key_type(name));
m_Definitions.insert(DefinitionMap::value_type(name, "OFF"));
}
}