[Cmake-commits] CMake branch, next, updated. v3.6.1-1169-gc758d6a

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  c758d6a57f6f8ee85be063b12123560fa4d174c3 (commit)
       via  5f3c8f6ab2c6633bdbfc083b9e96b477c1700c80 (commit)
      from  3e16d885e07a30f644ebc4cf2397bcc1ab0a635a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c758d6a57f6f8ee85be063b12123560fa4d174c3
commit c758d6a57f6f8ee85be063b12123560fa4d174c3
Merge: 3e16d88 5f3c8f6
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Aug 8 14:08:57 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Aug 8 14:08:57 2016 -0400

    Merge topic 'GetPrerequisites-grep-a' into next
    
    5f3c8f6a GetPrerequisites: Always filter objdump output as text


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5f3c8f6ab2c6633bdbfc083b9e96b477c1700c80
commit 5f3c8f6ab2c6633bdbfc083b9e96b477c1700c80
Author:     Alexander Shishenko <alex at shishenko.com>
AuthorDate: Sat Aug 6 17:32:44 2016 +0300
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Aug 8 14:05:21 2016 -0400

    GetPrerequisites: Always filter objdump output as text
    
    When using `grep` to filter the output, add the `-a` flag to tell
    it never to treat the output as binary.  Otherwise when LANG != C
    in the environment the non-ascii text may break the filter.

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...")

-----------------------------------------------------------------------

Summary of changes:
 Modules/GetPrerequisites.cmake |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake