diff options
| author | Brad King <brad.king@kitware.com> | 2016-06-22 12:53:02 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-06-22 12:53:02 (GMT) |
| commit | ed59f4ba677b2135f506844c3040adf518c59ff0 (patch) | |
| tree | f5001734177cd37d2ff9022df6da104abc1f7f5b | |
| parent | 110270fbb6f8b9a679adac4dc80fc486e2de35f1 (diff) | |
| parent | 867b73e27554d9a6a0c33e76af4a06901504816f (diff) | |
| download | CMake-ed59f4ba677b2135f506844c3040adf518c59ff0.zip CMake-ed59f4ba677b2135f506844c3040adf518c59ff0.tar.gz CMake-ed59f4ba677b2135f506844c3040adf518c59ff0.tar.bz2 | |
Merge topic 'GetPrerequisites-findstr'
867b73e2 GetPrerequisites: Optimize on Windows by filtering `objdump` output
| -rw-r--r-- | Modules/GetPrerequisites.cmake | 6 |
1 files changed, 5 insertions, 1 deletions
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() |