From f85f30a637c6bfb958ded91595a978d19266a974 Mon Sep 17 00:00:00 2001 From: PerseoGI Date: Wed, 31 Dec 2025 18:49:59 +0100 Subject: [PATCH] Apple frameworks: match CoreFoundation and CFNetwork linkage (#2317) * Apple frameworks: match linkage with CoreFoundation and CFNetwork with actual code * Fix appleframeworks in Meson code --- CMakeLists.txt | 4 ++-- meson.build | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6baed49..b0f8f45 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -278,9 +278,9 @@ target_link_libraries(${PROJECT_NAME} ${_INTERFACE_OR_PUBLIC} $<$:ws2_32> $<$:crypt32> # Needed for API from MacOS Security framework - "$<$,$,$>:-framework CoreFoundation -framework Security>" + "$<$,$,$>:-framework CFNetwork -framework CoreFoundation -framework Security>" # Needed for non-blocking getaddrinfo on MacOS - "$<$,$>:-framework CFNetwork>" + "$<$,$>:-framework CFNetwork -framework CoreFoundation>" # Can't put multiple targets in a single generator expression or it bugs out. $<$:Brotli::common> $<$:Brotli::encoder> diff --git a/meson.build b/meson.build index 14aab1a..5b97168 100644 --- a/meson.build +++ b/meson.build @@ -44,7 +44,7 @@ if openssl_dep.found() deps += openssl_dep args += '-DCPPHTTPLIB_OPENSSL_SUPPORT' if host_machine.system() == 'darwin' - macosx_keychain_dep = dependency('appleframeworks', modules: ['CoreFoundation', 'Security'], required: get_option('macosx_keychain')) + macosx_keychain_dep = dependency('appleframeworks', modules: ['CFNetwork', 'CoreFoundation', 'Security'], required: get_option('macosx_keychain')) if macosx_keychain_dep.found() deps += macosx_keychain_dep args += '-DCPPHTTPLIB_USE_CERTS_FROM_MACOSX_KEYCHAIN' @@ -85,7 +85,7 @@ async_ns_opt = get_option('non_blocking_getaddrinfo') if host_machine.system() == 'windows' async_ns_dep = cxx.find_library('ws2_32', required: async_ns_opt) elif host_machine.system() == 'darwin' - async_ns_dep = dependency('appleframeworks', modules: ['CFNetwork'], required: async_ns_opt) + async_ns_dep = dependency('appleframeworks', modules: ['CFNetwork', 'CoreFoundation'], required: async_ns_opt) else async_ns_dep = cxx.find_library('anl', required: async_ns_opt) endif