diff options
| author | Brad King <brad.king@kitware.com> | 2016-07-06 13:35:29 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-07-06 13:35:29 (GMT) |
| commit | 8df2e68614b0de60f5d5fcfba63012903815adef (patch) | |
| tree | bedbb249f73f0d7e4ad0ee19ad7900c7f3176d8a | |
| parent | 0219743a01c1c89c5b67d18c1094731c4b609ffa (diff) | |
| parent | a351edd2452f191988253da3f7b537f8e505f794 (diff) | |
| download | CMake-8df2e68614b0de60f5d5fcfba63012903815adef.zip CMake-8df2e68614b0de60f5d5fcfba63012903815adef.tar.gz CMake-8df2e68614b0de60f5d5fcfba63012903815adef.tar.bz2 | |
Merge topic 'cpack-rpm-better-directive-match'
a351edd2 CPackRPM: Handle directives of form %foo and %foo(anything)
| -rw-r--r-- | Modules/CPackRPM.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/CPackRPM.cmake b/Modules/CPackRPM.cmake index d231ff0..7706bbc 100644 --- a/Modules/CPackRPM.cmake +++ b/Modules/CPackRPM.cmake @@ -1683,8 +1683,8 @@ function(cpack_rpm_generate_package) set(CPACK_RPM_USER_INSTALL_FILES "") foreach(F IN LISTS CPACK_RPM_USER_FILELIST_INTERNAL) - string(REGEX REPLACE "%[A-Za-z0-9\(\),-]* " "" F_PATH ${F}) - string(REGEX MATCH "%[A-Za-z0-9\(\),-]*" F_PREFIX ${F}) + string(REGEX REPLACE "%[A-Za-z]+(\\([^()]*\\))? " "" F_PATH ${F}) + string(REGEX MATCH "%[A-Za-z]+(\\([^()]*\\))?" F_PREFIX ${F}) if(CPACK_RPM_PACKAGE_DEBUG) message("CPackRPM:Debug: F_PREFIX=<${F_PREFIX}>, F_PATH=<${F_PATH}>") |