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

CMake: Set PATH and PYTHONPATH variables correctly

Browse source
This commit is contained in:
Axel Isouard 2016-10-16 17:09:43 +02:00
parent 30eda4df99
commit 86bb881422
No known key found for this signature in database
GPG key ID: 4E64BB3EAAF31C29
1 changed files with 8 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
CMakeModules/Common.cmake
View file

@ -1,11 +1,8 @@
set(ENV_COMMAND export) set(BUILD_PATH "${CMAKE_BINARY_DIR}/src/build")
set(ENV_SEP ":") set(DEPOTTOOLS_PATH "${CMAKE_SOURCE_DIR}/Dependencies/depot_tools")
set(DEPOTTOOLS_PATH ${CMAKE_SOURCE_DIR}/Dependencies/depot_tools)
if (WIN32) if (WIN32)
set(ENV_COMMAND set) set(DEPOTTOOLS_PATH "${DEPOTTOOLS_PATH};${DEPOTTOOLS_PATH}/python276_bin")
set(ENV_SEP ";")
set(DEPOTTOOLS_PATH "${DEPOTTOOLS_PATH};${DEPOTTOOLS_PATH}/python276_bin;")
endif (WIN32) endif (WIN32)
macro(add_libwebrtc_command macro(add_libwebrtc_command
@ -20,15 +17,15 @@ macro(add_libwebrtc_command
add_custom_command( add_custom_command(
OUTPUT ${ARG_OUTPUT} OUTPUT ${ARG_OUTPUT}
COMMAND set "DEPOT_TOOLS_WIN_TOOLCHAIN=0" COMMAND set "DEPOT_TOOLS_WIN_TOOLCHAIN=0"
COMMAND set "PATH=${DEPOTTOOLS_PATH};${DEPOTTOOLS_PATH}/python276_bin;$ENV{PATH}" COMMAND set "PATH=${DEPOTTOOLS_PATH};$ENV{PATH}"
COMMAND set "PYTHONPATH=${BUILD_PATH}"
COMMAND ${ARG_COMMAND} COMMAND ${ARG_COMMAND}
WORKING_DIRECTORY ${ARG_WORKING_DIRECTORY} WORKING_DIRECTORY ${ARG_WORKING_DIRECTORY}
COMMENT ${ARG_COMMENT}) COMMENT ${ARG_COMMENT})
else (WIN32) else (WIN32)
set(ENV_PREFIX export PATH=${DEPOTTOOLS_PATH}:$ENV{PATH})
add_custom_command( add_custom_command(
OUTPUT ${ARG_OUTPUT} OUTPUT ${ARG_OUTPUT}
COMMAND ${ENV_PREFIX} && ${ARG_COMMAND} COMMAND export PATH=${DEPOTTOOLS_PATH}:${BUILD_PATH}:$ENV{PATH} PYTHONPATH=${BUILD_PATH} && ${ARG_COMMAND}
WORKING_DIRECTORY ${ARG_WORKING_DIRECTORY} WORKING_DIRECTORY ${ARG_WORKING_DIRECTORY}
COMMENT ${ARG_COMMENT}) COMMENT ${ARG_COMMENT})
endif (WIN32) endif (WIN32)