This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, master has been updated
via 19612dffd27d90d73e3b7cff9cbba241294c17e9 (commit)
via 3bb74534360766701ec0c8bd1160594f3f075dd9 (commit)
from 2624dd0d46abc2b56110d354fb50a087483385a3 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=19612dffd27d90d73e3b7cff9cbba241294c17e9
commit 19612dffd27d90d73e3b7cff9cbba241294c17e9
Merge: 2624dd0 3bb7453
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Fri Aug 23 14:09:30 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Fri Aug 23 10:11:47 2019 -0400
Merge topic 'solaris-ldd'
3bb7453436 GetPrerequisites: match ldd output on Solaris
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !3695
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3bb74534360766701ec0c8bd1160594f3f075dd9
commit 3bb74534360766701ec0c8bd1160594f3f075dd9
Author: Jon Chronopoulos <patc...@crondog.com>
AuthorDate: Sun Aug 11 19:46:29 2019 +1000
Commit: Jon Chronopoulos <patc...@crondog.com>
CommitDate: Wed Aug 21 17:25:28 2019 +1000
GetPrerequisites: match ldd output on Solaris
Solaris output is the following:
```
$ ldd /lib/libxml2.so
libz.so.1 => /lib/libz.so.1
libm.so.2 => /lib/libm.so.2
libc.so.1 => /lib/libc.so.1
```
While on Linux
```
$ ldd /usr/lib/libxml2.so
linux-vdso.so.1 (0x00007ffe02bbe000)
libdl.so.2 => /usr/lib/libdl.so.2 (0x00007f03ab852000)
libicuuc.so.64 => /usr/lib/libicuuc.so.64 (0x00007f03ab67a000)
libz.so.1 => /usr/lib/libz.so.1 (0x00007f03ab463000)
liblzma.so.5 => /usr/lib/liblzma.so.5 (0x00007f03ab23d000)
libm.so.6 => /usr/lib/libm.so.6 (0x00007f03ab0f7000)
libc.so.6 => /usr/lib/libc.so.6 (0x00007f03aaf34000)
/usr/lib64/ld-linux-x86-64.so.2 (0x00007f03ab9fd000)
libicudata.so.64 => /usr/lib/libicudata.so.64 (0x00007f03a94ee000)
libpthread.so.0 => /usr/lib/libpthread.so.0 (0x00007f03a94cd000)
libstdc++.so.6 => /usr/lib/libstdc++.so.6 (0x00007f03a92e5000)
libgcc_s.so.1 => /usr/lib/libgcc_s.so.1 (0x00007f03a92cb000)
```
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)
-----------------------------------------------------------------------
Summary of changes:
Modules/GetPrerequisites.cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
https://cmake.org/mailman/listinfo/cmake-commits
