Merge topic 'GetPrerequisites-grep-a'

5f3c8f6a GetPrerequisites: Always filter objdump output as text
This commit is contained in:
Brad King 2016-08-09 09:20:18 -04:00 committed by CMake Topic Stage
commit a5b73e719a

View File

@ -753,7 +753,7 @@ function(get_prerequisites target prerequisites_var exclude_system recurse exepa
find_program(gp_grep_cmd grep) find_program(gp_grep_cmd grep)
endif() endif()
if(gp_grep_cmd) if(gp_grep_cmd)
set(gp_cmd_maybe_filter COMMAND ${gp_grep_cmd} "^[[:blank:]]*DLL Name: ") set(gp_cmd_maybe_filter COMMAND ${gp_grep_cmd} "-a" "^[[:blank:]]*DLL Name: ")
endif() endif()
else() else()
message(STATUS "warning: gp_tool='${gp_tool}' is an unknown tool...") message(STATUS "warning: gp_tool='${gp_tool}' is an unknown tool...")