Merge topic 'cpack_rpm_component_fall_through'
be089724 CPack/RPM prevent component attributes leakage ffc1b945 CPack/RPM improved component override test
This commit is contained in:
commit
4faa4c60ce
File diff suppressed because it is too large
Load Diff
@ -22,12 +22,12 @@ if(CPACK_GENERATOR MATCHES "RPM")
|
||||
# test cross-built rpm
|
||||
set(CPACK_RPM_applications_PACKAGE_ARCHITECTURE "armv7hf")
|
||||
|
||||
# test package summary override
|
||||
# test package summary override - headers rpm is generated in the middle
|
||||
set(CPACK_RPM_PACKAGE_SUMMARY "default summary")
|
||||
set(CPACK_RPM_libraries_PACKAGE_SUMMARY "libraries summary")
|
||||
set(CPACK_RPM_headers_PACKAGE_SUMMARY "headers summary")
|
||||
|
||||
# test package description override
|
||||
set(CPACK_RPM_libraries_PACKAGE_DESCRIPTION "libraries description")
|
||||
# test package description override - headers rpm is generated in the middle
|
||||
set(CPACK_RPM_headers_PACKAGE_DESCRIPTION "headers description")
|
||||
endif()
|
||||
|
||||
if(CPACK_GENERATOR MATCHES "DEB")
|
||||
|
@ -132,12 +132,12 @@ if(CPackGen MATCHES "RPM")
|
||||
endif()
|
||||
|
||||
set(CPACK_RPM_PACKAGE_SUMMARY "default summary")
|
||||
set(CPACK_RPM_libraries_PACKAGE_SUMMARY "libraries summary")
|
||||
set(CPACK_RPM_libraries_PACKAGE_DESCRIPTION "libraries description")
|
||||
set(CPACK_RPM_headers_PACKAGE_SUMMARY "headers summary")
|
||||
set(CPACK_RPM_headers_PACKAGE_DESCRIPTION "headers description")
|
||||
set(CPACK_COMPONENT_APPLICATIONS_DESCRIPTION
|
||||
"An extremely useful application that makes use of MyLib")
|
||||
set(CPACK_COMPONENT_HEADERS_DESCRIPTION
|
||||
"C/C\\+\\+ header files for use with MyLib")
|
||||
set(CPACK_COMPONENT_LIBRARIES_DESCRIPTION
|
||||
"Static libraries used to build programs with MyLib")
|
||||
|
||||
# test package info
|
||||
if(${CPackComponentWay} STREQUAL "IgnoreGroup")
|
||||
@ -172,15 +172,15 @@ if(CPackGen MATCHES "RPM")
|
||||
set(whitespaces "[\\t\\n\\r ]*")
|
||||
|
||||
if(check_file_libraries_match)
|
||||
set(check_file_match_expected_summary ".*${CPACK_RPM_libraries_PACKAGE_SUMMARY}.*")
|
||||
set(check_file_match_expected_description ".*${CPACK_RPM_libraries_PACKAGE_DESCRIPTION}.*")
|
||||
set(check_file_match_expected_summary ".*${CPACK_RPM_PACKAGE_SUMMARY}.*")
|
||||
set(check_file_match_expected_description ".*${CPACK_COMPONENT_LIBRARIES_DESCRIPTION}.*")
|
||||
set(check_file_match_expected_relocation_path "Relocations${whitespaces}:${whitespaces}${CPACK_PACKAGING_INSTALL_PREFIX}${whitespaces}${CPACK_PACKAGING_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
|
||||
set(check_file_match_expected_architecture "") # we don't explicitly set this value so it is different on each platform - ignore it
|
||||
set(spec_regex "*libraries*")
|
||||
set(check_content_list "^/usr/foo/bar\n/usr/foo/bar/lib.*\n/usr/foo/bar/lib.*/libmylib.a$")
|
||||
elseif(check_file_headers_match)
|
||||
set(check_file_match_expected_summary ".*${CPACK_RPM_PACKAGE_SUMMARY}.*")
|
||||
set(check_file_match_expected_description ".*${CPACK_COMPONENT_HEADERS_DESCRIPTION}.*")
|
||||
set(check_file_match_expected_summary ".*${CPACK_RPM_headers_PACKAGE_SUMMARY}.*")
|
||||
set(check_file_match_expected_description ".*${CPACK_RPM_headers_PACKAGE_DESCRIPTION}.*")
|
||||
set(check_file_match_expected_relocation_path "Relocations${whitespaces}:${whitespaces}${CPACK_PACKAGING_INSTALL_PREFIX}${whitespaces}${CPACK_PACKAGING_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}")
|
||||
set(check_file_match_expected_architecture "noarch")
|
||||
set(spec_regex "*headers*")
|
||||
|
Loading…
x
Reference in New Issue
Block a user