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 /Modules/GetPrerequisites.cmake | |
| 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 'Modules/GetPrerequisites.cmake')
| -rw-r--r-- | Modules/GetPrerequisites.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/GetPrerequisites.cmake b/Modules/GetPrerequisites.cmake index f325cfb..ed5c38b 100644 --- a/Modules/GetPrerequisites.cmake +++ b/Modules/GetPrerequisites.cmake @@ -736,7 +736,7 @@ function(get_prerequisites target prerequisites_var exclude_system recurse exepa set(gp_regex_cmp_count 1) elseif(gp_tool MATCHES "otool$") set(gp_cmd_args "-L") - set(gp_regex "^\t([^\t]+) \\(compatibility version ([0-9]+.[0-9]+.[0-9]+), current version ([0-9]+.[0-9]+.[0-9]+)\\)${eol_char}$") + set(gp_regex "^\t([^\t]+) \\(compatibility version ([0-9]+.[0-9]+.[0-9]+), current version ([0-9]+.[0-9]+.[0-9]+)(, weak)?\\)${eol_char}$") set(gp_regex_error "") set(gp_regex_fallback "") set(gp_regex_cmp_count 3) |