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

CMake: Update WebRTC revision to ae25512, remove Chromium dependencies

Browse source
This commit is contained in:
Axel Isouard 2017-01-24 21:12:55 +01:00
parent 52804400a2
commit 99e0c927d6
No known key found for this signature in database
GPG key ID: 4E64BB3EAAF31C29
2 changed files with 26 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
CMakeLists.txt
View file

@ -41,7 +41,7 @@ set(LIBWEBRTC_LIBRARY_PROPERTIES ${LIBWEBRTC_LIBRARY_PROPERTIES}
VERSION "${LIBWEBRTC_VERSION}" VERSION "${LIBWEBRTC_VERSION}"
SOVERSION "${LIBWEBRTC_API_VERSION}") SOVERSION "${LIBWEBRTC_API_VERSION}")
set(LIBWEBRTC_WEBRTC_REVISION 71b9b58a3a3ac651e5a5c5d095411620bb425659) set(LIBWEBRTC_WEBRTC_REVISION ae2551232b5249e38298a50f2d9a64d3c862db00)
# #
# Directories # Directories
@ -61,12 +61,9 @@ if (NOT LIBWEBRTC_INSTALL_INCLUDE_DIR)
endif () endif ()
set(LIBWEBRTC_LIBRARY_NAME ${CMAKE_STATIC_LIBRARY_PREFIX}webrtc${CMAKE_STATIC_LIBRARY_SUFFIX}) set(LIBWEBRTC_LIBRARY_NAME ${CMAKE_STATIC_LIBRARY_PREFIX}webrtc${CMAKE_STATIC_LIBRARY_SUFFIX})
set(LIBWEBRTC_LIBRARY_PATH ${CMAKE_BINARY_DIR}/${LIBWEBRTC_INSTALL_LIB_DIR}/${LIBWEBRTC_LIBRARY_NAME}) set(LIBWEBRTC_LIBRARY_PATH ${CMAKE_BINARY_DIR}/${LIBWEBRTC_INSTALL_LIB_DIR}/${LIBWEBRTC_LIBRARY_NAME})
set(LIBWEBRTC_BUILD_ROOT ${CMAKE_SOURCE_DIR}/src/out/Default) set(LIBWEBRTC_BUILD_ROOT ${CMAKE_SOURCE_DIR}/src/out/Default)
set(LIBWEBRTC_CHROMIUM_DEPS https://github.com/aisouard/libwebrtc-chromium-deps/releases/download/v0.1-5e821a/libwebrtc-chromium-deps-5e821a778b85878bafcc8128f64333fd518c79a5.zip)
set(LIBWEBRTC_CHROMIUM_DEPS_HASH 47c50d293494fb9bc66289a386730b71)
add_subdirectory(Targets) add_subdirectory(Targets)
if (BUILD_SAMPLES) if (BUILD_SAMPLES)

44
Targets/WebRTC/CMakeLists.txt
View file

@ -27,18 +27,6 @@ get_filename_component(CHROMIUM_PYTHONPATH
set(WEBRTC_ENV PATH=${WEBRTC_PATH_STR} PYTHONPATH=${CHROMIUM_PYTHONPATH} DEPOT_TOOLS_WIN_TOOLCHAIN=0) set(WEBRTC_ENV PATH=${WEBRTC_PATH_STR} PYTHONPATH=${CHROMIUM_PYTHONPATH} DEPOT_TOOLS_WIN_TOOLCHAIN=0)
set(WEBRTC_PREFIX ${CMAKE_COMMAND} -E env \\\"${WEBRTC_ENV}\\\") set(WEBRTC_PREFIX ${CMAKE_COMMAND} -E env \\\"${WEBRTC_ENV}\\\")
#
# Download chromium dependencies
#
ExternalProject_Add(chromium
URL ${LIBWEBRTC_CHROMIUM_DEPS}
URL_HASH MD5=${LIBWEBRTC_CHROMIUM_DEPS_HASH}
SOURCE_DIR ${CMAKE_BINARY_DIR}/src/chromium/src
CONFIGURE_COMMAND ""
BUILD_COMMAND ""
INSTALL_COMMAND "")
# #
# Retrieve WebRTC source code # Retrieve WebRTC source code
# #
@ -53,13 +41,9 @@ if (UNIX AND NOT APPLE)
set(RETRIEVE_SYSROOT_COMMAND ${CMAKE_BINARY_DIR}/src/build/linux/sysroot_scripts/install-sysroot.py --arch=amd64) set(RETRIEVE_SYSROOT_COMMAND ${CMAKE_BINARY_DIR}/src/build/linux/sysroot_scripts/install-sysroot.py --arch=amd64)
endif (UNIX AND NOT APPLE) endif (UNIX AND NOT APPLE)
set(UPDATE_CLANG_COMMAND ${PYTHON_EXECUTABLE} src/chromium/src/tools/clang/scripts/update.py) set(UPDATE_CLANG_COMMAND ${PYTHON_EXECUTABLE} src/tools/clang/scripts/update.py)
set(SETUP_LINKS_COMMAND ${PYTHON_EXECUTABLE} src/setup_links.py)
ExternalProject_Add(webrtc-src ExternalProject_Add(webrtc-src
DEPENDS chromium
PREFIX ${CMAKE_BINARY_DIR} PREFIX ${CMAKE_BINARY_DIR}
BINARY_DIR ${CMAKE_BINARY_DIR} BINARY_DIR ${CMAKE_BINARY_DIR}
SOURCE_DIR ${CMAKE_BINARY_DIR} SOURCE_DIR ${CMAKE_BINARY_DIR}
@ -68,13 +52,35 @@ ExternalProject_Add(webrtc-src
DOWNLOAD_COMMAND ${WEBRTC_PREFIX} ${GCLIENT_CONFIG_COMMAND} DOWNLOAD_COMMAND ${WEBRTC_PREFIX} ${GCLIENT_CONFIG_COMMAND}
PATCH_COMMAND ${WEBRTC_PREFIX} ${GCLIENT_SYNC_COMMAND} PATCH_COMMAND ${WEBRTC_PREFIX} ${GCLIENT_SYNC_COMMAND}
UPDATE_COMMAND ${WEBRTC_PREFIX} ${UPDATE_CLANG_COMMAND} UPDATE_COMMAND ${WEBRTC_PREFIX} ${UPDATE_CLANG_COMMAND}
CONFIGURE_COMMAND ${WEBRTC_PREFIX} ${SETUP_LINKS_COMMAND}
BUILD_COMMAND ${RETRIEVE_SYSROOT_COMMAND} BUILD_COMMAND ${RETRIEVE_SYSROOT_COMMAND}
INSTALL_COMMAND "" INSTALL_COMMAND ""
LOG_DOWNLOAD 1) LOG_DOWNLOAD 1)
#
# Retrieve buildtools binaries
#
set(WEBRTC_PREFIX ${CMAKE_COMMAND} -E env \"${WEBRTC_ENV}\")
add_custom_command(
OUTPUT "Buildtools"
COMMAND ${WEBRTC_PREFIX} download_from_google_storage --no_resume --platform=linux* --no_auth --bucket chromium-gn -s src/buildtools/linux64/gn.sha1
COMMAND ${WEBRTC_PREFIX} download_from_google_storage --no_resume --platform=linux* --no_auth --bucket chromium-clang-format -s src/buildtools/linux64/clang-format.sha1
COMMAND ${WEBRTC_PREFIX} download_from_google_storage --no_resume --platform=darwin --no_auth --bucket chromium-gn -s src/buildtools/mac/gn.sha1
COMMAND ${WEBRTC_PREFIX} download_from_google_storage --no_resume --platform=darwin --no_auth --bucket chromium-clang-format -s src/buildtools/mac/clang-format.sha1
COMMAND ${WEBRTC_PREFIX} download_from_google_storage --no_resume --platform=win32 --no_auth --bucket chromium-gn -s src/buildtools/win/gn.exe.sha1
COMMAND ${WEBRTC_PREFIX} download_from_google_storage --no_resume --platform=win32 --no_auth --bucket chromium-clang-format -s src/buildtools/win/clang-format.exe.sha1
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
COMMENT "Populating buildtools folder")
add_custom_target(
webrtc-buildtools ALL
DEPENDS "Buildtools")
add_dependencies(webrtc-buildtools webrtc-src)
# #
# Generate build files # Generate build files
# #
@ -113,7 +119,7 @@ add_custom_target(
webrtc-generate ALL webrtc-generate ALL
DEPENDS "Generate") DEPENDS "Generate")
add_dependencies(webrtc-generate webrtc-src) add_dependencies(webrtc-generate webrtc-buildtools)
# #
# Run the build command # Run the build command