From 8fe61967147e3d922ec72b9a48112e00d8915f70 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Thu, 28 Dec 2023 09:57:47 +0100 Subject: FindPkgConfig: Update cache variables after framework extraction --- Modules/FindPkgConfig.cmake | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Modules/FindPkgConfig.cmake b/Modules/FindPkgConfig.cmake index 27d25fb..1c1850a 100644 --- a/Modules/FindPkgConfig.cmake +++ b/Modules/FindPkgConfig.cmake @@ -656,6 +656,9 @@ macro(_pkg_check_modules_internal _is_required _is_silent _no_cmake_path _no_cma if (APPLE AND "-framework" IN_LIST ${_prefix}_LDFLAGS_OTHER) _pkgconfig_extract_frameworks("${_prefix}") + # Using _pkgconfig_set in this scope so that a future policy can switch to normal variables + _pkgconfig_set("${_pkg_check_prefix}_LIBRARIES" "${${_pkg_check_prefix}_LIBRARIES}") + _pkgconfig_set("${_pkg_check_prefix}_LDFLAGS_OTHER" "${${_pkg_check_prefix}_LDFLAGS_OTHER}") endif() _pkgconfig_invoke_dyn("${_pkg_check_modules_packages}" "${_prefix}" INCLUDE_DIRS "(^| )(-I|-isystem ?)" --cflags-only-I ) -- cgit v0.12 From e50aaf854703a870f4e1e61da025842248d68bde Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Thu, 28 Dec 2023 10:41:12 +0100 Subject: FindPkgConfig: Update cache variables after isystem extraction Fixes: #25377 --- Modules/FindPkgConfig.cmake | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Modules/FindPkgConfig.cmake b/Modules/FindPkgConfig.cmake index 1c1850a..1b6a72a 100644 --- a/Modules/FindPkgConfig.cmake +++ b/Modules/FindPkgConfig.cmake @@ -667,6 +667,9 @@ macro(_pkg_check_modules_internal _is_required _is_silent _no_cmake_path _no_cma if (${_prefix}_CFLAGS_OTHER MATCHES "-isystem") _pkgconfig_extract_isystem("${_prefix}") + # Using _pkgconfig_set in this scope so that a future policy can switch to normal variables + _pkgconfig_set("${_pkg_check_prefix}_CFLAGS_OTHER" "${${_pkg_check_prefix}_CFLAGS_OTHER}") + _pkgconfig_set("${_pkg_check_prefix}_INCLUDE_DIRS" "${${_pkg_check_prefix}_INCLUDE_DIRS}") endif () _pkg_recalculate("${_prefix}" ${_no_cmake_path} ${_no_cmake_environment_path} ${_imp_target} ${_imp_target_global}) -- cgit v0.12