diff options
| author | Brad King <brad.king@kitware.com> | 2017-11-08 13:12:08 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2017-11-08 13:12:08 (GMT) |
| commit | ddf485511bb1d5b9ff6a3c9b00e92707e3a99b1a (patch) | |
| tree | 59ed47c92a91ef876bde59799e8f20daee3b64ce /Modules | |
| parent | 575250b6c4223f1b99ddc5e483b6216b07bd796e (diff) | |
| parent | 41aacca7fb61eccf673024180e6020250fb301b2 (diff) | |
| download | CMake-ddf485511bb1d5b9ff6a3c9b00e92707e3a99b1a.zip CMake-ddf485511bb1d5b9ff6a3c9b00e92707e3a99b1a.tar.gz CMake-ddf485511bb1d5b9ff6a3c9b00e92707e3a99b1a.tar.bz2 | |
Merge branch 'implicit-lib-gcceh' into release-3.10
Merge-request: !1460
Diffstat (limited to 'Modules')
| -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 3b77278..63d18ab 100644 --- a/Modules/CMakeParseImplicitLinkInfo.cmake +++ b/Modules/CMakeParseImplicitLinkInfo.cmake @@ -142,7 +142,7 @@ function(CMAKE_PARSE_IMPLICIT_LINK_INFO text lib_var dir_var fwk_var log_var obj # We remove items that are not language-specific. set(implicit_libs "") foreach(lib IN LISTS implicit_libs_tmp) - if("x${lib}" MATCHES "^x(crt.*\\.o|System.*|.*libclang_rt.*|msvcrt.*|libvcruntime.*|libucrt.*|libcmt.*)$") + if("x${lib}" MATCHES "^x(crt.*\\.o|gcc_eh.*|System.*|.*libclang_rt.*|msvcrt.*|libvcruntime.*|libucrt.*|libcmt.*)$") string(APPEND log " remove lib [${lib}]\n") elseif(IS_ABSOLUTE "${lib}") get_filename_component(abs "${lib}" ABSOLUTE) |