diff options
| author | Brad King <brad.king@kitware.com> | 2021-06-08 12:07:20 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-06-08 12:07:34 (GMT) |
| commit | 3653dc60690e6fc33d9e7bf44186b82587cf21a7 (patch) | |
| tree | 89bf14d9179fdc4184488f41a1d85a1aa02b9162 /Source | |
| parent | df1398aa9777f1e04d8dc8022ffc594b3dd7f458 (diff) | |
| parent | 100d3cb392679f2531ede8e3f3e944b13124cfda (diff) | |
| download | CMake-3653dc60690e6fc33d9e7bf44186b82587cf21a7.zip CMake-3653dc60690e6fc33d9e7bf44186b82587cf21a7.tar.gz CMake-3653dc60690e6fc33d9e7bf44186b82587cf21a7.tar.bz2 | |
Merge topic 'grd-win-objdump-newline'
100d3cb392 file(GET_RUNTIME_DEPENDENCIES): Use cmSystemTools::GetLineFromStream()
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Brad King <brad.king@kitware.com>
Merge-request: !6198
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmBinUtilsWindowsPEObjdumpGetRuntimeDependenciesTool.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Source/cmBinUtilsWindowsPEObjdumpGetRuntimeDependenciesTool.cxx b/Source/cmBinUtilsWindowsPEObjdumpGetRuntimeDependenciesTool.cxx index 1effda0..f14de55 100644 --- a/Source/cmBinUtilsWindowsPEObjdumpGetRuntimeDependenciesTool.cxx +++ b/Source/cmBinUtilsWindowsPEObjdumpGetRuntimeDependenciesTool.cxx @@ -8,6 +8,7 @@ #include <cmsys/RegularExpression.hxx> #include "cmRuntimeDependencyArchive.h" +#include "cmSystemTools.h" #include "cmUVProcessChain.h" cmBinUtilsWindowsPEObjdumpGetRuntimeDependenciesTool:: @@ -42,8 +43,8 @@ bool cmBinUtilsWindowsPEObjdumpGetRuntimeDependenciesTool::GetFileInfo( std::string line; static const cmsys::RegularExpression regex( - "^\t*DLL Name: ([^\n]*\\.[Dd][Ll][Ll])\r$"); - while (std::getline(*process.OutputStream(), line)) { + "^\t*DLL Name: ([^\n]*\\.[Dd][Ll][Ll])$"); + while (cmSystemTools::GetLineFromStream(*process.OutputStream(), line)) { cmsys::RegularExpressionMatch match; if (regex.find(line.c_str(), match)) { needed.push_back(match.match(1)); |