Merge topic 'fix-implicit-lib-logging'

20bf6971 CMakeParseImplicitLinkInfo: Fix implicit library logging
This commit is contained in:
Brad King 2014-12-02 10:21:19 -05:00 committed by CMake Topic Stage
commit 3e33feaae2
1 changed files with 2 additions and 1 deletions

View File

@ -66,7 +66,8 @@ function(CMAKE_PARSE_IMPLICIT_LINK_INFO text lib_var dir_var fwk_var log_var obj
set(log "${log} arg [${arg}] ==> dir [${dir}]\n") set(log "${log} arg [${arg}] ==> dir [${dir}]\n")
elseif("${arg}" MATCHES "^-l([^:].*)$") elseif("${arg}" MATCHES "^-l([^:].*)$")
# Unix library. # Unix library.
list(APPEND implicit_libs_tmp ${CMAKE_MATCH_1}) set(lib "${CMAKE_MATCH_1}")
list(APPEND implicit_libs_tmp ${lib})
set(log "${log} arg [${arg}] ==> lib [${lib}]\n") set(log "${log} arg [${arg}] ==> lib [${lib}]\n")
elseif("${arg}" MATCHES "^(.:)?[/\\].*\\.a$") elseif("${arg}" MATCHES "^(.:)?[/\\].*\\.a$")
# Unix library full path. # Unix library full path.