From 59369509cef094686f8529c893edfc37c1cab1dc Mon Sep 17 00:00:00 2001 From: philippewarren Date: Tue, 17 Dec 2024 14:46:32 -0500 Subject: [PATCH] Fix MacOS 13 CI --- .../3rdParty/webrtc_native/CMakeLists.txt | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/opentera-webrtc-native-client/3rdParty/webrtc_native/CMakeLists.txt b/opentera-webrtc-native-client/3rdParty/webrtc_native/CMakeLists.txt index 11e3c654..c5cf8cd9 100644 --- a/opentera-webrtc-native-client/3rdParty/webrtc_native/CMakeLists.txt +++ b/opentera-webrtc-native-client/3rdParty/webrtc_native/CMakeLists.txt @@ -108,8 +108,17 @@ if(WIN32) set(webrtc_native_LIBRARY ${CMAKE_CURRENT_BINARY_DIR}/${extracted_directory_name}/lib/webrtc.lib CACHE INTERNAL "") set(libyuv_LIBRARY ${CMAKE_CURRENT_BINARY_DIR}/${extracted_directory_name}/lib/libyuv_internal.lib CACHE INTERNAL "") else() - set(boringssl_LIBRARY ${CMAKE_CURRENT_BINARY_DIR}/${extracted_directory_name}/lib/libboringssl.a CACHE INTERNAL "") - set(libyuv_LIBRARY ${CMAKE_CURRENT_BINARY_DIR}/${extracted_directory_name}/lib/libyuv_internal.a CACHE INTERNAL "") + # TODO: this is a patch because these two thin archives do not link on MacOS 13 in CI. + if(APPLE AND ${SW_VERS_VERSION_SHORT} MATCHES "13") + file(GLOB boringssl_object_files ${CMAKE_CURRENT_BINARY_DIR}/${extracted_directory_name}/lib/boringssl/*.o) + set(boringssl_LIBRARY ${boringssl_object_files} CACHE INTERNAL "") + + file(GLOB libyuv_object_files ${CMAKE_CURRENT_BINARY_DIR}/${extracted_directory_name}/lib/libyuv_internal/*.o) + set(libyuv_LIBRARY ${libyuv_object_files} CACHE INTERNAL "") + else() + set(boringssl_LIBRARY ${CMAKE_CURRENT_BINARY_DIR}/${extracted_directory_name}/lib/libboringssl.a CACHE INTERNAL "") + set(libyuv_LIBRARY ${CMAKE_CURRENT_BINARY_DIR}/${extracted_directory_name}/lib/libyuv_internal.a CACHE INTERNAL "") + endif() if(APPLE) set(webrtc_native_LIBRARY ${CMAKE_CURRENT_BINARY_DIR}/${extracted_directory_name}/lib/libwebrtc.a "-framework Foundation" "-framework AVFoundation" "-framework CoreAudio" "-framework AudioToolbox" "-framework CoreGraphics" CACHE INTERNAL "")