diff options
| author | Brad King <brad.king@kitware.com> | 2016-05-12 13:28:31 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-05-12 13:28:31 (GMT) |
| commit | 4cc32ad538bbb9169e31f275658d40542a56a0bd (patch) | |
| tree | 87c93a45e2b7005c7ffa5cc7f0623d31804e4f40 | |
| parent | 11eba2ecd57ad08f700f3902c60ff82cd2f9d6a6 (diff) | |
| parent | 25845b10d8ef2ded79fadf7eb924609ff0b142ae (diff) | |
| download | CMake-4cc32ad538bbb9169e31f275658d40542a56a0bd.zip CMake-4cc32ad538bbb9169e31f275658d40542a56a0bd.tar.gz CMake-4cc32ad538bbb9169e31f275658d40542a56a0bd.tar.bz2 | |
Merge topic 'pathscale-implicit-link-info'
25845b10 CMakeParseImplicitLinkInfo: Exclude pathcc ldfe lines (#16100)
| -rw-r--r-- | Modules/CMakeParseImplicitLinkInfo.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/CMakeParseImplicitLinkInfo.cmake b/Modules/CMakeParseImplicitLinkInfo.cmake index 59092bd..ef9a2eb 100644 --- a/Modules/CMakeParseImplicitLinkInfo.cmake +++ b/Modules/CMakeParseImplicitLinkInfo.cmake @@ -31,7 +31,7 @@ function(CMAKE_PARSE_IMPLICIT_LINK_INFO text lib_var dir_var fwk_var log_var obj # Construct a regex to match linker lines. It must match both the # whole line and just the command (argv[0]). set(linker_regex "^( *|.*[/\\])(${linker}|([^/\\]+-)?ld|collect2)[^/\\]*( |$)") - set(linker_exclude_regex "collect2 version |^[A-Za-z0-9_]+=") + set(linker_exclude_regex "collect2 version |^[A-Za-z0-9_]+=|/ldfe ") set(log "${log} link line regex: [${linker_regex}]\n") string(REGEX REPLACE "\r?\n" ";" output_lines "${text}") foreach(line IN LISTS output_lines) |