diff options
| author | Brad King <brad.king@kitware.com> | 2015-02-24 14:12:39 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-02-24 14:12:39 (GMT) |
| commit | 133ab7a4476f97c5c524bd1e7dcb65efe7d6f810 (patch) | |
| tree | 25a9f9c586844ea0c36e69669c837fcd41f9d4b8 /Modules | |
| parent | 91234717f710c3922a03e8449bf12475b7d6f26b (diff) | |
| parent | 5857ca5e0d6c6f04486153f69184ba5d76b13f0b (diff) | |
| download | CMake-133ab7a4476f97c5c524bd1e7dcb65efe7d6f810.zip CMake-133ab7a4476f97c5c524bd1e7dcb65efe7d6f810.tar.gz CMake-133ab7a4476f97c5c524bd1e7dcb65efe7d6f810.tar.bz2 | |
Merge topic 'rpm_at_in_path'
5857ca5e CPackRPM: Drop explicit handling of '@' symbols that breaks them (#14782)
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/CPackRPM.cmake | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/Modules/CPackRPM.cmake b/Modules/CPackRPM.cmake index 6ce18bf..cb987f8 100644 --- a/Modules/CPackRPM.cmake +++ b/Modules/CPackRPM.cmake @@ -1175,13 +1175,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. # @@ -1292,9 +1285,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( |