[Cmake-commits] CMake branch, next, updated. v3.1.0-1511-gb5f5b58

[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  b5f5b58d179e6ce8fcb783ab0d5bcbc2a7dc62ee (commit)
       via  5d0a04f09487dacac5520c6e963a64cce854d2bd (commit)
       via  8c4b7c567bbb47ed9555da2bd50b672304ccb858 (commit)
      from  7d6c29fc162f8977700c590f868800779de2594f (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=b5f5b58d179e6ce8fcb783ab0d5bcbc2a7dc62ee
commit b5f5b58d179e6ce8fcb783ab0d5bcbc2a7dc62ee
Merge: 7d6c29f 5d0a04f
Author:     Domen Vrankar <domen.vrankar at gmail.com>
AuthorDate: Wed Jan 7 14:34:42 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jan 7 14:34:42 2015 -0500

    Merge topic 'rpm_at_in_path' into next
    
    5d0a04f0 rpm revert at in path escaping patch
    8c4b7c56 CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5d0a04f09487dacac5520c6e963a64cce854d2bd
commit 5d0a04f09487dacac5520c6e963a64cce854d2bd
Author:     Domen Vrankar <domen.vrankar at gmail.com>
AuthorDate: Wed Jan 7 20:33:27 2015 +0100
Commit:     Domen Vrankar <domen.vrankar at gmail.com>
CommitDate: Wed Jan 7 20:33:27 2015 +0100

    rpm revert at in path escaping patch
    
    Patch for escaping at symbols in paths was added
    to RPM generator and was obsoleted in next cmake
    release. The change that obsoleted it also caused
    it to break paths with @ symbols for which it was
    written to solve.

diff --git a/Modules/CPackRPM.cmake b/Modules/CPackRPM.cmake
index d2cb2ee..7de3aa3 100644
--- a/Modules/CPackRPM.cmake
+++ b/Modules/CPackRPM.cmake
@@ -1058,13 +1058,6 @@ if(CPACK_RPM_PACKAGE_DEBUG)
    message("CPackRPM:Debug: CPACK_TEMPORARY_PACKAGE_FILE_NAME = ${CPACK_TEMPORARY_PACKAGE_FILE_NAME}")
 endif()
 
-# protect @ in pathname in order to avoid their
-# interpretation during the configure_file step
-set(CPACK_RPM_INSTALL_FILES_LIST "${CPACK_RPM_INSTALL_FILES}")
-set(PROTECTED_AT "@")
-string(REPLACE "@" "\@PROTECTED_AT\@" CPACK_RPM_INSTALL_FILES "${CPACK_RPM_INSTALL_FILES_LIST}")
-set(CPACK_RPM_INSTALL_FILES_LIST "")
-
 #
 # USER generated/provided spec file handling.
 #
@@ -1175,9 +1168,6 @@ else()
   configure_file(${CPACK_RPM_BINARY_SPECFILE}.in ${CPACK_RPM_BINARY_SPECFILE} @ONLY)
 endif()
 
-# remove AT protection
-unset(PROTECTED_AT)
-
 if(RPMBUILD_EXECUTABLE)
   # Now call rpmbuild using the SPECFILE
   execute_process(

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

Summary of changes:
 Modules/CPackRPM.cmake    |   10 ----------
 Source/CMakeVersion.cmake |    2 +-
 2 files changed, 1 insertion(+), 11 deletions(-)


hooks/post-receive
-- 
CMake