diff options
| author | Brad King <brad.king@kitware.com> | 2014-12-01 12:57:57 -0500 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-12-01 12:58:33 -0500 |
| commit | 20bf6971f54756a282bda97a9a304f758ad01df2 (patch) | |
| tree | 5aad13bc3796337aa84383e8f69a9ef7dabbdb33 | |
| parent | 433c6d4689ca86f1a8d8d966be0204e98f95b968 (diff) | |
| download | cmake-20bf6971f54756a282bda97a9a304f758ad01df2.tar.gz | |
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>
| -rw-r--r-- | Modules/CMakeParseImplicitLinkInfo.cmake | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Modules/CMakeParseImplicitLinkInfo.cmake b/Modules/CMakeParseImplicitLinkInfo.cmake index bfcf455823..fcc13da82f 100644 --- a/Modules/CMakeParseImplicitLinkInfo.cmake +++ b/Modules/CMakeParseImplicitLinkInfo.cmake @@ -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") elseif("${arg}" MATCHES "^-l([^:].*)$") # 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") elseif("${arg}" MATCHES "^(.:)?[/\\].*\\.a$") # Unix library full path. |