diff options
| author | Brad King <brad.king@kitware.com> | 2024-01-05 18:31:28 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2024-01-05 18:31:58 (GMT) |
| commit | 1f66051983ef0bdefa5de139fa9013830a4c3047 (patch) | |
| tree | e2407b33837bd5b5752dd3f25159e35ac69b4b08 | |
| parent | ac9fd4f00939d181ee9df503415695019f900c7d (diff) | |
| parent | e50aaf854703a870f4e1e61da025842248d68bde (diff) | |
| download | CMake-1f66051983ef0bdefa5de139fa9013830a4c3047.zip CMake-1f66051983ef0bdefa5de139fa9013830a4c3047.tar.gz CMake-1f66051983ef0bdefa5de139fa9013830a4c3047.tar.bz2 | |
Merge topic 'FindPkgConfig-caching'
e50aaf8547 FindPkgConfig: Update cache variables after isystem extraction
8fe6196714 FindPkgConfig: Update cache variables after framework extraction
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9109
| -rw-r--r-- | Modules/FindPkgConfig.cmake | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Modules/FindPkgConfig.cmake b/Modules/FindPkgConfig.cmake index 27d25fb..1b6a72a 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 ) @@ -664,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}) |