diff options
| author | Brad King <brad.king@kitware.com> | 2022-03-25 13:45:28 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2022-03-25 13:45:34 (GMT) |
| commit | 04e2dc914458b4379aaed522921a85229ef87d48 (patch) | |
| tree | 350d43fedbef5d2f56a2d3fc6ac63f13c4dab151 | |
| parent | 18b02cc127730e3b007c2b56c6e115d476f0d5e0 (diff) | |
| parent | ef2fa9b03bdd468f291109d5e198d6fb7dc3b732 (diff) | |
| download | CMake-04e2dc914458b4379aaed522921a85229ef87d48.zip CMake-04e2dc914458b4379aaed522921a85229ef87d48.tar.gz CMake-04e2dc914458b4379aaed522921a85229ef87d48.tar.bz2 | |
Merge topic 'GetPrerequisties-win-findstr' into release-3.23
ef2fa9b03b GetPrerequisties: pass "-a" only to grep.
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7110
| -rw-r--r-- | Modules/GetPrerequisites.cmake | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Modules/GetPrerequisites.cmake b/Modules/GetPrerequisites.cmake index 53584c6..0ba35b6 100644 --- a/Modules/GetPrerequisites.cmake +++ b/Modules/GetPrerequisites.cmake @@ -755,11 +755,13 @@ function(get_prerequisites target prerequisites_var exclude_system recurse exepa # objdump generates copious output so we create a grep filter to pre-filter results if(WIN32) find_program(gp_grep_cmd findstr) + set(gp_grep_cmd_arg "") else() find_program(gp_grep_cmd grep) + set(gp_grep_cmd_arg "-a") endif() if(gp_grep_cmd) - set(gp_cmd_maybe_filter COMMAND ${gp_grep_cmd} "-a" "^[[:blank:]]*DLL Name: ") + set(gp_cmd_maybe_filter COMMAND ${gp_grep_cmd} "${gp_grep_cmd_arg}" "^[[:blank:]]*DLL Name: ") endif() else() message(STATUS "warning: gp_tool='${gp_tool}' is an unknown tool...") |