diff options
| author | Brad King <brad.king@kitware.com> | 2023-06-15 13:27:37 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2023-06-15 13:27:42 (GMT) |
| commit | a84c99694745b57cd570c33ea46d68b0a917aace (patch) | |
| tree | 70b3986cc3b1efc39501becb1f2d3b7a7a0b78e2 /Source/cmBinUtilsLinuxELFObjdumpGetRuntimeDependenciesTool.cxx | |
| parent | 0b62dede642dcb4b961b2459a2cb2480c5fc432a (diff) | |
| parent | b65d54e87694efb4962cd37348aec0ba598e5d4e (diff) | |
| download | CMake-a84c99694745b57cd570c33ea46d68b0a917aace.zip CMake-a84c99694745b57cd570c33ea46d68b0a917aace.tar.gz CMake-a84c99694745b57cd570c33ea46d68b0a917aace.tar.bz2 | |
Merge topic 'cmuvprocesschain-external-stream-fd'
b65d54e876 cmUVStreambuf: Update URL for example code
0878306386 cmUVStream: Add cmUVStreamRead() function
b8fd273ed7 cmUVProcessChain: Return output and error streams as file descriptors
ec81d40be4 cmUVPipeIStream: Add cmUVPipeIStream
3b6c5efc08 cm::append: Add support for std::basic_string on SPARC/SunPro
Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !8559
Diffstat (limited to 'Source/cmBinUtilsLinuxELFObjdumpGetRuntimeDependenciesTool.cxx')
| -rw-r--r-- | Source/cmBinUtilsLinuxELFObjdumpGetRuntimeDependenciesTool.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Source/cmBinUtilsLinuxELFObjdumpGetRuntimeDependenciesTool.cxx b/Source/cmBinUtilsLinuxELFObjdumpGetRuntimeDependenciesTool.cxx index c5c41e0..8043f82 100644 --- a/Source/cmBinUtilsLinuxELFObjdumpGetRuntimeDependenciesTool.cxx +++ b/Source/cmBinUtilsLinuxELFObjdumpGetRuntimeDependenciesTool.cxx @@ -10,6 +10,7 @@ #include "cmRuntimeDependencyArchive.h" #include "cmSystemTools.h" #include "cmUVProcessChain.h" +#include "cmUVStream.h" cmBinUtilsLinuxELFObjdumpGetRuntimeDependenciesTool:: cmBinUtilsLinuxELFObjdumpGetRuntimeDependenciesTool( @@ -46,7 +47,8 @@ bool cmBinUtilsLinuxELFObjdumpGetRuntimeDependenciesTool::GetFileInfo( static const cmsys::RegularExpression neededRegex("^ *NEEDED *([^\n]*)$"); static const cmsys::RegularExpression rpathRegex("^ *RPATH *([^\n]*)$"); static const cmsys::RegularExpression runpathRegex("^ *RUNPATH *([^\n]*)$"); - while (std::getline(*process.OutputStream(), line)) { + cmUVPipeIStream output(process.GetLoop(), process.OutputStream()); + while (std::getline(output, line)) { cmsys::RegularExpressionMatch match; if (neededRegex.find(line.c_str(), match)) { needed.push_back(match.match(1)); |