diff options
| author | Brad King <brad.king@kitware.com> | 2013-02-08 18:38:10 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2013-02-08 18:38:10 (GMT) |
| commit | 98cca40d9b714db78e1fa67ed8dd1ef15c6492c2 (patch) | |
| tree | 82c1bbb9f4b612749d226b0814fd55c79dead202 /Modules/CMakeParseImplicitLinkInfo.cmake | |
| parent | bc96f95a162045751ff52db19b0791e9eb818cd8 (diff) | |
| parent | 10e8b2da37ff207a7e1a984a5a413c37bf0c8aa4 (diff) | |
| download | CMake-98cca40d9b714db78e1fa67ed8dd1ef15c6492c2.zip CMake-98cca40d9b714db78e1fa67ed8dd1ef15c6492c2.tar.gz CMake-98cca40d9b714db78e1fa67ed8dd1ef15c6492c2.tar.bz2 | |
Merge topic 'implicit-lib-canonical-path'
10e8b2d Normalize full paths in implicit link library list
Diffstat (limited to 'Modules/CMakeParseImplicitLinkInfo.cmake')
| -rw-r--r-- | Modules/CMakeParseImplicitLinkInfo.cmake | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Modules/CMakeParseImplicitLinkInfo.cmake b/Modules/CMakeParseImplicitLinkInfo.cmake index 234fb7f..80e0218 100644 --- a/Modules/CMakeParseImplicitLinkInfo.cmake +++ b/Modules/CMakeParseImplicitLinkInfo.cmake @@ -126,6 +126,12 @@ function(CMAKE_PARSE_IMPLICIT_LINK_INFO text lib_var dir_var fwk_var log_var obj foreach(lib IN LISTS implicit_libs_tmp) if("${lib}" MATCHES "^(crt.*\\.o|gcc.*|System.*)$") set(log "${log} remove lib [${lib}]\n") + elseif(IS_ABSOLUTE "${lib}") + get_filename_component(abs "${lib}" ABSOLUTE) + if(NOT "x${lib}" STREQUAL "x${abs}") + set(log "${log} collapse lib [${lib}] ==> [${abs}]\n") + endif() + list(APPEND implicit_libs "${abs}") else() list(APPEND implicit_libs "${lib}") endif() |