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 for Windows platform

Browse source
This commit is contained in:
Axel Isouard 2016-10-08 23:19:01 +02:00
parent 2c762585d1
commit 559fb5e0f4
2 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
CMakeModules/Common.cmake
View file

@ -1,3 +1,13 @@
set(ENV_COMMAND export)
set(ENV_SEP ":")
set(DEPOTTOOLS_PATH ${CMAKE_SOURCE_DIR}/Dependencies/depot_tools)
if(WIN32)
set(ENV_COMMAND set)
set(ENV_SEP ";")
set(DEPOTTOOLS_PATH "${DEPOTTOOLS_PATH};${DEPOTTOOLS_PATH}/python276_bin;")
endif(WIN32)
macro(add_libwebrtc_command macro(add_libwebrtc_command
ARG_NAME ARG_NAME
ARG_OUTPUT ARG_OUTPUT
@ -9,7 +19,9 @@ macro(add_libwebrtc_command
add_custom_command( add_custom_command(
OUTPUT ${ARG_OUTPUT} OUTPUT ${ARG_OUTPUT}
COMMAND export "PATH=${CMAKE_SOURCE_DIR}/Dependencies/depot_tools:$ENV{PATH}" && ${ARG_COMMAND} COMMAND ${ENV_COMMAND} "DEPOT_TOOLS_WIN_TOOLCHAIN=0"
COMMAND ${ENV_COMMAND} "PATH=${DEPOTTOOLS_PATH}${ENV_SEP}$ENV{PATH}"
COMMAND ${ARG_COMMAND}
WORKING_DIRECTORY ${ARG_WORKING_DIRECTORY} WORKING_DIRECTORY ${ARG_WORKING_DIRECTORY}
COMMENT ${ARG_COMMENT} COMMENT ${ARG_COMMENT}
) )

2
Targets/Build/CMakeLists.txt
View file

@ -14,7 +14,7 @@ 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(GENERATE_COMMAND gn gen out/Default --args='${LIBWEBRTC_GEN_ARGS}') set(GENERATE_COMMAND gn gen out/Default --args="${LIBWEBRTC_GEN_ARGS}")
add_libwebrtc_command(libwebrtc_generate_build add_libwebrtc_command(libwebrtc_generate_build
${CMAKE_BINARY_DIR}/Nevermind ${CMAKE_BINARY_DIR}/Nevermind