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 e3b9d125ef5cd766b05f0354ca817ebfc7b82a42 (commit)
via d00bb419ca5ccbecee892ce1f3e5fdd455c11ff0 (commit)
via 82501b40a186752184a7bb8602615b03e0ac0965 (commit)
via 5586648a775544a21ee9171a38700e1d90907e86 (commit)
via 2faadaae6bad10750e4b834a4a4d20bf5514f7e2 (commit)
via bab7ec3c259f31eb696f84c55ac80497e30f13df (commit)
via 580e322dcbc3cfe8cbe08491564fe2aeb727b811 (commit)
via 7bbddeb78d46193eda9c2a948040e50012fbe33b (commit)
via e5419f4f873d8c233c9903a813866bc0c759dfc9 (commit)
via b63dc7c8fc7a9d3487577dedf7dfabc63bc20817 (commit)
via 5d3b825cbdfe24c97f2f480a05990ad7c2e885d9 (commit)
via 36ded610af1bf80304a35491eeb66c34c8e9b7a8 (commit)
from 0d1bf3f660faebd8b73d638d0359db5502e2f3d6 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e3b9d125ef5cd766b05f0354ca817ebfc7b82a42
commit e3b9d125ef5cd766b05f0354ca817ebfc7b82a42
Merge: 82501b4 d00bb41
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Thu Oct 10 13:26:58 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Thu Oct 10 09:27:06 2019 -0400
Merge topic 'deprecate-policy-old'
d00bb419ca Add deprecation warnings for policies CMP0069 and below
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !3893
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d00bb419ca5ccbecee892ce1f3e5fdd455c11ff0
commit d00bb419ca5ccbecee892ce1f3e5fdd455c11ff0
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Mon Oct 7 13:26:23 2019 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Thu Oct 10 09:26:10 2019 -0400
Add deprecation warnings for policies CMP0069 and below
The OLD behaviors of all policies are deprecated, but only by
documentation. Add an explicit deprecation diagnostic for policies
introduced in CMake 3.9 and below to encourage projects to port away
from setting policies to OLD.
diff --git a/Help/release/dev/deprecate-policy-old.rst
b/Help/release/dev/deprecate-policy-old.rst
new file mode 100644
index 0000000..401f4b2
--- /dev/null
+++ b/Help/release/dev/deprecate-policy-old.rst
@@ -0,0 +1,8 @@
+deprecate-policy-old
+--------------------
+
+* An explicit deprecation diagnostic was added for policy ``CMP0068``
+ and policy ``CMP0069`` (``CMP0067`` and below were already deprecated).
+ The :manual:`cmake-policies(7)` manual explains that the OLD behaviors
+ of all policies are deprecated and that projects should port to the
+ NEW behaviors.
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index f143ef7..bf488b1 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -4487,7 +4487,7 @@ bool cmMakefile::SetPolicy(cmPolicies::PolicyID id,
// Deprecate old policies, especially those that require a lot
// of code to maintain the old behavior.
- if (status == cmPolicies::OLD && id <= cmPolicies::CMP0067 &&
+ if (status == cmPolicies::OLD && id <= cmPolicies::CMP0069 &&
!(this->GetCMakeInstance()->GetIsInTryCompile() &&
(
// Policies set by cmCoreTryCompile::TryCompileCode.
diff --git a/Tests/RunCMake/CMP0068/CMP0068-OLD-stderr.txt
b/Tests/RunCMake/CMP0068/CMP0068-OLD-stderr.txt
new file mode 100644
index 0000000..a736129
--- /dev/null
+++ b/Tests/RunCMake/CMP0068/CMP0068-OLD-stderr.txt
@@ -0,0 +1,10 @@
+^CMake Deprecation Warning at CMP0068-OLD.cmake:[0-9]+ \(cmake_policy\):
+ The OLD behavior for policy CMP0068 will be removed from a future version
+ of CMake.
+
+ The cmake-policies\(7\) manual explains that the OLD behaviors of all
+ policies are deprecated and that a policy should be set to OLD only under
+ specific short-term circumstances. Projects should be ported to the NEW
+ behavior and not rely on setting a policy to OLD.
+Call Stack \(most recent call first\):
+ CMakeLists.txt:[0-9]+ \(include\)$
diff --git a/Tests/RunCMake/CMP0069/CMP0069-OLD-stderr.txt
b/Tests/RunCMake/CMP0069/CMP0069-OLD-stderr.txt
new file mode 100644
index 0000000..f51a6f4
--- /dev/null
+++ b/Tests/RunCMake/CMP0069/CMP0069-OLD-stderr.txt
@@ -0,0 +1,10 @@
+^CMake Deprecation Warning at CMP0069-OLD.cmake:[0-9]+ \(cmake_policy\):
+ The OLD behavior for policy CMP0069 will be removed from a future version
+ of CMake.
+
+ The cmake-policies\(7\) manual explains that the OLD behaviors of all
+ policies are deprecated and that a policy should be set to OLD only under
+ specific short-term circumstances. Projects should be ported to the NEW
+ behavior and not rely on setting a policy to OLD.
+Call Stack \(most recent call first\):
+ CMakeLists.txt:[0-9]+ \(include\)$
diff --git a/Tests/RunCMake/CheckIPOSupported/cmp0069-is-old-stderr.txt
b/Tests/RunCMake/CheckIPOSupported/cmp0069-is-old-stderr.txt
index f183594..1baa63a 100644
--- a/Tests/RunCMake/CheckIPOSupported/cmp0069-is-old-stderr.txt
+++ b/Tests/RunCMake/CheckIPOSupported/cmp0069-is-old-stderr.txt
@@ -1,4 +1,15 @@
-^CMake Error at .*/Modules/CheckIPOSupported\.cmake:[0-9]+ \(message\):
+^CMake Deprecation Warning at cmp0069-is-old.cmake:[0-9]+ \(cmake_policy\):
+ The OLD behavior for policy CMP0069 will be removed from a future version
+ of CMake.
+
+ The cmake-policies\(7\) manual explains that the OLD behaviors of all
+ policies are deprecated and that a policy should be set to OLD only under
+ specific short-term circumstances. Projects should be ported to the NEW
+ behavior and not rely on setting a policy to OLD.
+Call Stack \(most recent call first\):
+ CMakeLists.txt:[0-9]+ \(include\)
++
+CMake Error at .*/Modules/CheckIPOSupported\.cmake:[0-9]+ \(message\):
Policy CMP0069 set to OLD
Call Stack \(most recent call first\):
cmp0069-is-old\.cmake:[0-9]+ \(check_ipo_supported\)
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=82501b40a186752184a7bb8602615b03e0ac0965
commit 82501b40a186752184a7bb8602615b03e0ac0965
Merge: 5586648 580e322
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Thu Oct 10 09:24:51 2019 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Thu Oct 10 09:24:51 2019 -0400
Merge branch 'release-3.16'
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5586648a775544a21ee9171a38700e1d90907e86
commit 5586648a775544a21ee9171a38700e1d90907e86
Merge: 2faadaa 5d3b825
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Thu Oct 10 13:23:54 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Thu Oct 10 09:24:21 2019 -0400
Merge topic 'ExternalProject-minor-typos'
5d3b825cbd ExternalProject: fix some documentation typos
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !3898
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2faadaae6bad10750e4b834a4a4d20bf5514f7e2
commit 2faadaae6bad10750e4b834a4a4d20bf5514f7e2
Merge: bab7ec3 7bbddeb
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Thu Oct 10 13:23:29 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Thu Oct 10 09:23:37 2019 -0400
Merge topic 'rename_loglevel_option'
7bbddeb78d CLI: Rename --loglevel to --log-level for naming consistency
Acked-by: Kitware Robot <kwro...@kitware.com>
Acked-by: Alex Turbov <i.za...@gmail.com>
Merge-request: !3899
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bab7ec3c259f31eb696f84c55ac80497e30f13df
commit bab7ec3c259f31eb696f84c55ac80497e30f13df
Merge: 0d1bf3f 36ded61
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Thu Oct 10 13:22:24 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Thu Oct 10 09:22:39 2019 -0400
Merge topic 'pch-generate'
36ded610af PCH: Generate sources during Compute step
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !3890
-----------------------------------------------------------------------
Summary of changes:
Help/command/message.rst | 2 +-
Help/manual/cmake.1.rst | 5 +-
Help/release/3.16.rst | 5 ++
Help/release/dev/deprecate-policy-old.rst | 8 ++
Modules/ExternalProject.cmake | 4 +-
Source/cmFileAPICodemodel.cxx | 26 +++++++
Source/cmGeneratorTarget.cxx | 86 ++++++++++++++++++++++
Source/cmGeneratorTarget.h | 9 +++
Source/cmGlobalGenerator.cxx | 1 +
Source/cmGlobalXCodeGenerator.cxx | 7 +-
Source/cmLocalGenerator.cxx | 79 ++++----------------
Source/cmLocalGenerator.h | 3 +-
Source/cmLocalVisualStudio7Generator.cxx | 18 ++++-
Source/cmMakefile.cxx | 2 +-
Source/cmMakefileExecutableTargetGenerator.cxx | 2 -
Source/cmMakefileLibraryTargetGenerator.cxx | 2 -
Source/cmMakefileTargetGenerator.cxx | 35 ++++++++-
Source/cmMakefileUtilityTargetGenerator.cxx | 2 -
Source/cmNinjaNormalTargetGenerator.cxx | 2 -
Source/cmNinjaTargetGenerator.cxx | 43 ++++++++++-
Source/cmVisualStudio10TargetGenerator.cxx | 29 ++++++--
Source/cmake.cxx | 11 +++
Source/cmakemain.cxx | 5 +-
.../CMP0068-OLD-stderr.txt} | 4 +-
.../CMP0069-OLD-stderr.txt} | 4 +-
.../CheckIPOSupported/cmp0069-is-old-stderr.txt | 13 +++-
Tests/RunCMake/message/RunCMakeTest.cmake | 82 +++++++++++----------
...derr.txt => message-log-level-debug-stderr.txt} | 0
...dout.txt => message-log-level-debug-stdout.txt} | 0
...rr.txt => message-log-level-default-stderr.txt} | 0
...ut.txt => message-log-level-default-stdout.txt} | 0
.../message-log-level-invalid-result.txt} | 0
.../message/message-log-level-invalid-stderr.txt | 1 +
...err.txt => message-log-level-notice-stderr.txt} | 0
...err.txt => message-log-level-status-stderr.txt} | 0
...out.txt => message-log-level-status-stdout.txt} | 0
...derr.txt => message-log-level-trace-stderr.txt} | 0
...dout.txt => message-log-level-trace-stdout.txt} | 0
...rr.txt => message-log-level-verbose-stderr.txt} | 0
...ut.txt => message-log-level-verbose-stdout.txt} | 0
...rr.txt => message-log-level-warning-stderr.txt} | 0
41 files changed, 349 insertions(+), 141 deletions(-)
create mode 100644 Help/release/dev/deprecate-policy-old.rst
copy Tests/RunCMake/{CMP0028/CMP0028-OLD-stderr.txt =>
CMP0068/CMP0068-OLD-stderr.txt} (75%)
copy Tests/RunCMake/{CMP0028/CMP0028-OLD-stderr.txt =>
CMP0069/CMP0069-OLD-stderr.txt} (75%)
copy Tests/RunCMake/message/{message-loglevel-verbose-stderr.txt =>
message-log-level-debug-stderr.txt} (100%)
copy Tests/RunCMake/message/{message-loglevel-debug-stdout.txt =>
message-log-level-debug-stdout.txt} (100%)
copy Tests/RunCMake/message/{message-loglevel-verbose-stderr.txt =>
message-log-level-default-stderr.txt} (100%)
copy Tests/RunCMake/message/{message-loglevel-status-stdout.txt =>
message-log-level-default-stdout.txt} (100%)
copy Tests/RunCMake/{while/MissingArgument-result.txt =>
message/message-log-level-invalid-result.txt} (100%)
create mode 100644 Tests/RunCMake/message/message-log-level-invalid-stderr.txt
copy Tests/RunCMake/message/{message-loglevel-verbose-stderr.txt =>
message-log-level-notice-stderr.txt} (100%)
copy Tests/RunCMake/message/{message-loglevel-verbose-stderr.txt =>
message-log-level-status-stderr.txt} (100%)
copy Tests/RunCMake/message/{message-loglevel-status-stdout.txt =>
message-log-level-status-stdout.txt} (100%)
copy Tests/RunCMake/message/{message-loglevel-verbose-stderr.txt =>
message-log-level-trace-stderr.txt} (100%)
copy Tests/RunCMake/message/{message-loglevel-trace-stdout.txt =>
message-log-level-trace-stdout.txt} (100%)
copy Tests/RunCMake/message/{message-loglevel-verbose-stderr.txt =>
message-log-level-verbose-stderr.txt} (100%)
copy Tests/RunCMake/message/{message-loglevel-verbose-stdout.txt =>
message-log-level-verbose-stdout.txt} (100%)
copy Tests/RunCMake/message/{message-loglevel-warning-stderr.txt =>
message-log-level-warning-stderr.txt} (100%)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
https://cmake.org/mailman/listinfo/cmake-commits
