This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via dd92144a268d54a790e4c5fb609d85a2e21c1f4d (commit)
via 20bf6971f54756a282bda97a9a304f758ad01df2 (commit)
from 16ea4be99cf2460abbe432e82971ba14816867a2 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dd92144a268d54a790e4c5fb609d85a2e21c1f4d
commit dd92144a268d54a790e4c5fb609d85a2e21c1f4d
Merge: 16ea4be 20bf697
Author: Brad King <[email protected]>
AuthorDate: Mon Dec 1 13:01:52 2014 -0500
Commit: CMake Topic Stage <[email protected]>
CommitDate: Mon Dec 1 13:01:52 2014 -0500
Merge topic 'fix-implicit-lib-logging' into next
20bf6971 CMakeParseImplicitLinkInfo: Fix implicit library logging
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=20bf6971f54756a282bda97a9a304f758ad01df2
commit 20bf6971f54756a282bda97a9a304f758ad01df2
Author: Brad King <[email protected]>
AuthorDate: Mon Dec 1 12:57:57 2014 -0500
Commit: Brad King <[email protected]>
CommitDate: Mon Dec 1 12:58:33 2014 -0500
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 <[email protected]>
diff --git a/Modules/CMakeParseImplicitLinkInfo.cmake
b/Modules/CMakeParseImplicitLinkInfo.cmake
index bfcf455..fcc13da 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.
-----------------------------------------------------------------------
Summary of changes:
Modules/CMakeParseImplicitLinkInfo.cmake | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
[email protected]
http://public.kitware.com/mailman/listinfo/cmake-commits
