From a24a5e5947658d43339d4bfd85d3f4c52fc71057 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B9=96=E5=8C=97=E6=8D=B7=E6=99=BA=E4=BA=91=E6=8A=80?= =?UTF-8?q?=E6=9C=AF=E6=9C=89=E9=99=90=E5=85=AC=E5=8F=B8?= Date: Tue, 19 Feb 2019 01:31:53 +0800 Subject: [PATCH] Update WebRTC version to m72. --- CMakeModules/Version.cmake | 2 +- README.md | 2 +- appveyor.yml | 2 +- libwebrtc/CMakeLists.txt | 5 ++++- webrtc/CMakeLists.txt.in | 2 +- 5 files changed, 8 insertions(+), 5 deletions(-) diff --git a/CMakeModules/Version.cmake b/CMakeModules/Version.cmake index 6438eea..66c9d02 100644 --- a/CMakeModules/Version.cmake +++ b/CMakeModules/Version.cmake @@ -20,4 +20,4 @@ set(LIBWEBRTC_API_VERSION set(LIBWEBRTC_VERSION ${LIBWEBRTC_API_VERSION}${LIBWEBRTC_BUILD_VERSION}) -set(LIBWEBRTC_WEBRTC_HEAD refs/branch-heads/68) +set(LIBWEBRTC_WEBRTC_HEAD refs/branch-heads/72) diff --git a/README.md b/README.md index 6ceb0d3..13174df 100644 --- a/README.md +++ b/README.md @@ -178,7 +178,7 @@ variable. ``` $ cmake -DWEBRTC_REVISION=be22d51 .. -$ cmake -DWEBRTC_BRANCH_HEAD=refs/branch-heads/68 .. +$ cmake -DWEBRTC_BRANCH_HEAD=refs/branch-heads/72 .. ``` If both variables are set, it will focus on fetching the commit defined inside diff --git a/appveyor.yml b/appveyor.yml index 68d9e45..1ddac69 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -17,7 +17,7 @@ before_build: - cd c:\projects\libwebrtc - if "%platform%"=="x86" set CMAKE_GENERATOR_NAME=Visual Studio 15 2017 - if "%platform%"=="x64" set CMAKE_GENERATOR_NAME=Visual Studio 15 2017 Win64 - - cmake -G "%CMAKE_GENERATOR_NAME%" -DCMAKE_BUILD_TYPE=%configuration% -DWEBRTC_BRANCH_HEAD=refs/branch-heads/68 -DCMAKE_INSTALL_PREFIX=c:\projects\libwebrtc . + - cmake -G "%CMAKE_GENERATOR_NAME%" -DCMAKE_BUILD_TYPE=%configuration% -DWEBRTC_BRANCH_HEAD=refs/branch-heads/72 -DCMAKE_INSTALL_PREFIX=c:\projects\libwebrtc . build: project: PACKAGE.vcxproj diff --git a/libwebrtc/CMakeLists.txt b/libwebrtc/CMakeLists.txt index 0333be8..7ba2e0c 100644 --- a/libwebrtc/CMakeLists.txt +++ b/libwebrtc/CMakeLists.txt @@ -43,7 +43,6 @@ set_target_properties(webrtc PROPERTIES # Install headers install(FILES "${WEBRTC_SOURCE_DIR}/common_types.h" DESTINATION "include/webrtc") -install(FILES "${WEBRTC_SOURCE_DIR}/typedefs.h" DESTINATION "include/webrtc") install(DIRECTORY "${WEBRTC_SOURCE_DIR}/api" "${WEBRTC_SOURCE_DIR}/base" @@ -62,6 +61,10 @@ install(DIRECTORY "${WEBRTC_SOURCE_DIR}/third_party/jsoncpp" DESTINATION "include/webrtc/third_party" FILES_MATCHING PATTERN "*.h") +install(DIRECTORY "${WEBRTC_SOURCE_DIR}/third_party/libyuv" + DESTINATION "include/webrtc/third_party" + FILES_MATCHING PATTERN "*.h") + # Install pdb files if (CMAKE_BUILD_TYPE MATCHES Debug) file(GLOB_RECURSE PDB_FILES [${WEBRTC_OUTPUT_DIR} "*.pdb") diff --git a/webrtc/CMakeLists.txt.in b/webrtc/CMakeLists.txt.in index c55ba1c..5f2aca8 100644 --- a/webrtc/CMakeLists.txt.in +++ b/webrtc/CMakeLists.txt.in @@ -144,7 +144,7 @@ libwebrtc_command( DEPENDS ${_DEPENDENCIES} ) -set(_NINJA_COMMAND ninja ${NINJA_ARGS} -C ${_NINJA_BUILD_DIR} pc:peerconnection system_wrappers:field_trial_default system_wrappers:metrics_default jsoncpp) +set(_NINJA_COMMAND ninja ${NINJA_ARGS} -C ${_NINJA_BUILD_DIR} :webrtc jsoncpp libyuv) libwebrtc_command( NAME webrtc-build