[Cmake-commits] CMake branch, next, updated. v3.0.0-rc6-3438-g2728f8a
Peter Kuemmel
syntheticpp at gmx.net
Thu May 29 15:43:18 EDT 2014
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 2728f8ab9c12a2d38eeb504c4148acbed5c70c66 (commit)
via 8828bfca1747ac73b14d3c576cdb595359ddc172 (commit)
via 7273e1f83519ced173384904540ef66aa8bac844 (commit)
from fcd3714aa0a5824072994a78377dfbcc7f4c0762 (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=2728f8ab9c12a2d38eeb504c4148acbed5c70c66
commit 2728f8ab9c12a2d38eeb504c4148acbed5c70c66
Merge: fcd3714 8828bfc
Author: Peter Kuemmel <syntheticpp at gmx.net>
AuthorDate: Thu May 29 15:43:17 2014 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu May 29 15:43:17 2014 -0400
Merge topic 'policy-docu' into next
8828bfca Calling cmake_minimum_required() resets the policy stack
7273e1f8 Add missing space in policy description
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8828bfca1747ac73b14d3c576cdb595359ddc172
commit 8828bfca1747ac73b14d3c576cdb595359ddc172
Author: Peter Kümmel <syntheticpp at gmx.net>
AuthorDate: Thu May 29 21:42:27 2014 +0200
Commit: Peter Kümmel <syntheticpp at gmx.net>
CommitDate: Thu May 29 21:42:27 2014 +0200
Calling cmake_minimum_required() resets the policy stack
diff --git a/Help/command/cmake_policy.rst b/Help/command/cmake_policy.rst
index 46db8d3..a17311c 100644
--- a/Help/command/cmake_policy.rst
+++ b/Help/command/cmake_policy.rst
@@ -76,3 +76,6 @@ use the pre-record policies when they are invoked. If the function or
macro implementation sets policies, the changes automatically
propagate up through callers until they reach the closest nested
policy stack entry.
+
+Calling cmake_minimum_required() resets the policy stack
+to the specified version.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7273e1f83519ced173384904540ef66aa8bac844
commit 7273e1f83519ced173384904540ef66aa8bac844
Author: Peter Kümmel <syntheticpp at gmx.net>
AuthorDate: Thu May 29 21:41:33 2014 +0200
Commit: Peter Kümmel <syntheticpp at gmx.net>
CommitDate: Thu May 29 21:41:33 2014 +0200
Add missing space in policy description
diff --git a/Help/policy/CMP0020.rst b/Help/policy/CMP0020.rst
index ad664b0..6767d08 100644
--- a/Help/policy/CMP0020.rst
+++ b/Help/policy/CMP0020.rst
@@ -16,7 +16,7 @@ this automatic linking will need to be disabled as per the
documentation.
The OLD behavior for this policy is not to link executables to
-qtmain.lib automatically when they link to the QtCore IMPORTEDtarget.
+qtmain.lib automatically when they link to the QtCore IMPORTED target.
The NEW behavior for this policy is to link executables to qtmain.lib
automatically when they link to QtCore IMPORTED target.
-----------------------------------------------------------------------
Summary of changes:
Help/command/cmake_policy.rst | 3 +++
Help/policy/CMP0020.rst | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list