diff options
author | Brad King <brad.king@kitware.com> | 2021-06-30 11:29:22 (GMT) |
---|---|---|
committer | Kitware Robot <kwrobot@kitware.com> | 2021-06-30 11:29:29 (GMT) |
commit | a63ae2f1b84f0bad4abc9a4ab536bcf3f3e82e93 (patch) | |
tree | 33291736a0f43ff258d08cd8a0e125331fa08d7e /Modules | |
parent | fccacee6093e6e7183c178b2d4a48dd2266b50a6 (diff) | |
parent | 9b53eca317e52dffa1ba8972981af7b40392e323 (diff) | |
download | CMake-a63ae2f1b84f0bad4abc9a4ab536bcf3f3e82e93.zip CMake-a63ae2f1b84f0bad4abc9a4ab536bcf3f3e82e93.tar.gz CMake-a63ae2f1b84f0bad4abc9a4ab536bcf3f3e82e93.tar.bz2 |
Merge topic 'rpm-suggests'
9b53eca317 CPack/RPM: Fix weak dep support
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6274
Diffstat (limited to 'Modules')
-rw-r--r-- | Modules/Internal/CPack/CPackRPM.cmake | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/Modules/Internal/CPack/CPackRPM.cmake b/Modules/Internal/CPack/CPackRPM.cmake index bece2dd..47d2a5c 100644 --- a/Modules/Internal/CPack/CPackRPM.cmake +++ b/Modules/Internal/CPack/CPackRPM.cmake @@ -1074,6 +1074,21 @@ function(cpack_rpm_generate_package) OUTPUT_STRIP_TRAILING_WHITESPACE) string(REPLACE "\n" ";" RPMBUILD_TAG_LIST "${RPMBUILD_TAG_LIST}") + # In some versions of RPM, weak dependency tags are present in the --querytags + # list, but unsupported by rpmbuild. A different method must be used to check + # if they are supported. + + execute_process( + COMMAND ${RPM_EXECUTABLE} --suggests + ERROR_QUIET + RESULT_VARIABLE RPMBUILD_SUGGESTS_RESULT) + + if(NOT RPMBUILD_SUGGESTS_RESULT EQUAL 0) + foreach(_WEAK_DEP SUGGESTS RECOMMENDS SUPPLEMENTS ENHANCES) + list(REMOVE_ITEM RPMBUILD_TAG_LIST ${_WEAK_DEP}) + endforeach() + endif() + if(CPACK_RPM_PACKAGE_EPOCH) set(TMP_RPM_EPOCH "Epoch: ${CPACK_RPM_PACKAGE_EPOCH}") endif() |