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 b2084a330d73f92b7d55d22921b2e2d9e1d462cc (commit)
via 5d3b8eed4bf7d4b4b2534861aa96f517479596af (commit)
via f7f15a77ea81eb51d5544859189563c708e487a7 (commit)
via 97d21092944354cce5de9a68a7d9bc637cda085d (commit)
via 0d887397367b4b8c01a584e8e1a4b3192ca7af18 (commit)
via a4841e12c0e3865a585774b118e7b9840bc1b253 (commit)
via 6845e2559d66be8d2c67d936ca597ade05b4ebbc (commit)
from d4a42dd4a87c9caa222a7a40150db937258698d2 (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=b2084a330d73f92b7d55d22921b2e2d9e1d462cc
commit b2084a330d73f92b7d55d22921b2e2d9e1d462cc
Merge: 5d3b8ee 6845e25
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue Jan 15 18:11:23 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Tue Jan 15 13:12:08 2019 -0500
Merge topic 'deprecate-policy-old'
6845e2559d Add deprecation warnings for policies CMP0065 and below
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !2793
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5d3b8eed4bf7d4b4b2534861aa96f517479596af
commit 5d3b8eed4bf7d4b4b2534861aa96f517479596af
Merge: f7f15a7 0d88739
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue Jan 15 18:10:12 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Tue Jan 15 13:11:08 2019 -0500
Merge topic 'update-kwsys'
0d88739736 Merge branch 'upstream-KWSys' into update-kwsys
a4841e12c0 KWSys 2019-01-14 (1541d849)
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !2801
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f7f15a77ea81eb51d5544859189563c708e487a7
commit f7f15a77ea81eb51d5544859189563c708e487a7
Merge: d4a42dd 97d2109
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue Jan 15 18:10:02 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Tue Jan 15 13:10:08 2019 -0500
Merge topic 'FindBoost-test-env'
97d2109294 Tests: Make RunCMake.FindBoost robust to Boost_ROOT in
environment
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !2802
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=97d21092944354cce5de9a68a7d9bc637cda085d
commit 97d21092944354cce5de9a68a7d9bc637cda085d
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Mon Jan 14 07:44:32 2019 -0500
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Mon Jan 14 07:44:32 2019 -0500
Tests: Make RunCMake.FindBoost robust to Boost_ROOT in environment
Remove the environment variable within the test to avoid CMP0074
behavior.
diff --git a/Tests/RunCMake/FindBoost/RunCMakeTest.cmake
b/Tests/RunCMake/FindBoost/RunCMakeTest.cmake
index 5d0577b..eef350c 100644
--- a/Tests/RunCMake/FindBoost/RunCMakeTest.cmake
+++ b/Tests/RunCMake/FindBoost/RunCMakeTest.cmake
@@ -1,4 +1,5 @@
include(RunCMake)
+unset(ENV{Boost_ROOT})
run_cmake(CMakePackage)
run_cmake(NoCXX)
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0d887397367b4b8c01a584e8e1a4b3192ca7af18
commit 0d887397367b4b8c01a584e8e1a4b3192ca7af18
Merge: 848dc85 a4841e1
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Mon Jan 14 07:38:40 2019 -0500
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Mon Jan 14 07:38:40 2019 -0500
Merge branch 'upstream-KWSys' into update-kwsys
* upstream-KWSys:
KWSys 2019-01-14 (1541d849)
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a4841e12c0e3865a585774b118e7b9840bc1b253
commit a4841e12c0e3865a585774b118e7b9840bc1b253
Author: KWSys Upstream <kwro...@kitware.com>
AuthorDate: Mon Jan 14 07:36:32 2019 -0500
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Mon Jan 14 07:38:39 2019 -0500
KWSys 2019-01-14 (1541d849)
Code extracted from:
https://gitlab.kitware.com/utils/kwsys.git
at commit 1541d8496d0ae0e7c10eabcedb55db95f72afa4a (master).
Upstream Shortlog
-----------------
Sean McBride (1):
f44cbf93 Fixed clang -Wextra-semi-stmt warnings
diff --git a/ProcessUNIX.c b/ProcessUNIX.c
index 094c2ee..f65690b 100644
--- a/ProcessUNIX.c
+++ b/ProcessUNIX.c
@@ -1162,7 +1162,7 @@ static int kwsysProcessWaitForPipe(kwsysProcess* cp,
char** data, int* length,
case KWSYSPE_PIPE_STDERR:
wd->PipeId = kwsysProcess_Pipe_STDERR;
break;
- };
+ }
return 1;
}
} else if (n < 0 && errno == EAGAIN) {
diff --git a/testCommandLineArguments.cxx b/testCommandLineArguments.cxx
index ef87436..15f9c02 100644
--- a/testCommandLineArguments.cxx
+++ b/testCommandLineArguments.cxx
@@ -165,25 +165,26 @@ int testCommandLineArguments(int argc, char* argv[])
}
size_t cc;
#define CompareTwoLists(list1, list_valid, lsize) \
- if (list1.size() != lsize) { \
- std::cerr << "Problem setting " #list1 ". Size is: " << list1.size() \
- << " should be: " << lsize << std::endl; \
- res = 1; \
- } else { \
- std::cout << #list1 " argument set:"; \
- for (cc = 0; cc < lsize; ++cc) { \
- std::cout << " " << list1[cc]; \
- if (!CompareTwoItemsOnList(list1[cc], list_valid[cc])) { \
- std::cerr << "Problem setting " #list1 ". Value of " << cc \
- << " is: [" << list1[cc] << "] <> [" << list_valid[cc] \
- << "]" << std::endl; \
- res = 1; \
- break; \
+ do { \
+ if (list1.size() != lsize) { \
+ std::cerr << "Problem setting " #list1 ". Size is: " << list1.size() \
+ << " should be: " << lsize << std::endl; \
+ res = 1; \
+ } else { \
+ std::cout << #list1 " argument set:"; \
+ for (cc = 0; cc < lsize; ++cc) { \
+ std::cout << " " << list1[cc]; \
+ if (!CompareTwoItemsOnList(list1[cc], list_valid[cc])) { \
+ std::cerr << "Problem setting " #list1 ". Value of " << cc \
+ << " is: [" << list1[cc] << "] <> [" << list_valid[cc] \
+ << "]" << std::endl; \
+ res = 1; \
+ break; \
+ } \
} \
+ std::cout << std::endl; \
} \
- std::cout << std::endl; \
- }
-
+ } while (0)
CompareTwoLists(numbers_argument, valid_numbers, 10);
CompareTwoLists(doubles_argument, valid_doubles, 3);
CompareTwoLists(bools_argument, valid_bools, 3);
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6845e2559d66be8d2c67d936ca597ade05b4ebbc
commit 6845e2559d66be8d2c67d936ca597ade05b4ebbc
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Fri Jan 11 14:10:15 2019 -0500
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Fri Jan 11 14:47:20 2019 -0500
Add deprecation warnings for policies CMP0065 and below
The OLD behaviors of all policies are deprecated, but only by
documentation. Add an explicit deprecation diagnostic for some policies
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..2c99780
--- /dev/null
+++ b/Help/release/dev/deprecate-policy-old.rst
@@ -0,0 +1,8 @@
+deprecate-policy-old
+--------------------
+
+* An explicit deprecation diagnostic was added for policies ``CMP0064``
+ and ``CMP0065`` (``CMP0063`` 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 68a5101..891ca61 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -4232,7 +4232,11 @@ 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::CMP0063) {
+ if (status == cmPolicies::OLD && id <= cmPolicies::CMP0065 &&
+ !(this->GetCMakeInstance()->GetIsInTryCompile() &&
+ (
+ // Policies set by cmCoreTryCompile::TryCompileCode.
+ id == cmPolicies::CMP0065))) {
this->IssueMessage(cmake::DEPRECATION_WARNING,
cmPolicies::GetPolicyDeprecatedWarning(id));
}
diff --git a/Tests/RunCMake/CMP0064/CMP0064-OLD-stderr.txt
b/Tests/RunCMake/CMP0064/CMP0064-OLD-stderr.txt
new file mode 100644
index 0000000..987a503
--- /dev/null
+++ b/Tests/RunCMake/CMP0064/CMP0064-OLD-stderr.txt
@@ -0,0 +1,10 @@
+^CMake Deprecation Warning at CMP0064-OLD.cmake:1 \(cmake_policy\):
+ The OLD behavior for policy CMP0064 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:3 \(include\)$
-----------------------------------------------------------------------
Summary of changes:
Help/release/dev/deprecate-policy-old.rst | 8 +++++
Source/cmMakefile.cxx | 6 +++-
Source/kwsys/ProcessUNIX.c | 2 +-
Source/kwsys/testCommandLineArguments.cxx | 35 +++++++++++-----------
.../CMP0064-OLD-stderr.txt} | 4 +--
Tests/RunCMake/FindBoost/RunCMakeTest.cmake | 1 +
6 files changed, 35 insertions(+), 21 deletions(-)
create mode 100644 Help/release/dev/deprecate-policy-old.rst
copy Tests/RunCMake/{CMP0039/CMP0039-OLD-stderr.txt =>
CMP0064/CMP0064-OLD-stderr.txt} (74%)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
https://cmake.org/mailman/listinfo/cmake-commits
