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

Remove prefix files, use cmake -E env

Browse source
This commit is contained in:
Axel Isouard 2017-03-19 14:14:55 +01:00
parent 5d3887b918
commit c8a3e8eb8a
No known key found for this signature in database
GPG key ID: 4E64BB3EAAF31C29
2 changed files with 13 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
CMakeModules/Environment.cmake
View file

@ -21,26 +21,11 @@ get_filename_component(_CHROMIUM_PYTHONPATH
"${CMAKE_SOURCE_DIR}/build" "${CMAKE_SOURCE_DIR}/build"
REALPATH) REALPATH)
if (WIN32) set(_WEBRTC_ENV
set(PREFIX_FILENAME ${CMAKE_BINARY_DIR}/prefix.bat) PATH=\"${_WEBRTC_PATH}\"
set(PREFIX_COMMAND set) PYTHONPATH=\"${_CHROMIUM_PYTHONPATH}\"
set(PREFIX_HEADER "@ECHO OFF") DEPOT_TOOLS_WIN_TOOLCHAIN=0
set(PREFIX_EVAL "%*") DEPOT_TOOLS_UPDATE=0
set(PREFIX_EXECUTE cmd /c ${PREFIX_FILENAME}) CHROME_HEADLESS=1)
else (WIN32)
set(PREFIX_FILENAME ${CMAKE_BINARY_DIR}/prefix.sh)
set(PREFIX_COMMAND export)
set(PREFIX_HEADER "")
set(PREFIX_EVAL eval\ $@)
set(PREFIX_EXECUTE /bin/sh ${PREFIX_FILENAME})
endif (WIN32)
file(WRITE ${PREFIX_FILENAME} "${PREFIX_HEADER}
${PREFIX_COMMAND} PATH=${_WEBRTC_PATH}
${PREFIX_COMMAND} PYTHONPATH=${_CHROMIUM_PYTHONPATH}
${PREFIX_COMMAND} DEPOT_TOOLS_WIN_TOOLCHAIN=0
${PREFIX_COMMAND} DEPOT_TOOLS_UPDATE=0
${PREFIX_COMMAND} CHROME_HEADLESS=1
${PREFIX_EVAL}
")
set(PREFIX_EXECUTE cmake -E env ${_WEBRTC_ENV} ${PREFIX_FILENAME})

12
CMakeModules/Gn.cmake
View file

@ -1,24 +1,24 @@
set(_GEN_ARGS "use_gold=false target_cpu=\\\"${TARGET_CPU}\\\" target_os=\\\"${TARGET_OS}\\\"") set(_GEN_ARGS use_gold=false target_cpu=\\"${TARGET_CPU}\\" target_os=\\"${TARGET_OS}\\")
if (MSVC OR XCODE) if (MSVC OR XCODE)
set(_GEN_ARGS ${_GEN_ARGS} is_debug=$<$<CONFIG:Debug>:true>$<$<CONFIG:Release>:false>$<$<CONFIG:RelWithDebInfo>:false>$<$<CONFIG:MinSizeRel>:false>) set(_GEN_ARGS ${_GEN_ARGS} is_debug=$<$<CONFIG:Debug>:true>$<$<CONFIG:Release>:false>$<$<CONFIG:RelWithDebInfo>:false>$<$<CONFIG:MinSizeRel>:false>)
set(_NINJA_BUILD_DIR out/$<$<CONFIG:Debug>:Debug>$<$<CONFIG:Release>:Release>$<$<CONFIG:RelWithDebInfo>:Release>$<$<CONFIG:MinSizeRel>:Release>) set(_NINJA_BUILD_DIR out/$<$<CONFIG:Debug>:Debug>$<$<CONFIG:Release>:Release>$<$<CONFIG:RelWithDebInfo>:Release>$<$<CONFIG:MinSizeRel>:Release>)
elseif (CMAKE_BUILD_TYPE MATCHES Debug) elseif (CMAKE_BUILD_TYPE MATCHES Debug)
set(_GEN_ARGS "${_GEN_ARGS} is_debug=true") set(_GEN_ARGS ${_GEN_ARGS} is_debug=true)
set(_NINJA_BUILD_DIR out/Debug) set(_NINJA_BUILD_DIR out/Debug)
else (MSVC OR XCODE) else (MSVC OR XCODE)
set(_GEN_ARGS "${_GEN_ARGS} is_debug=false") set(_GEN_ARGS ${_GEN_ARGS} is_debug=false)
set(_NINJA_BUILD_DIR out/Release) set(_NINJA_BUILD_DIR out/Release)
endif (MSVC OR XCODE) endif (MSVC OR XCODE)
if (BUILD_TESTS) if (BUILD_TESTS)
set(_GEN_ARGS "${_GEN_ARGS} rtc_include_tests=true") set(_GEN_ARGS ${_GEN_ARGS} rtc_include_tests=true)
else (BUILD_TESTS) else (BUILD_TESTS)
set(_GEN_ARGS "${_GEN_ARGS} rtc_include_tests=false") set(_GEN_ARGS ${_GEN_ARGS} rtc_include_tests=false)
endif (BUILD_TESTS) endif (BUILD_TESTS)
if (GN_EXTRA_ARGS) 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}\") set(_GEN_COMMAND gn gen ${_NINJA_BUILD_DIR} --args=\"${_GEN_ARGS}\")