diff options
| author | Brad King <brad.king@kitware.com> | 2021-06-11 10:10:29 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-06-11 10:10:34 (GMT) |
| commit | 15b1d5ab9cdb8cafe74d0a30ca46d6a06e1838b7 (patch) | |
| tree | 1539761ed59663e710b394b74f639d2e8c01a94c /Tests/CPackComponentsForAll | |
| parent | 557e47f1544796332bf27a73669a429725adac29 (diff) | |
| parent | 369725faa5e410ca5fdc51c84e4f11af73b13ade (diff) | |
| download | CMake-15b1d5ab9cdb8cafe74d0a30ca46d6a06e1838b7.zip CMake-15b1d5ab9cdb8cafe74d0a30ca46d6a06e1838b7.tar.gz CMake-15b1d5ab9cdb8cafe74d0a30ca46d6a06e1838b7.tar.bz2 | |
Merge topic 'ci-rpm'
369725faa5 gitlab-ci: add job to run CPack RPM tests
1186ed64d0 ci: add rpm-build to Fedora base image
60380bd77c Tests: Fix RunCMake.CPack_RPM.DEBUGINFO test case
5130ff6878 Tests: Fix CPackComponentsForAll-RPM-IgnoreGroup test on Fedora 34
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !6214
Diffstat (limited to 'Tests/CPackComponentsForAll')
| -rw-r--r-- | Tests/CPackComponentsForAll/MyLibCPackConfig-IgnoreGroup.cmake.in | 2 | ||||
| -rw-r--r-- | Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Tests/CPackComponentsForAll/MyLibCPackConfig-IgnoreGroup.cmake.in b/Tests/CPackComponentsForAll/MyLibCPackConfig-IgnoreGroup.cmake.in index a6f6ea9..1105cb8 100644 --- a/Tests/CPackComponentsForAll/MyLibCPackConfig-IgnoreGroup.cmake.in +++ b/Tests/CPackComponentsForAll/MyLibCPackConfig-IgnoreGroup.cmake.in @@ -20,7 +20,7 @@ if(CPACK_GENERATOR MATCHES "RPM") set(CPACK_RPM_HEADERS_PACKAGE_ARCHITECTURE "noarch") # test cross-built rpm - set(CPACK_RPM_APPLICATIONS_PACKAGE_ARCHITECTURE "armv7hf") + set(CPACK_RPM_APPLICATIONS_PACKAGE_ARCHITECTURE "armv7hl") # test package summary override - headers rpm is generated in the middle set(CPACK_RPM_PACKAGE_SUMMARY "default summary") diff --git a/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake b/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake index 3e1c13d..260a0f8 100644 --- a/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake +++ b/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake @@ -270,7 +270,7 @@ if(CPackGen MATCHES "RPM") set(check_file_match_expected_summary ".*${CPACK_RPM_PACKAGE_SUMMARY}.*") set(check_file_match_expected_description ".*${CPACK_COMPONENT_APPLICATIONS_DESCRIPTION}.*") set(check_file_match_expected_relocation_path "Relocations${whitespaces}:${whitespaces}${CPACK_PACKAGING_INSTALL_PREFIX}${whitespaces}${CPACK_PACKAGING_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}") - set(check_file_match_expected_architecture "armv7hf") + set(check_file_match_expected_architecture "armv7hl") set(spec_regex "*applications*") set(check_content_list "^/usr/foo/bar /usr/foo/bar/bin |