[Cmake-commits] CMake branch, next, updated. v2.8.11-2047-g990b683

[Stephen Kelly]

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  990b683596e092867492e501f2bfa9189b2b9610 (commit)
       via  76042ade34d1a360c5c18e3155a66b89adeae626 (commit)
      from  f4f73746ec143818ede90959602dbc7ce708981d (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=990b683596e092867492e501f2bfa9189b2b9610
commit 990b683596e092867492e501f2bfa9189b2b9610
Merge: f4f7374 76042ad
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu May 16 16:51:47 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu May 16 16:51:47 2013 -0400

    Merge topic 'suppress-unused-cli-with-value-in-cache' into next
    
    76042ad Revert "Suppress the unused cli warning if the key value pair is cached."


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=76042ade34d1a360c5c18e3155a66b89adeae626
commit 76042ade34d1a360c5c18e3155a66b89adeae626
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu May 16 22:51:25 2013 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu May 16 22:51:25 2013 +0200

    Revert "Suppress the unused cli warning if the key value pair is cached."
    
    This reverts commit d4bca05e973476071245457c699adb4541a5429c.

diff --git a/Source/cmCacheManager.cxx b/Source/cmCacheManager.cxx
index ed09545..864df8e 100644
--- a/Source/cmCacheManager.cxx
+++ b/Source/cmCacheManager.cxx
@@ -750,10 +750,6 @@ void cmCacheManager::AddCacheEntry(const char* key,
     }
   e.SetProperty("HELPSTRING", helpString? helpString :
                 "(This variable does not exist and should not be used)");
-  if (this->Cache[key].Value == e.Value)
-    {
-    this->CMakeInstance->UnwatchUnusedCli(key);
-    }
   this->Cache[key] = e;
 }
 
diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index e757f3a..ae62edb 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -383,22 +383,11 @@ bool cmake::SetCacheArgs(const std::vector<std::string>& args)
       cmCacheManager::CacheEntryType type = cmCacheManager::UNINITIALIZED;
       if(cmCacheManager::ParseEntry(entry.c_str(), var, value, type))
         {
-        // The value is transformed if it is a filepath for example, so
-        // we can't compare whether the value is already in the cache until
-        // after we call AddCacheEntry.
-        const char *cachedValue =
-                              this->CacheManager->GetCacheValue(var.c_str());
-
         this->CacheManager->AddCacheEntry(var.c_str(), value.c_str(),
           "No help, variable specified on the command line.", type);
         if(this->WarnUnusedCli)
           {
-          if (!cachedValue
-              || strcmp(this->CacheManager->GetCacheValue(var.c_str()),
-                        cachedValue) != 0)
-            {
-            this->WatchUnusedCli(var.c_str());
-            }
+          this->WatchUnusedCli(var.c_str());
           }
         }
       else

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

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


hooks/post-receive
-- 
CMake