Define WEBRTC_BRANCH_HEAD and WEBRTC_REVISION when required

This commit is contained in:
Axel Isouard 2017-03-19 18:55:36 +01:00
parent 16578cdd5c
commit 64690d1a30
No known key found for this signature in database
GPG key ID: 4E64BB3EAAF31C29

View file

@ -50,6 +50,23 @@ if (NOT HAS_OWN_DEPOT_TOOLS)
set(DEPOT_TOOLS_PATH ${CMAKE_BINARY_DIR}/depot_tools/src/depot-tools) set(DEPOT_TOOLS_PATH ${CMAKE_BINARY_DIR}/depot_tools/src/depot-tools)
endif (NOT HAS_OWN_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( ExternalProject_Add(
webrtc-src webrtc-src
@ -68,16 +85,7 @@ ExternalProject_Add(
INSTALL_COMMAND "" INSTALL_COMMAND ""
CMAKE_ARGS CMAKE_ARGS
-DDEPOT_TOOLS_PATH:PATH=${DEPOT_TOOLS_PATH} ${_WEBRTC_CMAKE_ARGS}
-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}
) )
if (MSVC OR XCODE) if (MSVC OR XCODE)