summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2016-08-09 13:20:18 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2016-08-09 13:20:18 (GMT)
commita5b73e719a744a75be6ccf149360b14aaebbb273 (patch)
treeafe9482b47f0f8ac6c134a8540b02ab671600ed2
parenta8c819659be76426804abc28bb6221a2dc3bf333 (diff)
parent5f3c8f6ab2c6633bdbfc083b9e96b477c1700c80 (diff)
downloadCMake-a5b73e719a744a75be6ccf149360b14aaebbb273.zip
CMake-a5b73e719a744a75be6ccf149360b14aaebbb273.tar.gz
CMake-a5b73e719a744a75be6ccf149360b14aaebbb273.tar.bz2
Merge topic 'GetPrerequisites-grep-a'
5f3c8f6a GetPrerequisites: Always filter objdump output as text
-rw-r--r--Modules/GetPrerequisites.cmake2
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/GetPrerequisites.cmake b/Modules/GetPrerequisites.cmake
index 322cbd3..2881e7f 100644
--- a/Modules/GetPrerequisites.cmake
+++ b/Modules/GetPrerequisites.cmake
@@ -753,7 +753,7 @@ function(get_prerequisites target prerequisites_var exclude_system recurse exepa
find_program(gp_grep_cmd grep)
endif()
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()
else()
message(STATUS "warning: gp_tool='${gp_tool}' is an unknown tool...")