[cmake-commits] king committed cmIfCommand.cxx 1.76 1.77 cmMakefile.cxx 1.388 1.389 cmMakefile.h 1.201 1.202

[cmake-commits at cmake.org]

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

Modified Files:
	cmIfCommand.cxx cmMakefile.cxx cmMakefile.h 
Log Message:
BUG: Do not complain about missing watched variables when they are accessd with IF(DEFINED VAR).


Index: cmIfCommand.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmIfCommand.cxx,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -d -r1.76 -r1.77
--- cmIfCommand.cxx	12 Dec 2006 15:07:20 -0000	1.76
+++ cmIfCommand.cxx	17 May 2007 19:12:12 -0000	1.77
@@ -315,7 +315,7 @@
           }
         else
           {
-          def = makefile->GetDefinition((argP1)->c_str());
+          def = makefile->GetDefinitionNoWatch((argP1)->c_str());
           }
         if(def)
           {

Index: cmMakefile.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmMakefile.h,v
retrieving revision 1.201
retrieving revision 1.202
diff -u -d -r1.201 -r1.202
--- cmMakefile.h	17 May 2007 17:20:44 -0000	1.201
+++ cmMakefile.h	17 May 2007 19:12:13 -0000	1.202
@@ -492,6 +492,7 @@
    * cache is then queried.
    */
   const char* GetDefinition(const char*) const;
+  const char* GetDefinitionNoWatch(const char*) const;
   const char* GetSafeDefinition(const char*) const;
   const char* GetRequiredDefinition(const char* name) const;
   /**

Index: cmMakefile.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmMakefile.cxx,v
retrieving revision 1.388
retrieving revision 1.389
diff -u -d -r1.388 -r1.389
--- cmMakefile.cxx	17 May 2007 18:47:18 -0000	1.388
+++ cmMakefile.cxx	17 May 2007 19:12:13 -0000	1.389
@@ -1633,7 +1633,7 @@
   return ret;
 }
 
-const char* cmMakefile::GetDefinition(const char* name) const
+const char* cmMakefile::GetDefinitionNoWatch(const char* name) const
 {
   const char* def = 0;
   DefinitionMap::const_iterator pos = this->Definitions.find(name);
@@ -1645,6 +1645,12 @@
     {
     def = this->GetCacheManager()->GetCacheValue(name);
     }
+  return def;
+}
+
+const char* cmMakefile::GetDefinition(const char* name) const
+{
+  const char* def = this->GetDefinitionNoWatch(name);
 #ifdef CMAKE_BUILD_WITH_CMAKE
   cmVariableWatch* vv = this->GetVariableWatch();
   if ( vv )