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

Fix the environment variables forever, add .bat suffix for win32

Browse source
This commit is contained in:
Axel Isouard 2017-03-19 09:17:53 -07:00
parent c8a3e8eb8a
commit 7950fa7e8a
3 changed files with 29 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
CMakeModules/Environment.cmake
View file

@ -1,31 +1,34 @@
set(_WEBRTC_PATH ${DEPOT_TOOLS_PATH}) if (ENVIRONMENT_INCLUDED)
set(_DEPOT_TOOLS_ENV PATH=${_WEBRTC_PATH}) return()
endif (ENVIRONMENT_INCLUDED)
set(ENVIRONMENT_INCLUDED true)
if (WIN32) if (WIN32)
get_filename_component(DEPOT_TOOLS_PYTHON_PATH get_filename_component(DEPOT_TOOLS_PYTHON_PATH
"${_WEBRTC_PATH}/python276_bin" "${_WEBRTC_PATH}/python276_bin"
REALPATH) REALPATH)
list(APPEND _WEBRTC_PATH ${DEPOT_TOOLS_PYTHON_PATH}) list(APPEND _WEBRTC_PATH "${DEPOT_TOOLS_PYTHON_PATH}")
endif (WIN32) endif (WIN32)
list(APPEND _WEBRTC_PATH $ENV{PATH}) list(APPEND _WEBRTC_PATH ${DEPOT_TOOLS_PATH} $ENV{PATH})
if (WIN32)
string(REGEX REPLACE "/" "\\\\" _WEBRTC_PATH "${_WEBRTC_PATH}")
string(REGEX REPLACE ";" "\\\;" _WEBRTC_PATH "${_WEBRTC_PATH}")
else (WIN32)
string(REGEX REPLACE ";" ":" _WEBRTC_PATH "${_WEBRTC_PATH}")
endif (WIN32)
get_filename_component(_CHROMIUM_PYTHONPATH get_filename_component(_CHROMIUM_PYTHONPATH
"${CMAKE_SOURCE_DIR}/build" "${CMAKE_SOURCE_DIR}/build"
REALPATH) REALPATH)
set(_WEBRTC_ENV if (WIN32)
PATH=\"${_WEBRTC_PATH}\" string(REGEX REPLACE "/" "\\\\" _WEBRTC_PATH "${_WEBRTC_PATH}")
PYTHONPATH=\"${_CHROMIUM_PYTHONPATH}\" string(REGEX REPLACE "/" "\\\\" _CHROMIUM_PYTHONPATH "${_CHROMIUM_PYTHONPATH}")
string(REGEX REPLACE ";" "\\\\\\\;" _WEBRTC_PATH "${_WEBRTC_PATH}")
else (WIN32)
string(REGEX REPLACE ";" ":" _WEBRTC_PATH "${_WEBRTC_PATH}")
endif (WIN32)
set(_ENV
PATH="${_WEBRTC_PATH}"
PYTHONPATH="${_CHROMIUM_PYTHONPATH}"
DEPOT_TOOLS_WIN_TOOLCHAIN=0 DEPOT_TOOLS_WIN_TOOLCHAIN=0
DEPOT_TOOLS_UPDATE=0 DEPOT_TOOLS_UPDATE=0
CHROME_HEADLESS=1) CHROME_HEADLESS=1)
set(PREFIX_EXECUTE cmake -E env ${_WEBRTC_ENV} ${PREFIX_FILENAME}) set(PREFIX_EXECUTE ${CMAKE_COMMAND} -E env "${_ENV}")

8
CMakeModules/Gn.cmake
View file

@ -21,4 +21,10 @@ if (GN_EXTRA_ARGS)
set(_GEN_ARGS ${_GEN_ARGS} ${GN_EXTRA_ARGS}) set(_GEN_ARGS ${_GEN_ARGS} ${GN_EXTRA_ARGS})
endif (GN_EXTRA_ARGS) endif (GN_EXTRA_ARGS)
set(_GEN_COMMAND gn gen ${_NINJA_BUILD_DIR} --args=\"${_GEN_ARGS}\") if (WIN32)
set(_GN_EXECUTABLE gn.bat)
else (WIN32)
set(_GN_EXECUTABLE gn)
endif (WIN32)
set(_GEN_COMMAND ${_GN_EXECUTABLE} gen ${_NINJA_BUILD_DIR} --args=\"${_GEN_ARGS}\")

5
webrtc/CMakeLists.txt.in
View file

@ -57,9 +57,10 @@ elseif (WIN32)
set(_PLATFORM win32) set(_PLATFORM win32)
set(_FOLDER win) set(_FOLDER win)
set(_SUFFIX .exe) set(_SUFFIX .exe)
set(_SCRIPT_SUFFIX .bat)
endif (UNIX AND NOT APPLE) endif (UNIX AND NOT APPLE)
set(_GN_COMMAND download_from_google_storage --no_resume --platform=${_PLATFORM} set(_GN_COMMAND download_from_google_storage${_SCRIPT_SUFFIX} --no_resume --platform=${_PLATFORM}
--no_auth --bucket chromium-gn --no_auth --bucket chromium-gn
-s src/buildtools/${_FOLDER}/gn${_SUFFIX}.sha1) -s src/buildtools/${_FOLDER}/gn${_SUFFIX}.sha1)
@ -72,7 +73,7 @@ libwebrtc_command(
) )
set(_DEPENDENCIES ${_DEPENDENCIES} webrtc-gn) set(_DEPENDENCIES ${_DEPENDENCIES} webrtc-gn)
set(_CLANG_FORMAT_COMMAND download_from_google_storage --no_resume set(_CLANG_FORMAT_COMMAND download_from_google_storage${_SCRIPT_SUFFIX} --no_resume
--platform=${_PLATFORM} --no_auth --bucket chromium-clang-format --platform=${_PLATFORM} --no_auth --bucket chromium-clang-format
-s src/buildtools/${_FOLDER}/clang-format${_SUFFIX}.sha1) -s src/buildtools/${_FOLDER}/clang-format${_SUFFIX}.sha1)