[Cmake-commits] CMake branch, master, updated. v3.0.0-rc6-968-gaf34639

[Brad King]

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, master has been updated
       via  af3463972426b24cde2b88f3ba1af1071c5dc3ff (commit)
       via  1cd375272997cb58f0c51647cf199e4fd4eef678 (commit)
       via  326d15a3294e3b43de534130a4b655ddb454fbfb (commit)
      from  960f140d19c9432f5e901cc2a1f24725f6fbc83e (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=af3463972426b24cde2b88f3ba1af1071c5dc3ff
commit af3463972426b24cde2b88f3ba1af1071c5dc3ff
Merge: 960f140 1cd3752
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed May 28 12:34:30 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed May 28 12:34:30 2014 -0400

    Merge topic 'fix-cache-self-assignment'
    
    1cd37527 cmCacheManager: Avoid cache entry self-assignment
    326d15a3 cmake: Tolerate missing HELPSTRING on compiler change

diff --cc Source/cmake.cxx
index a83ebd5,4f14d73..976bf44
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@@ -1233,10 -1228,13 +1233,13 @@@ int cmake::HandleDeleteCacheVariables(c
      i++;
      save.value = *i;
      warning << *i << "\n";
 -    if(ci.Find(save.key.c_str()))
 +    if(ci.Find(save.key))
        {
        save.type = ci.GetType();
-       save.help = ci.GetProperty("HELPSTRING");
+       if(const char* help = ci.GetProperty("HELPSTRING"))
+         {
+         save.help = help;
+         }
        }
      saved.push_back(save);
      }

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

Summary of changes:
 Source/cmCacheManager.cxx |    6 +-----
 Source/cmake.cxx          |    5 ++++-
 2 files changed, 5 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
CMake