[Cmake-commits] CMake branch, next, updated. v2.8.2-649-gbf39408

[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  bf394083f21bbda8b513775e58e8b8f7f366fe25 (commit)
       via  9efc05722e9598b8e34062e8f39457b728b7286b (commit)
      from  5191d66ba7adf57257435dc437338c5d3fc45145 (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=bf394083f21bbda8b513775e58e8b8f7f366fe25
commit bf394083f21bbda8b513775e58e8b8f7f366fe25
Merge: 5191d66 9efc057
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Thu Sep 2 09:13:46 2010 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Sep 2 09:13:46 2010 -0400

    Merge topic 'dev/strict-mode' into next
    
    9efc057 VariableWatch is not available when bootstrapping


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9efc05722e9598b8e34062e8f39457b728b7286b
commit 9efc05722e9598b8e34062e8f39457b728b7286b
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Thu Sep 2 09:10:52 2010 -0400
Commit:     Ben Boeckel <ben.boeckel at kitware.com>
CommitDate: Thu Sep 2 09:10:52 2010 -0400

    VariableWatch is not available when bootstrapping

diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index d4cabdb..cb70f1f 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -201,6 +201,7 @@ cmake::cmake()
 
 cmake::~cmake()
 {
+#ifdef CMAKE_BUILD_WITH_CMAKE
   if(this->WarnUnusedCli)
     {
     std::map<std::string, bool>::const_iterator it;
@@ -214,6 +215,7 @@ cmake::~cmake()
         }
       }
     }
+#endif
   delete this->CacheManager;
   delete this->Policies;
   if (this->GlobalGenerator)
@@ -393,8 +395,10 @@ bool cmake::SetCacheArgs(const std::vector<std::string>& args)
           "No help, variable specified on the command line.", type);
         if(this->WarnUnusedCli)
           {
+#ifdef CMAKE_BUILD_WITH_CMAKE
           this->VariableWatch->AddWatch(var, cmWarnUnusedCliWarning, this);
           this->UsedCliVariables[var] = false;
+#endif
           }
         }
       else

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

Summary of changes:
 Source/cmake.cxx |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
CMake