diff options
| author | Brad King <brad.king@kitware.com> | 2018-04-16 15:58:30 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2018-04-16 15:58:30 (GMT) |
| commit | 90cdd06f4c8873d716fed21b2ab123ede50e504f (patch) | |
| tree | d6cf1e254740dabe57d3ede142a8c3476e06240c /Modules | |
| parent | cb8c758fdb61ef7a6ad606b4d9e880e955368867 (diff) | |
| parent | eb0498357f35317451dd2c41b68c4d9b52af64fc (diff) | |
| download | CMake-90cdd06f4c8873d716fed21b2ab123ede50e504f.zip CMake-90cdd06f4c8873d716fed21b2ab123ede50e504f.tar.gz CMake-90cdd06f4c8873d716fed21b2ab123ede50e504f.tar.bz2 | |
Merge branch 'implicit-lib-gcceh-file' into release-3.11
Merge-request: !1967
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 63d18ab..935f92d 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|gcc_eh.*|System.*|.*libclang_rt.*|msvcrt.*|libvcruntime.*|libucrt.*|libcmt.*)$") + if("x${lib}" MATCHES "^x(crt.*\\.o|gcc_eh.*|.*libgcc_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) |