[Cmake-commits] CMake branch, next, updated. v3.1.2-1118-g1952221

[Domen Vrankar]

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  19522216e892f73351dc480507040cd453a795cb (commit)
       via  521d4cc55eee3e0c541af822f4d786978b6bf31d (commit)
      from  82caa821d99066ee5eba5dcdbd0ee937b6890919 (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=19522216e892f73351dc480507040cd453a795cb
commit 19522216e892f73351dc480507040cd453a795cb
Merge: 82caa82 521d4cc
Author:     Domen Vrankar <domen.vrankar at gmail.com>
AuthorDate: Sun Feb 8 14:05:24 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Feb 8 14:05:24 2015 -0500

    Merge topic 'cpack_rpm_mulit_prefix_fixup' into next
    
    521d4cc5 fixup! CPackRPM: Allow multiple path relocation prefixes for one package


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=521d4cc55eee3e0c541af822f4d786978b6bf31d
commit 521d4cc55eee3e0c541af822f4d786978b6bf31d
Author:     Domen Vrankar <domen.vrankar at gmail.com>
AuthorDate: Sun Feb 8 20:03:53 2015 +0100
Commit:     Domen Vrankar <domen.vrankar at gmail.com>
CommitDate: Sun Feb 8 20:03:53 2015 +0100

    fixup! CPackRPM: Allow multiple path relocation prefixes for one package

diff --git a/Modules/CPackRPM.cmake b/Modules/CPackRPM.cmake
index 43e3fe0..214d655 100644
--- a/Modules/CPackRPM.cmake
+++ b/Modules/CPackRPM.cmake
@@ -442,7 +442,7 @@ function(cpack_rpm_prepare_relocation_paths)
 
   # set other path prefixes
   foreach(RELOCATION_PATH ${RPM_RELOCATION_PATHS})
-    if(IS_ABSOLUTE "${RELOCATE_PATH}")
+    if(IS_ABSOLUTE "${RELOCATION_PATH}")
       set(PREPARED_RELOCATION_PATH "${RELOCATION_PATH}")
     else()
       set(PREPARED_RELOCATION_PATH "${PATH_PREFIX}/${RELOCATION_PATH}")

-----------------------------------------------------------------------

Summary of changes:
 Modules/CPackRPM.cmake |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake