summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2019-08-23 14:09:30 (GMT)
committerKitware Robot <kwrobot@kitware.com>2019-08-23 14:11:47 (GMT)
commit19612dffd27d90d73e3b7cff9cbba241294c17e9 (patch)
tree346600681a06d209bf579654c492fd7966821556
parent2624dd0d46abc2b56110d354fb50a087483385a3 (diff)
parent3bb74534360766701ec0c8bd1160594f3f075dd9 (diff)
downloadCMake-19612dffd27d90d73e3b7cff9cbba241294c17e9.zip
CMake-19612dffd27d90d73e3b7cff9cbba241294c17e9.tar.gz
CMake-19612dffd27d90d73e3b7cff9cbba241294c17e9.tar.bz2
Merge topic 'solaris-ldd'
3bb7453436 GetPrerequisites: match ldd output on Solaris Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3695
-rw-r--r--Modules/GetPrerequisites.cmake2
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/GetPrerequisites.cmake b/Modules/GetPrerequisites.cmake
index 2beea00..57ae446 100644
--- a/Modules/GetPrerequisites.cmake
+++ b/Modules/GetPrerequisites.cmake
@@ -729,7 +729,7 @@ function(get_prerequisites target prerequisites_var exclude_system recurse exepa
if(gp_tool MATCHES "ldd$")
set(gp_cmd_args "")
- set(gp_regex "^[\t ]*[^\t ]+ => ([^\t\(]+) .*${eol_char}$")
+ set(gp_regex "^[\t ]*[^\t ]+ =>[\t ]+([^\t\(]+)( \(.+\))?${eol_char}$")
set(gp_regex_error "not found${eol_char}$")
set(gp_regex_fallback "^[\t ]*([^\t ]+) => ([^\t ]+).*${eol_char}$")
set(gp_regex_cmp_count 1)