diff options
| author | David Cole <david.cole@kitware.com> | 2012-06-12 19:58:03 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2012-06-12 19:58:03 (GMT) |
| commit | a8fa345ea2361a6018a0dc62c3380397b1c2c5f9 (patch) | |
| tree | 1f1c0f447d23543951ea9f44c63e2c0cfe97aa01 /Modules | |
| parent | ebc702c86df3df203d2a0f070c61c1434616193f (diff) | |
| parent | 7321c94e593ff50714d20d99b7042e9f96ee057e (diff) | |
| download | CMake-a8fa345ea2361a6018a0dc62c3380397b1c2c5f9.zip CMake-a8fa345ea2361a6018a0dc62c3380397b1c2c5f9.tar.gz CMake-a8fa345ea2361a6018a0dc62c3380397b1c2c5f9.tar.bz2 | |
Merge topic 'CPackRPM-emptyPerComponentREQUIRES'
7321c94 CPackRPM: avoid leakage of RPM directive from one component to another.
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/CPackRPM.cmake | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Modules/CPackRPM.cmake b/Modules/CPackRPM.cmake index cba746f..ae93512 100644 --- a/Modules/CPackRPM.cmake +++ b/Modules/CPackRPM.cmake @@ -488,7 +488,10 @@ 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(CPACK_RPM_PACKAGE_DEBUG) SET(TMP_RPM_${_RPM_SPEC_HEADER} "${_PACKAGE_HEADER_NAME}: ${CPACK_RPM_PACKAGE_${_RPM_SPEC_HEADER}_TMP}") -ENDIF(CPACK_RPM_PACKAGE_${_RPM_SPEC_HEADER}_TMP) + ELSE(CPACK_RPM_PACKAGE_${_RPM_SPEC_HEADER}_TMP) + # Do not forget to unset previously set header (from previous component) + UNSET(TMP_RPM_${_RPM_SPEC_HEADER}) + ENDIF(CPACK_RPM_PACKAGE_${_RPM_SPEC_HEADER}_TMP) ENDFOREACH(_RPM_SPEC_HEADER) # CPACK_RPM_SPEC_INSTALL_POST |