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: Fix path syntax for command prefixes

Browse source
This commit is contained in:
Axel Isouard 2016-12-25 12:52:16 +01:00
parent 7d4f195624
commit 52804400a2
No known key found for this signature in database
GPG key ID: 4E64BB3EAAF31C29
1 changed files with 14 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
Targets/WebRTC/CMakeLists.txt
View file

@ -3,11 +3,6 @@ include(ExternalProject)
# #
# Generate environment variables # Generate environment variables
# #
set(PATH_SEP ":")
if (WIN32)
set(PATH_SEP ";")
endif (WIN32)
set(WEBRTC_PATH ${CMAKE_SOURCE_DIR}/Dependencies/depot_tools) set(WEBRTC_PATH ${CMAKE_SOURCE_DIR}/Dependencies/depot_tools)
if (WIN32) if (WIN32)
@ -29,7 +24,8 @@ get_filename_component(CHROMIUM_PYTHONPATH
"${CMAKE_BINARY_DIR}/src/build" "${CMAKE_BINARY_DIR}/src/build"
REALPATH) REALPATH)
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}\\\")
# #
# Download chromium dependencies # Download chromium dependencies
@ -69,30 +65,11 @@ ExternalProject_Add(webrtc-src
SOURCE_DIR ${CMAKE_BINARY_DIR} SOURCE_DIR ${CMAKE_BINARY_DIR}
DOWNLOAD_DIR ${CMAKE_BINARY_DIR} DOWNLOAD_DIR ${CMAKE_BINARY_DIR}
DOWNLOAD_COMMAND DOWNLOAD_COMMAND ${WEBRTC_PREFIX} ${GCLIENT_CONFIG_COMMAND}
${CMAKE_COMMAND} PATCH_COMMAND ${WEBRTC_PREFIX} ${GCLIENT_SYNC_COMMAND}
-E env \"${WEBRTC_ENV}\" UPDATE_COMMAND ${WEBRTC_PREFIX} ${UPDATE_CLANG_COMMAND}
${GCLIENT_CONFIG_COMMAND} CONFIGURE_COMMAND ${WEBRTC_PREFIX} ${SETUP_LINKS_COMMAND}
BUILD_COMMAND ${RETRIEVE_SYSROOT_COMMAND}
PATCH_COMMAND
${CMAKE_COMMAND}
-E env \"${WEBRTC_ENV}\"
${GCLIENT_SYNC_COMMAND}
UPDATE_COMMAND
${CMAKE_COMMAND}
-E env \"${WEBRTC_ENV}\"
${UPDATE_CLANG_COMMAND}
CONFIGURE_COMMAND
${CMAKE_COMMAND}
-E env \"${WEBRTC_ENV}\"
${SETUP_LINKS_COMMAND}
BUILD_COMMAND
${CMAKE_COMMAND}
-E env \"${WEBRTC_ENV}\"
"${RETRIEVE_SYSROOT_COMMAND}"
INSTALL_COMMAND "" INSTALL_COMMAND ""
@ -121,13 +98,13 @@ if (NOT BUILD_TESTS)
set(LIBWEBRTC_GEN_ARGS ${LIBWEBRTC_GEN_ARGS} rtc_include_tests=false) set(LIBWEBRTC_GEN_ARGS ${LIBWEBRTC_GEN_ARGS} rtc_include_tests=false)
endif (NOT BUILD_TESTS) endif (NOT BUILD_TESTS)
set(WEBRTC_PREFIX ${CMAKE_COMMAND} -E env \"${WEBRTC_ENV}\")
set(LIBWEBRTC_GEN_COMMAND gn gen out/Default --args=\"${LIBWEBRTC_GEN_ARGS}\")
add_custom_command( add_custom_command(
OUTPUT "Generate" OUTPUT "Generate"
COMMAND COMMAND ${WEBRTC_PREFIX} ${LIBWEBRTC_GEN_COMMAND}
${CMAKE_COMMAND}
-E env \"${WEBRTC_ENV}\"
gn gen out/Default --args=\"${LIBWEBRTC_GEN_ARGS}\"
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/src WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/src
COMMENT "Generating build files") COMMENT "Generating build files")
@ -141,13 +118,12 @@ add_dependencies(webrtc-generate webrtc-src)
# #
# Run the build command # Run the build command
# #
set(LIBWEBRTC_BUILD_COMMAND ninja ${NINJA_ARGS} -C out/Default)
add_custom_command( add_custom_command(
OUTPUT "Build" OUTPUT "Build"
COMMAND COMMAND ${WEBRTC_PREFIX} ${LIBWEBRTC_BUILD_COMMAND}
${CMAKE_COMMAND}
-E env \"${WEBRTC_ENV}\"
ninja ${NINJA_ARGS} -C out/Default
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/src WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/src
COMMENT "Building WebRTC") COMMENT "Building WebRTC")