[Cmake-commits] CMake branch, next, updated. v2.8.3-1343-g5826e53

[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  5826e537692e9c80dc6d7792b70b7e427249bcec (commit)
       via  949d32c3067830a1376950fc78dbcde39bc378a8 (commit)
       via  393903218dc5ca67d23cc5d31f9a5c87cd06ca17 (commit)
       via  8354413463fd4b13185388f57dc1b2f5cfd8298d (commit)
       via  8ed3c85c4749274cd30eef808d585634c38f3c72 (commit)
      from  f07e4aa1b6d2786259b84ef1ce46c5ea66743897 (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=5826e537692e9c80dc6d7792b70b7e427249bcec
commit 5826e537692e9c80dc6d7792b70b7e427249bcec
Merge: f07e4aa 949d32c
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Thu Jan 13 18:16:27 2011 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jan 13 18:16:27 2011 -0500

    Merge topic 'dev/strict-mode' into next
    
    949d32c Unwatch manual variables upon removal in cmake-gui
    3939032 Unwatch manual variables upon removal in ccmake
    8354413 Add method to unwatch a manual variable
    8ed3c85 Give a better message for unused variables


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=949d32c3067830a1376950fc78dbcde39bc378a8
commit 949d32c3067830a1376950fc78dbcde39bc378a8
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Thu Jan 13 17:59:04 2011 -0500
Commit:     Ben Boeckel <ben.boeckel at kitware.com>
CommitDate: Thu Jan 13 17:59:04 2011 -0500

    Unwatch manual variables upon removal in cmake-gui

diff --git a/Source/QtDialog/QCMake.cxx b/Source/QtDialog/QCMake.cxx
index 182db0f..a40a175 100644
--- a/Source/QtDialog/QCMake.cxx
+++ b/Source/QtDialog/QCMake.cxx
@@ -242,6 +242,8 @@ void QCMake::setProperties(const QCMakePropertyList& newProps)
   // remove some properites
   foreach(QString s, toremove)
     {
+    this->CMakeInstance->UnwatchUnusedCli(s.toAscii().data());
+
     cachem->RemoveCacheEntry(s.toAscii().data());
     }
   

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=393903218dc5ca67d23cc5d31f9a5c87cd06ca17
commit 393903218dc5ca67d23cc5d31f9a5c87cd06ca17
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Thu Jan 13 17:58:23 2011 -0500
Commit:     Ben Boeckel <ben.boeckel at kitware.com>
CommitDate: Thu Jan 13 17:58:23 2011 -0500

    Unwatch manual variables upon removal in ccmake

diff --git a/Source/CursesDialog/cmCursesMainForm.cxx b/Source/CursesDialog/cmCursesMainForm.cxx
index 7f3e360..71c06d5 100644
--- a/Source/CursesDialog/cmCursesMainForm.cxx
+++ b/Source/CursesDialog/cmCursesMainForm.cxx
@@ -786,6 +786,7 @@ void cmCursesMainForm::RemoveEntry(const char* value)
     const char* val = (*it)->GetValue();
     if (  val && !strcmp(value, val) )
       {
+      this->CMakeInstance->UnwatchUnusedCli(value);
       this->Entries->erase(it);
       break;
       }

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8354413463fd4b13185388f57dc1b2f5cfd8298d
commit 8354413463fd4b13185388f57dc1b2f5cfd8298d
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Thu Jan 13 17:58:04 2011 -0500
Commit:     Ben Boeckel <ben.boeckel at kitware.com>
CommitDate: Thu Jan 13 17:58:04 2011 -0500

    Add method to unwatch a manual variable

diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index 548e59a..0d1c4ef 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -4309,6 +4309,14 @@ void cmake::WatchUnusedCli(const char* var)
 #endif
 }
 
+void cmake::UnwatchUnusedCli(const char* var)
+{
+#ifdef CMAKE_BUILD_WITH_CMAKE
+  this->VariableWatch->RemoveWatch(var, cmWarnUnusedCliWarning);
+  this->UsedCliVariables[var] = true;
+#endif
+}
+
 void cmake::RunCheckForUnusedVariables(const std::string& reason) const
 {
 #ifdef CMAKE_BUILD_WITH_CMAKE
diff --git a/Source/cmake.h b/Source/cmake.h
index 4d348bb..1bb42d3 100644
--- a/Source/cmake.h
+++ b/Source/cmake.h
@@ -366,6 +366,7 @@ class cmake
             const std::vector<std::string>& nativeOptions,
             bool clean);
 
+  void UnwatchUnusedCli(const char* var);
   void WatchUnusedCli(const char* var);
   void RunCheckForUnusedVariables(const std::string& reason) const;
 protected:

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8ed3c85c4749274cd30eef808d585634c38f3c72
commit 8ed3c85c4749274cd30eef808d585634c38f3c72
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Thu Jan 13 17:32:33 2011 -0500
Commit:     Ben Boeckel <ben.boeckel at kitware.com>
CommitDate: Thu Jan 13 17:56:18 2011 -0500

    Give a better message for unused variables

diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index c5de2e8..548e59a 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -4321,7 +4321,7 @@ void cmake::RunCheckForUnusedVariables(const std::string& reason) const
         if(!it->second)
           {
           std::string message = "CMake Warning: The variable, '" + it->first +
-            "', given on the command line, was not used during the " + reason +
+            "', specified manually, was not used during the " + reason +
             ".";
           cmSystemTools::Message(message.c_str());
           }

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

Summary of changes:
 Source/CursesDialog/cmCursesMainForm.cxx |    1 +
 Source/QtDialog/QCMake.cxx               |    2 ++
 Source/cmake.cxx                         |   10 +++++++++-
 Source/cmake.h                           |    1 +
 4 files changed, 13 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake