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

definitions should now be overwritten if they already exist

This commit is contained in:
Geoffrey Cross 2001-05-10 16:21:45 -04:00
parent d04756d8f7
commit e539432495
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Source/cmMakefile.cxx
View File

@ -173,7 +173,6 @@ void cmMakefile::Print() const
// is "filename" and not "external". // is "filename" and not "external".
bool cmMakefile::ReadListFile(const char* filename, const char* external) bool cmMakefile::ReadListFile(const char* filename, const char* external)
{ {
// keep track of the current file being read // keep track of the current file being read
if (filename) if (filename)
{ {
@ -444,16 +443,20 @@ void cmMakefile::AddIncludeDirectory(const char* inc)
void cmMakefile::AddDefinition(const char* name, const char* value) void cmMakefile::AddDefinition(const char* name, const char* value)
{ {
m_Definitions.erase( DefinitionMap::key_type(name));
m_Definitions.insert(DefinitionMap::value_type(name, value)); m_Definitions.insert(DefinitionMap::value_type(name, value));
} }
void cmMakefile::AddDefinition(const char* name, bool value) void cmMakefile::AddDefinition(const char* name, bool value)
{ {
if(value) if(value)
{ {
m_Definitions.erase( DefinitionMap::key_type(name));
m_Definitions.insert(DefinitionMap::value_type(name, "ON")); m_Definitions.insert(DefinitionMap::value_type(name, "ON"));
} }
else else
{ {
m_Definitions.erase( DefinitionMap::key_type(name));
m_Definitions.insert(DefinitionMap::value_type(name, "OFF")); m_Definitions.insert(DefinitionMap::value_type(name, "OFF"));
} }
} }