From c51f84b96a649bf039fa05adfeb4d455ac67ed17 Mon Sep 17 00:00:00 2001 From: Adrian Pop Date: Sun, 10 Mar 2024 01:34:20 +0100 Subject: GET_RUNTIME_DEPENDENCIES: Allow more whitespace before objdump's "DLL Name:" LLVM's `llvm-objdump` has spaces before "DLL Name:" instead of tabs. --- Modules/GetPrerequisites.cmake | 2 +- Source/cmBinUtilsWindowsPEObjdumpGetRuntimeDependenciesTool.cxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Modules/GetPrerequisites.cmake b/Modules/GetPrerequisites.cmake index d55c4ca..b77f650 100644 --- a/Modules/GetPrerequisites.cmake +++ b/Modules/GetPrerequisites.cmake @@ -748,7 +748,7 @@ function(get_prerequisites target prerequisites_var exclude_system recurse exepa set(gp_regex_cmp_count 1) elseif(gp_tool MATCHES "objdump(\\.exe)?$") set(gp_cmd_args "-p") - set(gp_regex "^\t*DLL Name: (.*\\.[Dd][Ll][Ll])${eol_char}$") + set(gp_regex "^[\t ]*DLL Name: (.*\\.[Dd][Ll][Ll])${eol_char}$") set(gp_regex_error "") set(gp_regex_fallback "") set(gp_regex_cmp_count 1) diff --git a/Source/cmBinUtilsWindowsPEObjdumpGetRuntimeDependenciesTool.cxx b/Source/cmBinUtilsWindowsPEObjdumpGetRuntimeDependenciesTool.cxx index d95da95..d54aa7d 100644 --- a/Source/cmBinUtilsWindowsPEObjdumpGetRuntimeDependenciesTool.cxx +++ b/Source/cmBinUtilsWindowsPEObjdumpGetRuntimeDependenciesTool.cxx @@ -44,7 +44,7 @@ bool cmBinUtilsWindowsPEObjdumpGetRuntimeDependenciesTool::GetFileInfo( std::string line; static const cmsys::RegularExpression regex( - "^\t*DLL Name: ([^\n]*\\.[Dd][Ll][Ll])$"); + "^[\t ]*DLL Name: ([^\n]*\\.[Dd][Ll][Ll])$"); cmUVPipeIStream output(process.GetLoop(), process.OutputStream()); while (cmSystemTools::GetLineFromStream(output, line)) { cmsys::RegularExpressionMatch match; -- cgit v0.12