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: Remove VERBATIM flag, fix gn gen arguments

Browse source
This commit is contained in:
Axel Isouard 2017-01-28 12:56:19 +01:00
parent 9392f069e4
commit f0d2c97881
No known key found for this signature in database
GPG key ID: 4E64BB3EAAF31C29
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CMakeModules/LibWebRTCCommand.cmake
View file

@ -14,7 +14,6 @@ function(libwebrtc_command)
COMMAND ${PREFIX_EXECUTE} ${COMMAND_COMMAND} COMMAND ${PREFIX_EXECUTE} ${COMMAND_COMMAND}
COMMAND ${CMAKE_COMMAND} -E touch ${STAMP_FILE} COMMAND ${CMAKE_COMMAND} -E touch ${STAMP_FILE}
WORKING_DIRECTORY ${COMMAND_WORKING_DIRECTORY} WORKING_DIRECTORY ${COMMAND_WORKING_DIRECTORY}
VERBATIM
) )
add_custom_target(${COMMAND_NAME} ALL DEPENDS ${STAMP_FILE}) add_custom_target(${COMMAND_NAME} ALL DEPENDS ${STAMP_FILE})

6
Targets/WebRTC/CMakeLists.txt
View file

@ -67,7 +67,7 @@ libwebrtc_command(
# #
# Generate build files # Generate build files
# #
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 (NOT CMAKE_BUILD_TYPE MATCHES DEBUG) if (NOT CMAKE_BUILD_TYPE MATCHES DEBUG)
set(_GEN_ARGS ${_GEN_ARGS} is_debug=false) set(_GEN_ARGS ${_GEN_ARGS} is_debug=false)
@ -81,10 +81,10 @@ endif (NOT BUILD_TESTS)
if (WIN32) if (WIN32)
set(_GEN_ARGS ${_GEN_ARGS}) set(_GEN_ARGS ${_GEN_ARGS})
set(_GEN_COMMAND gn gen out/Default --args=${_GEN_ARGS}) set(_GEN_COMMAND gn gen out/Default --args="${_GEN_ARGS}")
elseif (UNIX) elseif (UNIX)
set(_GEN_ARGS ${_GEN_ARGS}) set(_GEN_ARGS ${_GEN_ARGS})
set(_GEN_COMMAND gn gen out/Default --args='${_GEN_ARGS}') set(_GEN_COMMAND gn gen out/Default --args='"${_GEN_ARGS}"')
endif (WIN32) endif (WIN32)
libwebrtc_command( libwebrtc_command(