kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

CMakeParseImplicitLinkInfo: Fix implicit library logging 

In commit v3.1.0-rc1~640^2~5 (Clean up usage of if(... MATCHES regex)
followed string(REGEX REPLACE regex), 2014-04-06) we accidentally broke
logging of the implicit library detection.  Restore use of the
intermediate 'lib' variable so that the log message is constructed
properly.

Reported-by: Bill Somerville <bill@classdesign.com>
This commit is contained in:
Brad King 2014-12-01 12:57:57 -05:00
parent 433c6d4689
commit 20bf6971f5
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Modules/CMakeParseImplicitLinkInfo.cmake
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.