summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErik Kundiman <erik@megapahit.org>2024-07-28 08:42:01 +0800
committerErik Kundiman <erik@megapahit.org>2024-08-09 15:11:02 +0800
commitf58cc7facb14ff6b6763652b433524e85a728cc3 (patch)
tree5067b3453cf46c1ee568e9881428c4993a1c0ddf
parent2cd3746d2cc4d895ab2662f6f165d674466db093 (diff)
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.
-rw-r--r--indra/llwebrtc/CMakeLists.txt4
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/llwebrtc/CMakeLists.txt b/indra/llwebrtc/CMakeLists.txt
index 9c58f5ff08..d6217ff3a4 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)
set_target_properties(llwebrtc
@@ -73,7 +75,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)