Fix external_webrtc for Linux.

desktop-app · Aug 11, 2020 · 8414d2a · 8414d2a
1 parent 5a83769
commit 8414d2a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/external/webrtc/CMakeLists.txt b/external/webrtc/CMakeLists.txt
@@ -40,6 +40,10 @@ else()
             WEBRTC_MAC
         )
     else()
+        target_compile_definitions(external_webrtc
+        INTERFACE
+            WEBRTC_LINUX
+        )
     endif()
 
     target_compile_definitions(external_webrtc
@@ -55,9 +59,9 @@ INTERFACE
 )
 
 set(webrtc_libs
-    ${webrtc_lib_prefix}webrtc
     test/${webrtc_lib_prefix}platform_video_capturer
     test/${webrtc_lib_prefix}video_test_common
+    ${webrtc_lib_prefix}webrtc
 )
 if (APPLE)
     list(APPEND webrtc_libs
@@ -86,4 +90,5 @@ endif()
 target_link_libraries(external_webrtc
 INTERFACE
     ${webrtc_libs_list}
+    desktop-app::external_openssl
 )
diff --git a/options_linux.cmake b/options_linux.cmake
@@ -6,11 +6,11 @@
 
 target_compile_options(common_options
 INTERFACE
+    -fPIC
     $<IF:$<CONFIG:Debug>,,-fno-strict-aliasing>
     -pipe
     -Wall
     -W
-    -fPIC
     -Wno-unused-variable
     -Wno-unused-parameter
     -Wno-unused-function
@@ -24,6 +24,7 @@ INTERFACE
     -Wno-stringop-overflow
     -Wno-maybe-uninitialized
     -Wno-error=class-memaccess
+    $<$<NOT:$<COMPILE_LANGUAGE:C>>:-Wno-register>
 )
 
 if (DESKTOP_APP_SPECIAL_TARGET)