From edad475e26c0547b638f2f9c29623460ca27e564 Mon Sep 17 00:00:00 2001 From: Brad King Date: Wed, 29 Jul 2009 16:07:19 -0400 Subject: 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". --- Modules/CMakeParseImplicitLinkInfo.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Modules/CMakeParseImplicitLinkInfo.cmake b/Modules/CMakeParseImplicitLinkInfo.cmake index 6ea3d58..7504392 100644 --- a/Modules/CMakeParseImplicitLinkInfo.cmake +++ b/Modules/CMakeParseImplicitLinkInfo.cmake @@ -12,7 +12,7 @@ function(CMAKE_PARSE_IMPLICIT_LINK_INFO text lib_var dir_var) if(CMAKE_LINKER) get_filename_component(linker ${CMAKE_LINKER} NAME) endif() - set(linker_regex "/(${linker}|ld|collect2)") + set(linker_regex "^( *|.*/)(${linker}|ld|collect2)") string(REGEX REPLACE "\r?\n" ";" output_lines "${text}") foreach(line IN LISTS output_lines) set(cmd) -- cgit v0.12