UltraCoder/libwebrtc
1
0
Fork 0
mirror of https://github.com/UltraCoderRU/libwebrtc.git synced 2026-01-28 11:15:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix CMake variables, add targets for the latest WebRTC revision

Browse source
This commit is contained in:
Axel Isouard 2016-09-29 23:04:58 +02:00
parent 370cbb8699
commit 1f0c5d681d
3 changed files with 20 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -64,7 +64,7 @@ endif()
set(LIBWEBRTC_LIBRARY ${CMAKE_STATIC_LIBRARY_PREFIX}webrtc${CMAKE_STATIC_LIBRARY_SUFFIX})
set(LIBWEBRTC_BUILD_ROOT ${CMAKE_SOURCE_DIR}/src/out/Default)
set(WEBRTC_CHROMIUM_DEPS git@github.com:aisouard/libwebrtc-chromium-deps.git)
set(LIBWEBRTC_CHROMIUM_DEPS git@github.com:aisouard/libwebrtc-chromium-deps.git)
add_subdirectory(Targets)

17
Samples/PeerConnection/CMakeLists.txt
View file

@ -32,16 +32,23 @@ include_directories(${CMAKE_SOURCE_DIR}/out/src)
if(WIN)
add_definitions(-DWEBRTC_WIN)
else(WIN)
add_definitions(-DWEBRTC_POSIX -std=c++11 -fno-rtti -D_GLIBCXX_USE_CXX11_ABI=0)
set(PEERCONNECTION_SOURCE_FILES ${PEERCONNECTION_SOURCE_FILES} UnixConsole.cpp)
add_definitions(-DWEBRTC_POSIX -std=c++11 -D_GLIBCXX_USE_CXX11_ABI=0)
set(PEERCONNECTION_SOURCE_FILES ${PEERCONNECTION_SOURCE_FILES}
UnixConsole.cpp)
endif(WIN)
add_executable(PeerConnection ${PEERCONNECTION_SOURCE_FILES} ${PEERCONNECTION_HEADER_FILES})
add_executable(PeerConnection
${PEERCONNECTION_SOURCE_FILES}
${PEERCONNECTION_HEADER_FILES})
set(PEERCONNECTION_LIBRARIES ${CMAKE_BINARY_DIR}/${LIBWEBRTC_LIBRARY} Threads::Threads)
set(PEERCONNECTION_LIBRARIES
${CMAKE_BINARY_DIR}/${LIBWEBRTC_INSTALL_CMAKE_DIR}/${LIBWEBRTC_LIBRARY}
Threads::Threads)
if(UNIX AND NOT APPLE)
set(PEERCONNECTION_LIBRARIES ${PEERCONNECTION_LIBRARIES} ${X11_LIBRARIES} ${CMAKE_DL_LIBS})
set(PEERCONNECTION_LIBRARIES ${PEERCONNECTION_LIBRARIES}
${X11_LIBRARIES}
${CMAKE_DL_LIBS})
endif(UNIX AND NOT APPLE)
target_link_libraries(PeerConnection ${PEERCONNECTION_LIBRARIES})

10
Targets/Build/CMakeLists.txt
View file

@ -30,7 +30,8 @@ add_libwebrtc_command(libwebrtc_generate_build
#
set(BUILD_WEBRTC_COMMAND
${LIBWEBRTC_ENV_COMMAND} ninja -C out/Default libjingle_peerconnection)
${LIBWEBRTC_ENV_COMMAND} ninja -C out/Default
libjingle_peerconnection field_trial_default metrics_default)
add_libwebrtc_command(libwebrtc_build
${CMAKE_BINARY_DIR}/src/out/Default/obj/root.stamp
@ -44,11 +45,14 @@ add_libwebrtc_command(libwebrtc_build
# Merge libraries into a single one
#
file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/${LIBWEBRTC_INSTALL_CMAKE_DIR})
set(MERGE_COMMAND
python webrtc/build/merge_libs.py out/Default ${CMAKE_BINARY_DIR}/${WEBRTC_LIBRARY})
python webrtc/build/merge_libs.py out/Default
${CMAKE_BINARY_DIR}/${LIBWEBRTC_INSTALL_CMAKE_DIR}/${LIBWEBRTC_LIBRARY})
add_libwebrtc_command(libwebrtc_merge
${CMAKE_BINARY_DIR}/${WEBRTC_LIBRARY}
${CMAKE_BINARY_DIR}/${LIBWEBRTC_INSTALL_CMAKE_DIR}/${LIBWEBRTC_LIBRARY}
"${MERGE_COMMAND}"
${CMAKE_BINARY_DIR}/src
"Merging libraries into ${WEBRTC_LIBRARY}"