diff options
| author | Brad King <brad.king@kitware.com> | 2021-01-21 14:16:30 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-01-21 14:16:37 (GMT) |
| commit | 6bf23b2755e4c9ee57210e6c544f7902fcab9dae (patch) | |
| tree | 6b26b7491a782fd54eab4e37d5fd25fb2b2575db /Source | |
| parent | d1549824c909ffd69d6bed9eaf5795b46f14df7d (diff) | |
| parent | 7e615a540ea346716ba3d94b4bcecb35c42d5107 (diff) | |
| download | CMake-6bf23b2755e4c9ee57210e6c544f7902fcab9dae.zip CMake-6bf23b2755e4c9ee57210e6c544f7902fcab9dae.tar.gz CMake-6bf23b2755e4c9ee57210e6c544f7902fcab9dae.tar.bz2 | |
Merge topic 'macos-include-weak-dependencies'
7e615a540e file(GET_RUNTIME_DEPENDENCIES): Fix weak macOS libraries not detected
f2d92b983b GetPrerequisites: Include weak macOS dependencies
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5703
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmBinUtilsMacOSMachOOToolGetRuntimeDependenciesTool.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/cmBinUtilsMacOSMachOOToolGetRuntimeDependenciesTool.cxx b/Source/cmBinUtilsMacOSMachOOToolGetRuntimeDependenciesTool.cxx index 351d92a..6d97720 100644 --- a/Source/cmBinUtilsMacOSMachOOToolGetRuntimeDependenciesTool.cxx +++ b/Source/cmBinUtilsMacOSMachOOToolGetRuntimeDependenciesTool.cxx @@ -44,7 +44,7 @@ bool cmBinUtilsMacOSMachOOToolGetRuntimeDependenciesTool::GetFileInfo( std::string line; static const cmsys::RegularExpression rpathRegex("^ *cmd LC_RPATH$"); static const cmsys::RegularExpression loadDylibRegex( - "^ *cmd LC_LOAD_DYLIB$"); + "^ *cmd LC_LOAD(_WEAK)?_DYLIB$"); static const cmsys::RegularExpression pathRegex( "^ *path (.*) \\(offset [0-9]+\\)$"); static const cmsys::RegularExpression nameRegex( |