[Cmake-commits] CMake branch, next, updated. v3.6.0-rc2-477-g726ec69

[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  726ec69c205b49f265066664dca65645c04bcbb8 (commit)
       via  867b73e27554d9a6a0c33e76af4a06901504816f (commit)
      from  4835cb445ad64ee3ae9cc39dd87522446ff20e54 (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=726ec69c205b49f265066664dca65645c04bcbb8
commit 726ec69c205b49f265066664dca65645c04bcbb8
Merge: 4835cb4 867b73e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jun 21 08:51:05 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jun 21 08:51:05 2016 -0400

    Merge topic 'GetPrerequisites-findstr' into next
    
    867b73e2 GetPrerequisites: Optimize on Windows by filtering `objdump` output


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=867b73e27554d9a6a0c33e76af4a06901504816f
commit 867b73e27554d9a6a0c33e76af4a06901504816f
Author:     Laurent Tarrisse <laurent at mbdsys.com>
AuthorDate: Mon Jun 20 20:35:55 2016 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Jun 21 08:48:09 2016 -0400

    GetPrerequisites: Optimize on Windows by filtering `objdump` output
    
    Extend the optimization from commit v3.4.0-rc1~264^2 (GetPrerequisites:
    Optionally filter "objdump" output for speed, 2015-07-29) to work
    on Windows by using `findstr` in place of `grep`.

diff --git a/Modules/GetPrerequisites.cmake b/Modules/GetPrerequisites.cmake
index 375349f..1981040 100644
--- a/Modules/GetPrerequisites.cmake
+++ b/Modules/GetPrerequisites.cmake
@@ -747,7 +747,11 @@ function(get_prerequisites target prerequisites_var exclude_system recurse exepa
     set(gp_regex_fallback "")
     set(gp_regex_cmp_count 1)
     # objdump generaates copious output so we create a grep filter to pre-filter results
-    find_program(gp_grep_cmd grep)
+    if(WIN32)
+      find_program(gp_grep_cmd findstr)
+    else()
+      find_program(gp_grep_cmd grep)
+    endif()
     if(gp_grep_cmd)
       set(gp_cmd_maybe_filter COMMAND ${gp_grep_cmd} "^[[:blank:]]*DLL Name: ")
     endif()

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

Summary of changes:
 Modules/GetPrerequisites.cmake |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake