kotatogram/cmake_helpers
1
0
Fork 0
Code Issues Activity

Fix external_webrtc for Linux.

Browse source
This commit is contained in:
John Preston 2020-05-18 17:50:41 +04:00
parent 5a8376923d
commit 8414d2aa3a
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
external/webrtc/CMakeLists.txt vendored
View file

@ -40,6 +40,10 @@ else()
WEBRTC_MAC WEBRTC_MAC
) )
else() else()
target_compile_definitions(external_webrtc
INTERFACE
WEBRTC_LINUX
)
endif() endif()
target_compile_definitions(external_webrtc target_compile_definitions(external_webrtc
@ -55,9 +59,9 @@ INTERFACE
) )
set(webrtc_libs set(webrtc_libs
${webrtc_lib_prefix}webrtc
test/${webrtc_lib_prefix}platform_video_capturer test/${webrtc_lib_prefix}platform_video_capturer
test/${webrtc_lib_prefix}video_test_common test/${webrtc_lib_prefix}video_test_common
${webrtc_lib_prefix}webrtc
) )
if (APPLE) if (APPLE)
list(APPEND webrtc_libs list(APPEND webrtc_libs
@ -86,4 +90,5 @@ endif()
target_link_libraries(external_webrtc target_link_libraries(external_webrtc
INTERFACE INTERFACE
${webrtc_libs_list} ${webrtc_libs_list}
desktop-app::external_openssl
) )

3
options_linux.cmake
View file

@ -6,11 +6,11 @@
target_compile_options(common_options target_compile_options(common_options
INTERFACE INTERFACE
-fPIC
$<IF:$<CONFIG:Debug>,,-fno-strict-aliasing> $<IF:$<CONFIG:Debug>,,-fno-strict-aliasing>
-pipe -pipe
-Wall -Wall
-W -W
-fPIC
-Wno-unused-variable -Wno-unused-variable
-Wno-unused-parameter -Wno-unused-parameter
-Wno-unused-function -Wno-unused-function
@ -24,6 +24,7 @@ INTERFACE
-Wno-stringop-overflow -Wno-stringop-overflow
-Wno-maybe-uninitialized -Wno-maybe-uninitialized
-Wno-error=class-memaccess -Wno-error=class-memaccess
$<$<NOT:$<COMPILE_LANGUAGE:C>>:-Wno-register>
) )
if (DESKTOP_APP_SPECIAL_TARGET) if (DESKTOP_APP_SPECIAL_TARGET)