diff options
| author | Brad King <brad.king@kitware.com> | 2021-08-03 15:00:27 +0000 |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-08-03 11:01:08 -0400 |
| commit | fbf5a368c9d3a8d3b1caaf77c290524fc41d42ee (patch) | |
| tree | 8a0d2f1fa7b66343f2a760aef25457346b45173e | |
| parent | 54be23df7f39d14aad3eb57e6bf8d5afa59f07a5 (diff) | |
| parent | 3cdf23985fc4578b719546a0e76bdcf82457477a (diff) | |
| download | cmake-fbf5a368c9d3a8d3b1caaf77c290524fc41d42ee.tar.gz | |
Merge topic 'cpack-rpm-pre-semicolon' into release-3.21
3cdf23985f CPackRPM: avoid a spurious `;` in the `%pre` and other sections with scripts
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !6415
| -rw-r--r-- | Modules/Internal/CPack/CPackRPM.cmake | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/Modules/Internal/CPack/CPackRPM.cmake b/Modules/Internal/CPack/CPackRPM.cmake index 47d2a5c7fe..cbd748b2c7 100644 --- a/Modules/Internal/CPack/CPackRPM.cmake +++ b/Modules/Internal/CPack/CPackRPM.cmake @@ -11,9 +11,7 @@ function(set_spec_script_if_enabled TYPE PACKAGE_NAME VAR) if(PACKAGE_NAME) set(PACKAGE_NAME " -n ${PACKAGE_NAME}") endif() - set(${TYPE}_ - "%${TYPE}${PACKAGE_NAME}\n" - "${VAR}\n" PARENT_SCOPE) + set(${TYPE}_ "%${TYPE}${PACKAGE_NAME}\n${VAR}\n" PARENT_SCOPE) else() set(${TYPE} "" PARENT_SCOPE) endif() |