mirrors/cmake
2
0
Fork 0
mirror of https://gitlab.kitware.com/cmake/cmake.git synced 2026-09-27 04:09:36 +03:00
Code Activity

GET_RUNTIME_DEPENDENCIES: Allow more whitespace before objdump's "DLL Name:"

Browse Source 
LLVM's `llvm-objdump` has spaces before "DLL Name:" instead of tabs.
This commit is contained in:
Adrian Pop
2024-03-10 11:03:21 -04:00
committed by Brad King
parent 5c3512333c
commit c51f84b96a
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Modules/GetPrerequisites.cmake
+1 -1
View File
@@ -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)
Source/cmBinUtilsWindowsPEObjdumpGetRuntimeDependenciesTool.cxx
+1 -1
View File
@@ -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;