Kitware/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2025-10-17 07:11:52 +08:00
Code Issues Projects Releases Wiki Activity

file(GET_RUNTIME_DEPENDENCIES): Use cmSystemTools::GetLineFromStream()

Browse Source 
Fixes: #22278
This commit is contained in:
Kyle Edwards
2021-06-07 15:35:12 -04:00
parent 8732749ef4
commit 100d3cb392
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Source/cmBinUtilsWindowsPEObjdumpGetRuntimeDependenciesTool.cxx
View File

@@ -8,6 +8,7 @@
#include <cmsys/RegularExpression.hxx> #include <cmsys/RegularExpression.hxx>
#include "cmRuntimeDependencyArchive.h" #include "cmRuntimeDependencyArchive.h"
#include "cmSystemTools.h"
#include "cmUVProcessChain.h" #include "cmUVProcessChain.h"
cmBinUtilsWindowsPEObjdumpGetRuntimeDependenciesTool:: cmBinUtilsWindowsPEObjdumpGetRuntimeDependenciesTool::
@@ -42,8 +43,8 @@ bool cmBinUtilsWindowsPEObjdumpGetRuntimeDependenciesTool::GetFileInfo(
std::string line; std::string line;
static const cmsys::RegularExpression regex( static const cmsys::RegularExpression regex(
"^\t*DLL Name: ([^\n]*\\.[Dd][Ll][Ll])\r$"); "^\t*DLL Name: ([^\n]*\\.[Dd][Ll][Ll])$");
while (std::getline(*process.OutputStream(), line)) { while (cmSystemTools::GetLineFromStream(*process.OutputStream(), line)) {
cmsys::RegularExpressionMatch match; cmsys::RegularExpressionMatch match;
if (regex.find(line.c_str(), match)) { if (regex.find(line.c_str(), match)) {
needed.push_back(match.match(1)); needed.push_back(match.match(1));