[Cmake-commits] CMake branch, next, updated. v3.6.2-2297-g38cf4b1
Brad King
brad.king at kitware.com
Tue Sep 20 08:31:22 EDT 2016
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 38cf4b108d015c59a3aac7465406f25f43e676f1 (commit)
via edb3f6eee4babe2efab6d50b8bec75d839b6a1c5 (commit)
from 6ffb1606b239c7c1f82bb2b618ad3bec78737121 (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=38cf4b108d015c59a3aac7465406f25f43e676f1
commit 38cf4b108d015c59a3aac7465406f25f43e676f1
Merge: 6ffb160 edb3f6e
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Sep 20 08:31:21 2016 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Sep 20 08:31:21 2016 -0400
Merge topic 'cpack-rpm-policy-warnings' into next
edb3f6ee CPackRPM: Avoid CMP0007 warnings
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=edb3f6eee4babe2efab6d50b8bec75d839b6a1c5
commit edb3f6eee4babe2efab6d50b8bec75d839b6a1c5
Author: Domen Vrankar <domen.vrankar at gmail.com>
AuthorDate: Tue Sep 20 00:17:54 2016 +0200
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue Sep 20 08:30:29 2016 -0400
CPackRPM: Avoid CMP0007 warnings
For older versions of CMake minimum required version CMP0007 policy
warning was printed out.
diff --git a/Modules/CPackRPM.cmake b/Modules/CPackRPM.cmake
index 36caac6..90b3943 100644
--- a/Modules/CPackRPM.cmake
+++ b/Modules/CPackRPM.cmake
@@ -847,7 +847,10 @@ function(cpack_rpm_prepare_content_list)
set(_DISTINCT_PATH "${_RPM_RELOCATION_PREFIX}")
string(REPLACE "/" ";" _CPACK_RPM_PACKAGE_PREFIX_ELEMS " ${_RPM_RELOCATION_PREFIX}")
- list(REMOVE_AT _CPACK_RPM_PACKAGE_PREFIX_ELEMS -1)
+ cmake_policy(PUSH)
+ cmake_policy(SET CMP0007 NEW)
+ list(REMOVE_AT _CPACK_RPM_PACKAGE_PREFIX_ELEMS -1)
+ cmake_policy(POP)
unset(_TMP_LIST)
# Now generate all of the parent dirs of the relocation path
foreach(_PREFIX_PATH_ELEM ${_CPACK_RPM_PACKAGE_PREFIX_ELEMS})
-----------------------------------------------------------------------
Summary of changes:
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list