From 11f8a7a1f1d4236dcd7b28f3e5e1f7dac9ba3dee Mon Sep 17 00:00:00 2001 From: Erik Kundiman Date: Sun, 28 Jul 2024 08:42:01 +0800 Subject: Fix libllwebrtc.dylib installation to the package llwebrtc.h is not unnecessarily installed any more. When code signing the app on macOS, there was also a problem where it said that this header wasn't signed. ??? That's why we make sure that it won't be installed now. Also on macOS, the dylib is installed to Frameworks right away, so now we don't have any unused double in Resources. --- indra/llwebrtc/CMakeLists.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'indra/llwebrtc') diff --git a/indra/llwebrtc/CMakeLists.txt b/indra/llwebrtc/CMakeLists.txt index b7adc91c2a..48ce551516 100644 --- a/indra/llwebrtc/CMakeLists.txt +++ b/indra/llwebrtc/CMakeLists.txt @@ -28,7 +28,9 @@ list(APPEND llwebrtc_SOURCE_FILES ${llwebrtc_HEADER_FILES}) add_library (llwebrtc SHARED ${llwebrtc_SOURCE_FILES}) +if (NOT INSTALL) set_target_properties(llwebrtc PROPERTIES PUBLIC_HEADER llwebrtc.h) +endif () if (WINDOWS) target_link_libraries(llwebrtc PRIVATE ll::webrtc @@ -62,7 +64,7 @@ endif (LL_TESTS) if (INSTALL) if (DARWIN) - set(_LIB ${viewer_BINARY_DIR}/${VIEWER_CHANNEL}.app/Contents/Resources) + set(_LIB ../Frameworks) elseif (EXISTS ${CMAKE_SYSROOT}/usr/lib/${ARCH}-linux-gnu) set(_LIB lib/${ARCH}-linux-gnu) elseif (EXISTS /lib64) -- cgit v1.2.3