diff options
| author | Brad King <brad.king@kitware.com> | 2014-11-25 15:18:19 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-11-25 15:18:19 (GMT) |
| commit | 61a987c2296576ce4d17cb32deda192a01d6fc89 (patch) | |
| tree | c62fa913ae6e9d655c23b3ff4fc72302b4db49fe | |
| parent | 0f192080761529518128ee697d477ab5ec2e7ea8 (diff) | |
| parent | 51a60973eb67b33e857473f2fe98ae25943f7648 (diff) | |
| download | CMake-61a987c2296576ce4d17cb32deda192a01d6fc89.zip CMake-61a987c2296576ce4d17cb32deda192a01d6fc89.tar.gz CMake-61a987c2296576ce4d17cb32deda192a01d6fc89.tar.bz2 | |
Merge topic 'CPackRPM-cleanup-component-vars'
51a60973 CPackRPM: Unset temporary component variables before re-use
| -rw-r--r-- | Modules/CPackRPM.cmake | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Modules/CPackRPM.cmake b/Modules/CPackRPM.cmake index 66717ef..d2cb2ee 100644 --- a/Modules/CPackRPM.cmake +++ b/Modules/CPackRPM.cmake @@ -678,6 +678,8 @@ foreach(_RPM_SPEC_HEADER URL REQUIRES SUGGESTS PROVIDES OBSOLETES PREFIX CONFLIC endif() endif() + # Do not forget to unset previously set header (from previous component) + unset(TMP_RPM_${_RPM_SPEC_HEADER}) # Treat the RPM Spec keyword iff it has been properly defined if(DEFINED CPACK_RPM_PACKAGE_${_RPM_SPEC_HEADER}_TMP) # Transform NAME --> Name e.g. PROVIDES --> Provides @@ -698,9 +700,7 @@ foreach(_RPM_SPEC_HEADER URL REQUIRES SUGGESTS PROVIDES OBSOLETES PREFIX CONFLIC message("CPackRPM:Debug: User defined ${_PACKAGE_HEADER_NAME}:\n ${CPACK_RPM_PACKAGE_${_RPM_SPEC_HEADER}_TMP}") endif() set(TMP_RPM_${_RPM_SPEC_HEADER} "${_PACKAGE_HEADER_NAME}: ${CPACK_RPM_PACKAGE_${_RPM_SPEC_HEADER}_TMP}") - else() - # Do not forget to unset previously set header (from previous component) - unset(TMP_RPM_${_RPM_SPEC_HEADER}) + unset(CPACK_RPM_PACKAGE_${_RPM_SPEC_HEADER}_TMP) endif() endforeach() |