Update webrtc packaged build for tg_owt

external/webrtc/CMakeLists.txt

@@ -7,16 +7,15 @@
 add_library(external_webrtc INTERFACE IMPORTED GLOBAL)
 add_library(desktop-app::external_webrtc ALIAS external_webrtc)
 
-if (DESKTOP_APP_WEBRTC_LOCATION)
+if (DESKTOP_APP_USE_PACKAGED)
-    set(webrtc_loc ${DESKTOP_APP_WEBRTC_LOCATION})
+    find_package(tg_owt REQUIRED)
+    target_link_libraries(external_webrtc INTERFACE tg_owt::tg_owt)
 else()
     set(webrtc_loc ${libs_loc}/tg_owt/src)
-endif()
+    set(webrtc_build_loc ${libs_loc}/tg_owt/out/$<CONFIG>)
 
-set(webrtc_build_loc ${libs_loc}/tg_owt/out/$<CONFIG>)
+    target_compile_definitions(external_webrtc
-
+    INTERFACE
-target_compile_definitions(external_webrtc
-INTERFACE
         WEBRTC_ENABLE_PROTOBUF=0
         WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE
         RTC_ENABLE_VP9
@@ -25,9 +24,9 @@ INTERFACE
         WEBRTC_LIBRARY_IMPL
         WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS=1
         ABSL_ALLOCATOR_NOTHROW=1
-)
+    )
 
-if (WIN32)
+    if (WIN32)
         set(webrtc_lib_prefix "")
         set(webrtc_lib_suffix .lib)
 
@@ -35,7 +34,7 @@ if (WIN32)
         INTERFACE
             WEBRTC_WIN
         )
-else()
+    else()
         set(webrtc_lib_prefix lib)
         set(webrtc_lib_suffix .a)
 
@@ -55,18 +54,18 @@ else()
         INTERFACE
             WEBRTC_POSIX
         )
-endif()
+    endif()
 
-target_include_directories(external_webrtc
+    target_include_directories(external_webrtc
-INTERFACE
+    INTERFACE
         ${webrtc_loc}
         ${webrtc_loc}/third_party/abseil-cpp
-)
+    )
 
-set(webrtc_libs
+    set(webrtc_libs
         ${webrtc_lib_prefix}tg_owt
-)
+    )
-if (APPLE)
+    if (APPLE)
         target_include_directories(external_webrtc
         INTERFACE
             ${webrtc_loc}/sdk/objc
@@ -74,12 +73,12 @@ if (APPLE)
             ${webrtc_loc}/sdk/objc/components/video_codec
             ${webrtc_loc}/third_party/libyuv/include
         )
-endif()
+    endif()
-foreach (lib ${webrtc_libs})
+    foreach (lib ${webrtc_libs})
         list(APPEND webrtc_libs_list "${webrtc_build_loc}/${lib}${webrtc_lib_suffix}")
-endforeach()
+    endforeach()
 
-if (WIN32)
+    if (WIN32)
         target_link_libraries(external_webrtc
         INTERFACE
             Secur32.lib # Required for rtc_base/http_common.cc
@@ -88,15 +87,16 @@ if (WIN32)
             amstrmid.lib
             msdmo.lib
         )
-elseif (APPLE)
+    elseif (APPLE)
         target_link_libraries(external_webrtc
         INTERFACE
             -ObjC
         )
-endif()
+    endif()
 
-target_link_libraries(external_webrtc
+    target_link_libraries(external_webrtc
-INTERFACE
+    INTERFACE
         ${webrtc_libs_list}
         desktop-app::external_openssl
-)
+    )
+endif()

variables.cmake

@@ -40,7 +40,6 @@ option(DESKTOP_APP_DISABLE_AUTOUPDATE "Disable autoupdate." ${disable_autoupdate
 option(DESKTOP_APP_USE_HUNSPELL_ONLY "Disable system spellchecker and use bundled Hunspell only. (For debugging purposes)" OFF)
 option(DESKTOP_APP_USE_ENCHANT "Use Enchant instead of bundled Hunspell. (Linux only)" OFF)
 set(DESKTOP_APP_QTWAYLANDCLIENT_PRIVATE_HEADERS "" CACHE STRING "QtWaylandClient headers location.")
-set(DESKTOP_APP_WEBRTC_LOCATION "" CACHE STRING "WebRTC source root location.")
 
 set(dont_bundle_fonts 0)
 if (DESKTOP_APP_USE_PACKAGED AND NOT DESKTOP_APP_USE_PACKAGED_LAZY)