[Cmake-commits] CMake branch, next, updated. v3.3.2-3165-g8831ba6

[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, next has been updated
       via  8831ba64a606c4eae7e16e41a83533711c075bf0 (commit)
       via  402bf096ec4aac75af096c3708ce51efaf4589d0 (commit)
      from  e723550b1a75d8a9e7b4615bbf70222237eb2ba1 (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=8831ba64a606c4eae7e16e41a83533711c075bf0
commit 8831ba64a606c4eae7e16e41a83533711c075bf0
Merge: e723550 402bf09
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Sep 21 10:07:11 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Sep 21 10:07:11 2015 -0400

    Merge topic 'fix-policy-CMP0064-version' into next
    
    402bf096 CMP0064: Fix recorded version of introduction to be 3.4


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=402bf096ec4aac75af096c3708ce51efaf4589d0
commit 402bf096ec4aac75af096c3708ce51efaf4589d0
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Sep 21 10:05:02 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Sep 21 10:05:02 2015 -0400

    CMP0064: Fix recorded version of introduction to be 3.4
    
    This policy was added for CMake 3.4 but accidentally recorded as 3.3.
    Fix this and update the RunCMake.CMP0064 test WARN case accordingly.

diff --git a/Source/cmPolicies.h b/Source/cmPolicies.h
index a791b89..b20c7a9 100644
--- a/Source/cmPolicies.h
+++ b/Source/cmPolicies.h
@@ -220,7 +220,7 @@ class cmPolicy;
     3, 3, 0, cmPolicies::WARN) \
   SELECT(POLICY, CMP0064, \
     "Support new TEST if() operator.", \
-    3, 3, 0, cmPolicies::WARN)
+    3, 4, 0, cmPolicies::WARN)
 
 #define CM_SELECT_ID(F, A1, A2, A3, A4, A5, A6) F(A1)
 #define CM_FOR_EACH_POLICY_ID(POLICY) \
diff --git a/Tests/RunCMake/CMP0064/CMP0064-WARN-stderr.txt b/Tests/RunCMake/CMP0064/CMP0064-WARN-stderr.txt
new file mode 100644
index 0000000..71f1ab7
--- /dev/null
+++ b/Tests/RunCMake/CMP0064/CMP0064-WARN-stderr.txt
@@ -0,0 +1,10 @@
+CMake Warning \(dev\) at CMP0064-WARN.cmake:3 \(if\):
+  Policy CMP0064 is not set: Support new TEST if\(\) operator.  Run "cmake
+  --help-policy CMP0064" for policy details.  Use the cmake_policy command to
+  set the policy and suppress this warning.
+
+  TEST will be interpreted as an operator when the policy is set to NEW.
+  Since the policy is not set the OLD behavior will be used.
+Call Stack \(most recent call first\):
+  CMakeLists.txt:3 \(include\)
+This warning is for project developers.  Use -Wno-dev to suppress it.
diff --git a/Tests/RunCMake/CMP0064/CMP0064-WARN.cmake b/Tests/RunCMake/CMP0064/CMP0064-WARN.cmake
index bffd3f3..8f26ec6 100644
--- a/Tests/RunCMake/CMP0064/CMP0064-WARN.cmake
+++ b/Tests/RunCMake/CMP0064/CMP0064-WARN.cmake
@@ -1,4 +1,4 @@
-cmake_policy(SET CMP0064 OLD)
+
 
 if(TEST)
   message(FATAL_ERROR "TEST was not recognized to be undefined")

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

Summary of changes:
 Source/cmPolicies.h                            |    2 +-
 Tests/RunCMake/CMP0064/CMP0064-WARN-stderr.txt |   10 ++++++++++
 Tests/RunCMake/CMP0064/CMP0064-WARN.cmake      |    2 +-
 3 files changed, 12 insertions(+), 2 deletions(-)
 create mode 100644 Tests/RunCMake/CMP0064/CMP0064-WARN-stderr.txt


hooks/post-receive
-- 
CMake