summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2023-10-31 18:15:18 (GMT)
committerBrad King <brad.king@kitware.com>2023-10-31 18:15:29 (GMT)
commit139df0bc2fadf14c001a4dcc19585826ae653cd6 (patch)
tree7cea25d5af9a7700b3077408eea9059e46339f3f
parentaa7f1416f901c43023a0c7d95db54e9498df7627 (diff)
downloadCMake-139df0bc2fadf14c001a4dcc19585826ae653cd6.zip
CMake-139df0bc2fadf14c001a4dcc19585826ae653cd6.tar.gz
CMake-139df0bc2fadf14c001a4dcc19585826ae653cd6.tar.bz2
GetPrerequisites: Revert "Ignore relative paths printed by ldd"
Revert commit cf2ad9995a (GetPrerequisites: Ignore relative paths printed by ldd, 2023-02-20, v3.27.0-rc1~459^2) because it regressed existing use cases. We will need to find another solution to the use case motivating the change. Fixes: #25372
-rw-r--r--Modules/GetPrerequisites.cmake2
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/GetPrerequisites.cmake b/Modules/GetPrerequisites.cmake
index 0cd49ab..0ba35b6 100644
--- a/Modules/GetPrerequisites.cmake
+++ b/Modules/GetPrerequisites.cmake
@@ -730,7 +730,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 ]+(/[^\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)