[Cmake-commits] CMake branch, master, updated. v3.0.2-2120-g8eb6483

[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  8eb64831bec333914aab3af54e2d1deded02eb90 (commit)
       via  d1b62185d6b66b27a3ef31b79d4cff1c5126793e (commit)
       via  5f414cefb6524d26329484b296004e3c2d97ec4f (commit)
       via  e0c0b1ace50f77f2a76dcc7020e3a4251bc6bf96 (commit)
       via  064c415d275433c332b7a38eb99df5d46aaa9f9e (commit)
      from  21cf9364f092004a027f11b5bf574804cc8cfded (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=8eb64831bec333914aab3af54e2d1deded02eb90
commit 8eb64831bec333914aab3af54e2d1deded02eb90
Merge: 21cf936 d1b6218
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 27 08:32:26 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Oct 27 08:32:26 2014 -0400

    Merge topic 'revert-definition-map-lookup'
    
    d1b62185 Merge branch 'parent-scope-tests' into variable-pull-failure
    5f414cef Revert "cmDefinitions: Don't store parent lookups"
    e0c0b1ac test: add a test for PARENT_SCOPE with multiple scopes
    064c415d test: add test for PARENT_SCOPE behavior

diff --cc Source/cmDefinitions.cxx
index 5515f35,babf1c4..fe32dd5
--- a/Source/cmDefinitions.cxx
+++ b/Source/cmDefinitions.cxx
@@@ -36,10 -35,11 +36,11 @@@ cmDefinitions::GetInternal(const std::s
      {
      return i->second;
      }
 -  else if(cmDefinitions* up = this->Up)
 +  if(cmDefinitions* up = this->Up)
      {
-     // Query the parent scope.
-     return up->GetInternal(key);
+     // Query the parent scope and store the result locally.
+     Def def = up->GetInternal(key);
+     return this->Map.insert(MapType::value_type(key, def)).first->second;
      }
    return this->NoDef;
  }

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

Summary of changes:
 Source/cmDefinitions.cxx                           |   22 +--
 Source/cmDefinitions.h                             |   10 +-
 Source/cmMakefile.cxx                              |    2 +-
 Tests/RunCMake/set/ParentPulling-stderr.txt        |    3 +
 Tests/RunCMake/set/ParentPulling.cmake             |   13 ++
 .../RunCMake/set/ParentPullingRecursive-stderr.txt |  144 ++++++++++++++++++++
 Tests/RunCMake/set/ParentPullingRecursive.cmake    |  104 ++++++++++++++
 Tests/RunCMake/set/RunCMakeTest.cmake              |    2 +
 8 files changed, 276 insertions(+), 24 deletions(-)
 create mode 100644 Tests/RunCMake/set/ParentPulling-stderr.txt
 create mode 100644 Tests/RunCMake/set/ParentPulling.cmake
 create mode 100644 Tests/RunCMake/set/ParentPullingRecursive-stderr.txt
 create mode 100644 Tests/RunCMake/set/ParentPullingRecursive.cmake


hooks/post-receive
-- 
CMake