[cmake-commits] martink committed cmMakefile.cxx 1.378 1.379

cmake-commits at cmake.org cmake-commits at cmake.org
Thu Mar 15 12:48:17 EST 2007


Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv10840/Source

Modified Files:
	cmMakefile.cxx 
Log Message:
BUG: change in how set cache overrides local definitions. Should mainly be a NOP change for most cases


Index: cmMakefile.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmMakefile.cxx,v
retrieving revision 1.378
retrieving revision 1.379
diff -u -d -r1.378 -r1.379
--- cmMakefile.cxx	13 Mar 2007 19:18:27 -0000	1.378
+++ cmMakefile.cxx	15 Mar 2007 17:48:15 -0000	1.379
@@ -1241,7 +1241,8 @@
 
     }
   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));
 }
 
 



More information about the Cmake-commits mailing list