[Cmake-commits] CMake branch, next, updated. v3.0.2-2185-gab5e5a6

[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  ab5e5a6292dbf461c3e53f57fe76bf0932dc50b1 (commit)
       via  d7f72d1f7a85a5622ef081877ec8dd7d1d70258e (commit)
      from  e5cde94df65918cf4d51ef7b8747732a02a3bdaf (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=ab5e5a6292dbf461c3e53f57fe76bf0932dc50b1
commit ab5e5a6292dbf461c3e53f57fe76bf0932dc50b1
Merge: e5cde94 d7f72d1
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Fri Oct 24 13:02:31 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Oct 24 13:02:31 2014 -0400

    Merge topic 'variable-pull-failure' into next
    
    d7f72d1f revert branch


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d7f72d1f7a85a5622ef081877ec8dd7d1d70258e
commit d7f72d1f7a85a5622ef081877ec8dd7d1d70258e
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Fri Oct 24 13:01:41 2014 -0400
Commit:     Ben Boeckel <ben.boeckel at kitware.com>
CommitDate: Fri Oct 24 13:01:41 2014 -0400

    revert branch
    
    This branch is being remade in two parts: the tests and the revert to
    better facilitate testing and verification.

diff --git a/Source/cmDefinitions.cxx b/Source/cmDefinitions.cxx
index 8a0e95e..5515f35 100644
--- a/Source/cmDefinitions.cxx
+++ b/Source/cmDefinitions.cxx
@@ -71,7 +71,7 @@ const char* cmDefinitions::Get(const std::string& key) const
 //----------------------------------------------------------------------------
 void cmDefinitions::Pull(const std::string& key)
 {
-  if (this->Up && this->Map.find(key) == this->Map.end())
+  if (this->Up)
     {
     Def const& def = this->Up->GetInternal(key);
     if (def.Exists)
diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index 6e35327..fd3bb03 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -118,7 +118,6 @@ add_RunCMake_test(alias_targets)
 add_RunCMake_test(interface_library)
 add_RunCMake_test(no_install_prefix)
 add_RunCMake_test(configure_file)
-add_RunCMake_test(ParentScope)
 
 find_package(Qt4 QUIET)
 find_package(Qt5Core QUIET)
diff --git a/Tests/RunCMake/ParentScope/CMakeLists.txt b/Tests/RunCMake/ParentScope/CMakeLists.txt
deleted file mode 100644
index 12cd3c7..0000000
--- a/Tests/RunCMake/ParentScope/CMakeLists.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-cmake_minimum_required(VERSION 2.8.4)
-project(${RunCMake_TEST} NONE)
-include(${RunCMake_TEST}.cmake)
diff --git a/Tests/RunCMake/ParentScope/ParentPulling-stderr.txt b/Tests/RunCMake/ParentScope/ParentPulling-stderr.txt
deleted file mode 100644
index 768549b..0000000
--- a/Tests/RunCMake/ParentScope/ParentPulling-stderr.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-^before PARENT_SCOPE blah=value2
-after PARENT_SCOPE blah=value2
-in parent scope, blah=value2$
diff --git a/Tests/RunCMake/ParentScope/ParentPulling.cmake b/Tests/RunCMake/ParentScope/ParentPulling.cmake
deleted file mode 100644
index 2614533..0000000
--- a/Tests/RunCMake/ParentScope/ParentPulling.cmake
+++ /dev/null
@@ -1,13 +0,0 @@
-cmake_minimum_required(VERSION 3.0)
-project(Minimal NONE)
-
-function(test_set)
-    set(blah "value2")
-    message("before PARENT_SCOPE blah=${blah}")
-    set(blah ${blah} PARENT_SCOPE)
-    message("after PARENT_SCOPE blah=${blah}")
-endfunction()
-
-set(blah value1)
-test_set()
-message("in parent scope, blah=${blah}")
diff --git a/Tests/RunCMake/ParentScope/RunCMakeTest.cmake b/Tests/RunCMake/ParentScope/RunCMakeTest.cmake
deleted file mode 100644
index ca517b2..0000000
--- a/Tests/RunCMake/ParentScope/RunCMakeTest.cmake
+++ /dev/null
@@ -1,3 +0,0 @@
-include(RunCMake)
-
-run_cmake(ParentPulling)

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

Summary of changes:
 Source/cmDefinitions.cxx                            |    2 +-
 Tests/RunCMake/CMakeLists.txt                       |    1 -
 Tests/RunCMake/ParentScope/CMakeLists.txt           |    3 ---
 Tests/RunCMake/ParentScope/ParentPulling-stderr.txt |    3 ---
 Tests/RunCMake/ParentScope/ParentPulling.cmake      |   13 -------------
 Tests/RunCMake/ParentScope/RunCMakeTest.cmake       |    3 ---
 6 files changed, 1 insertion(+), 24 deletions(-)
 delete mode 100644 Tests/RunCMake/ParentScope/CMakeLists.txt
 delete mode 100644 Tests/RunCMake/ParentScope/ParentPulling-stderr.txt
 delete mode 100644 Tests/RunCMake/ParentScope/ParentPulling.cmake
 delete mode 100644 Tests/RunCMake/ParentScope/RunCMakeTest.cmake


hooks/post-receive
-- 
CMake