[Cmake-commits] CMake branch, next, updated. v2.8.2-824-g553230e

[Ben Boeckel]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  553230e4c772f28cfa55a2d3d08317d612229000 (commit)
       via  5e41ba8e4a25bec2b5d7c175f80a1ace0999a8ff (commit)
      from  6a9e59c2744762e3fb7926c89beb982a7de6b7e0 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=553230e4c772f28cfa55a2d3d08317d612229000
commit 553230e4c772f28cfa55a2d3d08317d612229000
Merge: 6a9e59c 5e41ba8
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Fri Sep 17 10:14:35 2010 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Sep 17 10:14:35 2010 -0400

    Merge topic 'dev/strict-mode' into next
    
    5e41ba8 When using the API, check for Add vs. Remove


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5e41ba8e4a25bec2b5d7c175f80a1ace0999a8ff
commit 5e41ba8e4a25bec2b5d7c175f80a1ace0999a8ff
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Fri Sep 17 10:13:19 2010 -0400
Commit:     Ben Boeckel <ben.boeckel at kitware.com>
CommitDate: Fri Sep 17 10:13:19 2010 -0400

    When using the API, check for Add vs. Remove

diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 2908fa3..a9faa6b 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -3483,7 +3483,14 @@ void cmMakefile::RaiseScope(const char *var, const char *varDef)
     // directory's scope was initialized by the closure of the parent
     // scope, so we do not need to localize the definition first.
     cmMakefile* parent = plg->GetMakefile();
-    parent->AddDefinition(var, varDef);
+    if (varDef)
+      {
+      parent->AddDefinition(var, varDef);
+      }
+    else
+      {
+      parent->RemoveDefinition(var);
+      }
     }
   else
     {

-----------------------------------------------------------------------

Summary of changes:
 Source/cmMakefile.cxx |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake