From 64690d1a3017d37f2be36d8fea72d4da88fa8a19 Mon Sep 17 00:00:00 2001 From: Axel Isouard Date: Sun, 19 Mar 2017 18:55:36 +0100 Subject: [PATCH] Define WEBRTC_BRANCH_HEAD and WEBRTC_REVISION when required --- CMakeLists.txt | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4fb8d99..5f9f0a5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -50,6 +50,23 @@ if (NOT HAS_OWN_DEPOT_TOOLS) set(DEPOT_TOOLS_PATH ${CMAKE_BINARY_DIR}/depot_tools/src/depot-tools) endif (NOT HAS_OWN_DEPOT_TOOLS) +set(_WEBRTC_CMAKE_ARGS + -DDEPOT_TOOLS_PATH:PATH=${DEPOT_TOOLS_PATH} + -DGCLIENT_EXECUTABLE:PATH=${GCLIENT_EXECUTABLE} + -DHAS_OWN_DEPOT_TOOLS:PATH=${HAS_OWN_DEPOT_TOOLS} + -DCMAKE_MODULE_PATH:PATH=${CMAKE_MODULE_PATH} + -DTARGET_CPU=${TARGET_CPU} + -DTARGET_OS=${TARGET_OS} + -DWEBRTC_PARENT_DIR:PATH=${CMAKE_BINARY_DIR}/webrtc) + +if (WEBRTC_BRANCH_HEAD) + set(_WEBRTC_CMAKE_ARGS ${_WEBRTC_CMAKE_ARGS} -DWEBRTC_BRANCH_HEAD=${WEBRTC_BRANCH_HEAD}) +endif (WEBRTC_BRANCH_HEAD) + +if (WEBRTC_REVISION) + set(_WEBRTC_CMAKE_ARGS ${_WEBRTC_CMAKE_ARGS} -DWEBRTC_REVISION=${WEBRTC_REVISION}) +endif (WEBRTC_REVISION) + ExternalProject_Add( webrtc-src @@ -68,16 +85,7 @@ ExternalProject_Add( INSTALL_COMMAND "" CMAKE_ARGS - -DDEPOT_TOOLS_PATH:PATH=${DEPOT_TOOLS_PATH} - -DGCLIENT_EXECUTABLE:PATH=${GCLIENT_EXECUTABLE} - -DHAS_OWN_DEPOT_TOOLS:PATH=${HAS_OWN_DEPOT_TOOLS} - -DCMAKE_MODULE_PATH:PATH=${CMAKE_MODULE_PATH} - -DTARGET_CPU=${TARGET_CPU} - -DTARGET_OS=${TARGET_OS} - -DWEBRTC_BRANCH_HEAD=${WEBRTC_BRANCH_HEAD} - -DWEBRTC_PARENT_DIR:PATH=${CMAKE_BINARY_DIR}/webrtc - -DWEBRTC_REVISION=${WEBRTC_REVISION} - -DWEBRTC_ROOT_DIR:PATH=${CMAKE_BINARY_DIR} + ${_WEBRTC_CMAKE_ARGS} ) if (MSVC OR XCODE)