kotatogram/cmake_helpers
1
0
Fork 0
Code Issues Activity

Use tg_owt webrtc fork.

Browse source
This commit is contained in:
John Preston 2020-08-20 16:06:55 +04:00
parent 8c999a0023
commit 4c8956027d
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
external/webrtc/CMakeLists.txt vendored
View file

@ -10,10 +10,10 @@ add_library(desktop-app::external_webrtc ALIAS external_webrtc)
if (DESKTOP_APP_WEBRTC_LOCATION) if (DESKTOP_APP_WEBRTC_LOCATION)
set(webrtc_loc ${DESKTOP_APP_WEBRTC_LOCATION}) set(webrtc_loc ${DESKTOP_APP_WEBRTC_LOCATION})
else() else()
set(webrtc_loc ${libs_loc}/webrtc/src) set(webrtc_loc ${libs_loc}/tg_owt/src)
endif() endif()
set(webrtc_build_loc ${webrtc_loc}/out/$<CONFIG>/obj) set(webrtc_build_loc ${libs_loc}/tg_owt/out/$<CONFIG>)
target_compile_definitions(external_webrtc target_compile_definitions(external_webrtc
INTERFACE INTERFACE
@ -64,7 +64,7 @@ INTERFACE
) )
set(webrtc_libs set(webrtc_libs
${webrtc_lib_prefix}webrtc ${webrtc_lib_prefix}tg_owt
) )
if (APPLE) if (APPLE)
target_include_directories(external_webrtc target_include_directories(external_webrtc
@ -87,7 +87,7 @@ if (WIN32)
wmcodecdspuuid.lib wmcodecdspuuid.lib
amstrmid.lib amstrmid.lib
msdmo.lib msdmo.lib
) )
elseif (APPLE) elseif (APPLE)
target_link_libraries(external_webrtc target_link_libraries(external_webrtc
INTERFACE INTERFACE

2
init_target.cmake
View file

@ -17,7 +17,7 @@ endfunction()
function(init_target target_name) # init_target(my_target folder_name) function(init_target target_name) # init_target(my_target folder_name)
if (ARGC GREATER 1) if (ARGC GREATER 1)
if (${ARGV1} STREQUAL cxx_std_14 OR ${ARGV1} STREQUAL cxx_std_11) if (${ARGV1} STREQUAL cxx_std_14 OR ${ARGV1} STREQUAL cxx_std_11 OR ${ARGV1} STREQUAL cxx_std_17)
target_compile_features(${target_name} PUBLIC ${ARGV1}) target_compile_features(${target_name} PUBLIC ${ARGV1})
else() else()
target_compile_features(${target_name} PUBLIC ${MAXIMUM_CXX_STANDARD}) target_compile_features(${target_name} PUBLIC ${MAXIMUM_CXX_STANDARD})