kotatogram/cmake_helpers
1
0
Fork 0
Code Issues Activity

Update webrtc packaged build for tg_owt

Browse source
This commit is contained in:
Ilya Fedin 2020-08-29 20:48:37 +04:00 • committed by John Preston
parent 3a7b44d038
commit d955882cb4
2 changed files with 69 additions and 70 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
external/webrtc/CMakeLists.txt vendored
View file

@ -7,12 +7,11 @@
add_library(external_webrtc INTERFACE IMPORTED GLOBAL)
add_library(desktop-app::external_webrtc ALIAS external_webrtc)
if (DESKTOP_APP_WEBRTC_LOCATION)
set(webrtc_loc ${DESKTOP_APP_WEBRTC_LOCATION})
if (DESKTOP_APP_USE_PACKAGED)
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>)
target_compile_definitions(external_webrtc
@ -100,3 +99,4 @@ INTERFACE
${webrtc_libs_list}
desktop-app::external_openssl
)
endif()

1
variables.cmake
View file

@ -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)