From 695fabda6830b58bdc02d09db70531d5dececcd0 Mon Sep 17 00:00:00 2001 From: Nicholas Guriev Date: Mon, 1 Feb 2021 18:26:56 +0300 Subject: [PATCH] Clean up DESKTOP_APP_DISABLE_WEBRTC_INTEGRATION --- external/CMakeLists.txt | 4 +--- options.cmake | 7 ------- variables.cmake | 1 - 3 files changed, 1 insertion(+), 11 deletions(-) diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt index 3f976d2..03bfd21 100644 --- a/external/CMakeLists.txt +++ b/external/CMakeLists.txt @@ -63,9 +63,7 @@ if (LINUX AND NOT DESKTOP_APP_DISABLE_DBUS_INTEGRATION) endif() add_checked_subdirectory(ton) add_checked_subdirectory(variant) -if (NOT DESKTOP_APP_DISABLE_WEBRTC_INTEGRATION) - add_checked_subdirectory(webrtc) -endif() +add_checked_subdirectory(webrtc) if (LINUX) add_checked_subdirectory(xcb) endif() diff --git a/options.cmake b/options.cmake index 89eea38..28521b2 100644 --- a/options.cmake +++ b/options.cmake @@ -33,13 +33,6 @@ if (DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION) ) endif() -if (DESKTOP_APP_DISABLE_WEBRTC_INTEGRATION) - target_compile_definitions(common_options - INTERFACE - DESKTOP_APP_DISABLE_WEBRTC_INTEGRATION - ) -endif() - if (DESKTOP_APP_USE_PACKAGED) target_compile_definitions(common_options INTERFACE diff --git a/variables.cmake b/variables.cmake index c30a1ca..e429c00 100644 --- a/variables.cmake +++ b/variables.cmake @@ -30,7 +30,6 @@ endif() option(DESKTOP_APP_LOTTIE_USE_CACHE "Use caching in lottie animations." ON) option(DESKTOP_APP_DISABLE_DBUS_INTEGRATION "Disable all code for D-Bus integration (Linux only)." OFF) option(DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION "Disable all code for Wayland integration (Linux only)." OFF) -option(DESKTOP_APP_DISABLE_WEBRTC_INTEGRATION "Disable all code for WebRTC integration." OFF) option(DESKTOP_APP_USE_GLIBC_WRAPS "Use wraps for new GLIBC features." OFF) option(DESKTOP_APP_USE_PACKAGED "Find libraries using CMake instead of exact paths." ${no_special_target}) option(DESKTOP_APP_USE_PACKAGED_LAZY "Bundle recommended Qt plugins for self-contained packages. (Linux only)" OFF)