diff options
| author | Brad King <brad.king@kitware.com> | 2015-09-22 14:46:57 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-09-22 14:46:57 (GMT) |
| commit | 4be709a6b715acb4100fceb4394ad5215d8b555b (patch) | |
| tree | ab6ee115b5d053d0e012b0d2b1292cf7ae25bf4c | |
| parent | f1365f32064d6e56c1cbdf27bb18b9c7a8490330 (diff) | |
| parent | 402bf096ec4aac75af096c3708ce51efaf4589d0 (diff) | |
| download | CMake-4be709a6b715acb4100fceb4394ad5215d8b555b.zip CMake-4be709a6b715acb4100fceb4394ad5215d8b555b.tar.gz CMake-4be709a6b715acb4100fceb4394ad5215d8b555b.tar.bz2 | |
Merge topic 'fix-policy-CMP0064-version'
402bf096 CMP0064: Fix recorded version of introduction to be 3.4
| -rw-r--r-- | Source/cmPolicies.h | 2 | ||||
| -rw-r--r-- | Tests/RunCMake/CMP0064/CMP0064-WARN-stderr.txt | 10 | ||||
| -rw-r--r-- | Tests/RunCMake/CMP0064/CMP0064-WARN.cmake | 2 |
3 files changed, 12 insertions, 2 deletions
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") |