mirrors/cmake
2
0
Fork 0
mirror of https://gitlab.kitware.com/cmake/cmake.git synced 2026-09-25 04:09:36 +03:00
Code Activity

Merge topic 'findpkgconfig-l-colon'

Browse Source 
0cc8f00e6b FindPkgConfig: support GNU ld -l:<file> exact-file syntax

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !12485
This commit is contained in:
Brad King
2026-09-09 13:25:27 -04:00
committed by Kitware Robot
parent ad9bc7bf17 0cc8f00e6b
commit 4b2cf13e42
2 changed files with 53 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Modules/FindPkgConfig.cmake
+15 -7
View File
@@ -756,18 +756,26 @@ function(_pkg_find_libs _prefix _no_cmake_path _no_cmake_environment_path)
continue()
endif()
# "-l:<file>" is GNU ld's exact-file syntax; keep the colon-bearing token so
# an unresolved lib still falls back to a linker-usable "-l:<file>".
if (_pkg_search MATCHES "^:(.+)$")
set(_pkg_find_names "${CMAKE_MATCH_1}")
else()
set(_pkg_find_names "${_pkg_search}")
endif()
if(_search_paths)
# Firstly search in -L paths
find_library(pkgcfg_lib_${_prefix}_${_pkg_search}
NAMES ${_pkg_search}
find_library(pkgcfg_lib_${_prefix}_${_pkg_find_names}
NAMES ${_pkg_find_names}
HINTS ${_search_paths} NO_DEFAULT_PATH)
endif()
find_library(pkgcfg_lib_${_prefix}_${_pkg_search}
NAMES ${_pkg_search}
find_library(pkgcfg_lib_${_prefix}_${_pkg_find_names}
NAMES ${_pkg_find_names}
${_find_opts})
mark_as_advanced(pkgcfg_lib_${_prefix}_${_pkg_search})
if(pkgcfg_lib_${_prefix}_${_pkg_search})
list(APPEND _libs "${pkgcfg_lib_${_prefix}_${_pkg_search}}")
mark_as_advanced(pkgcfg_lib_${_prefix}_${_pkg_find_names})
if(pkgcfg_lib_${_prefix}_${_pkg_find_names})
list(APPEND _libs "${pkgcfg_lib_${_prefix}_${_pkg_find_names}}")
else()
list(APPEND _libs ${_pkg_search})
endif()
Tests/RunCMake/FindPkgConfig/FindPkgConfig_IMPORTED_TARGET.cmake
+38
View File
@@ -150,3 +150,41 @@ if (NOT c_opts STREQUAL expected_c_opts)
"expected: \"${expected_c_opts}\", got \"${c_opts}\""
)
endif ()
# GNU ld's "-l:<filename>" exact-file syntax: a named file resolves via
# find_library(); an unresolved one keeps its ":<filename>".
file(WRITE ${fakePkgDir}/lib/libcmakeinternalfakeexact.a "")
file(WRITE ${fakePkgDir}/lib/cmakeinternalfakeexactnoprefix.a "")
set(pname fakeexactpackage)
file(WRITE ${fakePkgDir}/lib/pkgconfig/${pname}.pc
"Name: FakeExactPackage
Description: Dummy package for FindPkgConfig -l:<filename> exact-file test
Version: 1.2.3
Libs: -l:libcmakeinternalfakeexact.a -l:cmakeinternalfakeexactnoprefix.a -l:libcmakeinternalfakemissing.a -lcmakeinternalfakepackage2
")
pkg_check_modules(FakeExactPackage REQUIRED QUIET IMPORTED_TARGET fakeexactpackage)
# check that the "-l:<name>" exact-file form resolves to a full library path
list(FIND FakeExactPackage_LINK_LIBRARIES "${fakePkgDir}/lib/libcmakeinternalfakeexact.a" idx)
if (idx EQUAL -1)
message(FATAL_ERROR "-l: exact file not resolved: ${FakeExactPackage_LINK_LIBRARIES}")
endif()
# check that a non-conventional exact file (no lib prefix) also resolves
list(FIND FakeExactPackage_LINK_LIBRARIES "${fakePkgDir}/lib/cmakeinternalfakeexactnoprefix.a" idx)
if (idx EQUAL -1)
message(FATAL_ERROR "-l: non-conventional exact file not resolved: ${FakeExactPackage_LINK_LIBRARIES}")
endif()
# check that an unresolved exact file keeps its ":<name>" token for the linker
list(FIND FakeExactPackage_LINK_LIBRARIES ":libcmakeinternalfakemissing.a" idx)
if (idx EQUAL -1)
message(FATAL_ERROR "-l: unresolved exact file did not preserve its token: ${FakeExactPackage_LINK_LIBRARIES}")
endif()
# check that a conventional -l entry still resolves alongside -l: entries
list(FIND FakeExactPackage_LINK_LIBRARIES "${fakePkgDir}/lib/libcmakeinternalfakepackage2.a" idx)
if (idx EQUAL -1)
message(FATAL_ERROR "conventional -l entry not resolved alongside -l: entries: ${FakeExactPackage_LINK_LIBRARIES}")
endif()