Mirrors/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2026-01-18 01:11:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

[vcpkg/scripts] Only add pkgconfig_path if it is not already on PATH (#38239)

Browse Source 
closes #37213
This commit is contained in:
Alexander Neumann
2024-04-20 22:20:27 +02:00
committed by GitHub
parent b346ee32f1
commit 9224b3bbd8
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
scripts/cmake/z_vcpkg_setup_pkgconfig_path.cmake
View File

@@ -18,9 +18,15 @@ function(z_vcpkg_setup_pkgconfig_path)
vcpkg_find_acquire_program(PKGCONFIG)
get_filename_component(pkgconfig_path "${PKGCONFIG}" DIRECTORY)
vcpkg_add_to_path("${pkgconfig_path}")
cmake_path(CONVERT "$ENV{PATH}" TO_CMAKE_PATH_LIST path_list NORMALIZE)
cmake_path(CONVERT "${pkgconfig_path}" TO_CMAKE_PATH_LIST pkgconfig_path NORMALIZE)
if(NOT "${pkgconfig_path}" IN_LIST path_list)
vcpkg_add_to_path("${pkgconfig_path}")
endif()
unset(path_list)
unset(pkgconfig_path)
set(ENV{PKG_CONFIG} "${PKGCONFIG}") # Set via native file?
set(ENV{PKG_CONFIG} "${PKGCONFIG}")
foreach(prefix IN ITEMS "${CURRENT_INSTALLED_DIR}" "${CURRENT_PACKAGES_DIR}")
vcpkg_host_path_list(PREPEND ENV{PKG_CONFIG_PATH} "${prefix}/share/pkgconfig")