[Cmake-commits] CMake branch, next, updated. v3.0.0-rc5-3269-g5ff359a

[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  5ff359aa44572a4e99336c71ebe5ac53e337235a (commit)
       via  fee23565dff050012998d1fa4c0efb31e1433897 (commit)
      from  2bcdb80ed7e68afc491dd752b4847818dafdba46 (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=5ff359aa44572a4e99336c71ebe5ac53e337235a
commit 5ff359aa44572a4e99336c71ebe5ac53e337235a
Merge: 2bcdb80 fee2356
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Tue May 20 16:52:53 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue May 20 16:52:53 2014 -0400

    Merge topic 'dev/watch-variable-policy' into next
    
    fee23565 tests: set CMP0053 in CMP0054 tests to NEW


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fee23565dff050012998d1fa4c0efb31e1433897
commit fee23565dff050012998d1fa4c0efb31e1433897
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Tue May 20 16:52:02 2014 -0400
Commit:     Ben Boeckel <ben.boeckel at kitware.com>
CommitDate: Tue May 20 16:52:02 2014 -0400

    tests: set CMP0053 in CMP0054 tests to NEW
    
    Without this, the variable will be expanded twice which will cause
    different output due to the watch_variable expansions.

diff --git a/Tests/RunCMake/CMP0054/CMP0054-NEW.cmake b/Tests/RunCMake/CMP0054/CMP0054-NEW.cmake
index 259e598..e4ee597 100644
--- a/Tests/RunCMake/CMP0054/CMP0054-NEW.cmake
+++ b/Tests/RunCMake/CMP0054/CMP0054-NEW.cmake
@@ -1,3 +1,4 @@
+cmake_policy(SET CMP0053 NEW) # Only expand once.
 cmake_policy(SET CMP0054 NEW)
 
 function (watch_callback var access value file stack)
diff --git a/Tests/RunCMake/CMP0054/CMP0054-OLD.cmake b/Tests/RunCMake/CMP0054/CMP0054-OLD.cmake
index 893dc7b..d8a4fc9 100644
--- a/Tests/RunCMake/CMP0054/CMP0054-OLD.cmake
+++ b/Tests/RunCMake/CMP0054/CMP0054-OLD.cmake
@@ -1,3 +1,4 @@
+cmake_policy(SET CMP0053 NEW) # Only expand once.
 cmake_policy(SET CMP0054 OLD)
 
 function (watch_callback var access value file stack)
diff --git a/Tests/RunCMake/CMP0054/CMP0054-WARN-stderr.txt b/Tests/RunCMake/CMP0054/CMP0054-WARN-stderr.txt
index db5f8d0..987666f 100644
--- a/Tests/RunCMake/CMP0054/CMP0054-WARN-stderr.txt
+++ b/Tests/RunCMake/CMP0054/CMP0054-WARN-stderr.txt
@@ -1,6 +1,6 @@
 ^UNKNOWN_READ_ACCESS
 --><--
-CMake Warning \(dev\) at CMP0054-WARN.cmake:8 \(message\):
+CMake Warning \(dev\) at CMP0054-WARN.cmake:10 \(message\):
   Policy CMP0054 is not set: Remove ALLOWED_UNKNOWN_VARIABLE_READ_ACCESS
   variable_watch access type.  Run "cmake --help-policy CMP0054" for policy
   details.  Use the cmake_policy command to set the policy and suppress this
diff --git a/Tests/RunCMake/CMP0054/CMP0054-WARN.cmake b/Tests/RunCMake/CMP0054/CMP0054-WARN.cmake
index fde0538..25afc14 100644
--- a/Tests/RunCMake/CMP0054/CMP0054-WARN.cmake
+++ b/Tests/RunCMake/CMP0054/CMP0054-WARN.cmake
@@ -1,3 +1,5 @@
+cmake_policy(SET CMP0053 NEW) # Only expand once.
+
 function (watch_callback var access value file stack)
   message(${access})
 endfunction ()

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

Summary of changes:
 Tests/RunCMake/CMP0054/CMP0054-NEW.cmake       |    1 +
 Tests/RunCMake/CMP0054/CMP0054-OLD.cmake       |    1 +
 Tests/RunCMake/CMP0054/CMP0054-WARN-stderr.txt |    2 +-
 Tests/RunCMake/CMP0054/CMP0054-WARN.cmake      |    2 ++
 4 files changed, 5 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake