diff options
| author | Brad King <brad.king@kitware.com> | 2024-03-11 14:15:00 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2024-03-11 14:15:16 (GMT) |
| commit | d914c76d63e6cdb8f16fd57747933eece6b6e91c (patch) | |
| tree | 9d7f32e34300b49fd0ac50efe2aec0b41ac96923 | |
| parent | a22245a97f89ac28b0c554767ff4912342c3c5a5 (diff) | |
| parent | c51f84b96a649bf039fa05adfeb4d455ac67ed17 (diff) | |
| download | CMake-d914c76d63e6cdb8f16fd57747933eece6b6e91c.zip CMake-d914c76d63e6cdb8f16fd57747933eece6b6e91c.tar.gz CMake-d914c76d63e6cdb8f16fd57747933eece6b6e91c.tar.bz2 | |
Merge topic 'llvm-objdump' into release-3.29
c51f84b96a GET_RUNTIME_DEPENDENCIES: Allow more whitespace before objdump's "DLL Name:"
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9325
| -rw-r--r-- | Modules/GetPrerequisites.cmake | 2 | ||||
| -rw-r--r-- | 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; |