diff options
| author | Brad King <brad.king@kitware.com> | 2021-07-13 12:25:13 +0000 |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-07-13 08:25:20 -0400 |
| commit | 460e812369db398da34e14c9d40c3ecec06afaf1 (patch) | |
| tree | f86f7fb2eb25b52b32404659e5b0ecf91f6d216c /Modules/Internal | |
| parent | 3265fa51cd4feec492a157506fff505dbd4c7d37 (diff) | |
| parent | 68b961d36178027faa16dad22ab1637b67144577 (diff) | |
| download | cmake-460e812369db398da34e14c9d40c3ecec06afaf1.tar.gz | |
Merge topic 'cpack-deb-lib-multiarch'
68b961d361 CPack/DEB: Add postinst/postrm ldconfig for multi-arch lib dirs
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6341
Diffstat (limited to 'Modules/Internal')
| -rw-r--r-- | Modules/Internal/CPack/CPackDeb.cmake | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Modules/Internal/CPack/CPackDeb.cmake b/Modules/Internal/CPack/CPackDeb.cmake index 967ad7bc13..c115f003e8 100644 --- a/Modules/Internal/CPack/CPackDeb.cmake +++ b/Modules/Internal/CPack/CPackDeb.cmake @@ -662,10 +662,12 @@ function(cpack_deb_prepare_package_vars) # add ldconfig call in default postrm and postint set(CPACK_ADD_LDCONFIG_CALL 0) + # all files in CPACK_DEB_SHARED_OBJECT_FILES have dot at the beginning + set(_LDCONF_DEFAULTS "./lib" "./usr/lib") foreach(_FILE IN LISTS CPACK_DEB_SHARED_OBJECT_FILES) get_filename_component(_DIR ${_FILE} DIRECTORY) - # all files in CPACK_DEB_SHARED_OBJECT_FILES have dot at the beginning - if(_DIR STREQUAL "./lib" OR _DIR STREQUAL "./usr/lib") + get_filename_component(_PARENT_DIR ${_DIR} DIRECTORY) + if(_DIR IN_LIST _LDCONF_DEFAULTS OR _PARENT_DIR IN_LIST _LDCONF_DEFAULTS) set(CPACK_ADD_LDCONFIG_CALL 1) endif() endforeach() |