diff options
| author | Domen Vrankar <domen.vrankar@gmail.com> | 2015-02-26 23:33:48 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-02-27 13:37:24 (GMT) |
| commit | 1cbb15625304b01e8a99a956fa42e4b7011fea48 (patch) | |
| tree | 9653f71ef5c96b4b344ace4fb8612b29be0ca0ae /Tests/CPackComponentsForAll/MyLibCPackConfig-IgnoreGroup.cmake.in | |
| parent | be36bfd65d53962c7ba975382bd911e0857f6a33 (diff) | |
| download | CMake-1cbb15625304b01e8a99a956fa42e4b7011fea48.zip CMake-1cbb15625304b01e8a99a956fa42e4b7011fea48.tar.gz CMake-1cbb15625304b01e8a99a956fa42e4b7011fea48.tar.bz2 | |
CPackRPM: Fix handling of relocation prefix parent directories
In commit 3ec02547 (CPackRPM: Allow multiple path relocation prefixes
for one package, 2015-01-21) a regression was introduced that causes
parent directories of relocation paths to be incorrectly included in
the rpm. Fix this and make the test case more strict to cover it.
Diffstat (limited to 'Tests/CPackComponentsForAll/MyLibCPackConfig-IgnoreGroup.cmake.in')
| -rw-r--r-- | Tests/CPackComponentsForAll/MyLibCPackConfig-IgnoreGroup.cmake.in | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/Tests/CPackComponentsForAll/MyLibCPackConfig-IgnoreGroup.cmake.in b/Tests/CPackComponentsForAll/MyLibCPackConfig-IgnoreGroup.cmake.in index de0ee46..e20f11a 100644 --- a/Tests/CPackComponentsForAll/MyLibCPackConfig-IgnoreGroup.cmake.in +++ b/Tests/CPackComponentsForAll/MyLibCPackConfig-IgnoreGroup.cmake.in @@ -6,9 +6,14 @@ if(CPACK_GENERATOR MATCHES "ZIP") endif() if(CPACK_GENERATOR MATCHES "RPM") - set(CPACK_PACKAGING_INSTALL_PREFIX "/usr") - set(CPACK_RPM_COMPONENT_INSTALL "ON") + + # test that /usr and /usr/foo get omitted in relocatable + # rpms as shortest relocation path is treated as base of + # package (/usr/foo/bar is relocatable and must exist) + set(CPACK_PACKAGING_INSTALL_PREFIX "/usr/foo/bar") + + # test requires set(CPACK_RPM_applications_PACKAGE_REQUIRES "mylib-libraries") # test package summary override |