[Cmake-commits] [cmake-commits] king committed CMakeParseImplicitLinkInfo.cmake 1.5 1.6

cmake-commits at cmake.org cmake-commits at cmake.org
Tue Oct 6 16:31:45 EDT 2009


Update of /cvsroot/CMake/CMake/Modules
In directory public:/mounts/ram/cvs-serv1998/Modules

Modified Files:
	CMakeParseImplicitLinkInfo.cmake 
Log Message:
Log implicit link line detection regex

This commit teaches the CMAKE_PARSE_IMPLICIT_LINK_INFO function to log
the regex it uses to detect the linker invocation line.  The regex is
computed from the CMAKE_LINKER if it is found, so it might change.  A
strange value might match the wrong line and cause implicit link info
extraction to fail.

See issue #9666.


Index: CMakeParseImplicitLinkInfo.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeParseImplicitLinkInfo.cmake,v
retrieving revision 1.5
retrieving revision 1.6
diff -C 2 -d -r1.5 -r1.6
*** CMakeParseImplicitLinkInfo.cmake	6 Oct 2009 19:16:12 -0000	1.5
--- CMakeParseImplicitLinkInfo.cmake	6 Oct 2009 20:31:43 -0000	1.6
***************
*** 28,31 ****
--- 28,32 ----
    endif()
    set(linker_regex "^( *|.*/)(${linker}|ld|collect2)")
+   set(log "${log}  link line regex: [${linker_regex}]\n")
    string(REGEX REPLACE "\r?\n" ";" output_lines "${text}")
    foreach(line IN LISTS output_lines)



More information about the Cmake-commits mailing list