[Cmake-commits] [cmake-commits] king committed CMakeParseImplicitLinkInfo.cmake 1.2 1.3

cmake-commits at cmake.org cmake-commits at cmake.org
Wed Jul 29 16:07:21 EDT 2009


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

Modified Files:
	CMakeParseImplicitLinkInfo.cmake 
Log Message:
Recognize linker commands without paths

This teaches the implicit link line parsing code to recognize link lines
that do not have a full path to the linker executable.  At least one
version of the Intel compiler on Linux invokes the linker as just "ld"
instead of "/usr/bin/ld".


Index: CMakeParseImplicitLinkInfo.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeParseImplicitLinkInfo.cmake,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** CMakeParseImplicitLinkInfo.cmake	28 Jul 2009 12:36:11 -0000	1.2
--- CMakeParseImplicitLinkInfo.cmake	29 Jul 2009 20:07:19 -0000	1.3
***************
*** 13,17 ****
      get_filename_component(linker ${CMAKE_LINKER} NAME)
    endif()
!   set(linker_regex "/(${linker}|ld|collect2)")
    string(REGEX REPLACE "\r?\n" ";" output_lines "${text}")
    foreach(line IN LISTS output_lines)
--- 13,17 ----
      get_filename_component(linker ${CMAKE_LINKER} NAME)
    endif()
!   set(linker_regex "^( *|.*/)(${linker}|ld|collect2)")
    string(REGEX REPLACE "\r?\n" ";" output_lines "${text}")
    foreach(line IN LISTS output_lines)



More information about the Cmake-commits mailing list