[Cmake-commits] CMake branch, next, updated. v3.3.0-rc4-1172-g257f7e5
Stephen Kelly
steveire at gmail.com
Sun Jul 19 12:21:25 EDT 2015
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 257f7e5e675e7d0f04ec789dbb23a9c4985088ce (commit)
via 4572d8b34e5ac0985dc3beaefbe9dde514aa0ff4 (commit)
via 0d48bb627388e24a961d36ea6d152eb866676ac1 (commit)
from d5f65f1307f3d4e67d31f333cf34a97588cfe033 (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=257f7e5e675e7d0f04ec789dbb23a9c4985088ce
commit 257f7e5e675e7d0f04ec789dbb23a9c4985088ce
Merge: d5f65f1 4572d8b
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Jul 19 12:21:24 2015 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Jul 19 12:21:24 2015 -0400
Merge topic 'KDE4-NO_POLICY_SCOPE' into next
4572d8b3 KDE4: Find the Internal package with NO_POLICY_SCOPE.
0d48bb62 CMake Nightly Date Stamp
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4572d8b34e5ac0985dc3beaefbe9dde514aa0ff4
commit 4572d8b34e5ac0985dc3beaefbe9dde514aa0ff4
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Jul 19 18:17:16 2015 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Sun Jul 19 18:20:57 2015 +0200
KDE4: Find the Internal package with NO_POLICY_SCOPE.
If someone in KDE wants to port away from OLD policies, they might want to do
so one policy at a time. This patch will allow them to use
find_package(KDE4 NO_POLICY_SCOPE)
in callers to get around the CMP0011 warning, while still getting the policy
settings contained within.
diff --git a/Modules/FindKDE4.cmake b/Modules/FindKDE4.cmake
index 3c2c309..5530166 100644
--- a/Modules/FindKDE4.cmake
+++ b/Modules/FindKDE4.cmake
@@ -105,7 +105,7 @@ if (KDE4_DATA_DIR)
endif ()
# use FindKDE4Internal.cmake to do the rest
- find_package(KDE4Internal ${_req} ${_quiet})
+ find_package(KDE4Internal ${_req} ${_quiet} NO_POLICY_SCOPE)
else ()
if (KDE4_FIND_REQUIRED)
message(FATAL_ERROR "ERROR: cmake/modules/FindKDE4Internal.cmake not found in ${_data_DIR}")
-----------------------------------------------------------------------
Summary of changes:
Modules/FindKDE4.cmake | 2 +-
Source/CMakeVersion.cmake | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list