From f0d2c97881fe5a8b2de67df4762c8ce5f91ef937 Mon Sep 17 00:00:00 2001 From: Axel Isouard Date: Sat, 28 Jan 2017 12:56:19 +0100 Subject: [PATCH] CMake: Remove VERBATIM flag, fix gn gen arguments --- CMakeModules/LibWebRTCCommand.cmake | 1 - Targets/WebRTC/CMakeLists.txt | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/CMakeModules/LibWebRTCCommand.cmake b/CMakeModules/LibWebRTCCommand.cmake index 6c10346..2d8077b 100644 --- a/CMakeModules/LibWebRTCCommand.cmake +++ b/CMakeModules/LibWebRTCCommand.cmake @@ -14,7 +14,6 @@ function(libwebrtc_command) COMMAND ${PREFIX_EXECUTE} ${COMMAND_COMMAND} COMMAND ${CMAKE_COMMAND} -E touch ${STAMP_FILE} WORKING_DIRECTORY ${COMMAND_WORKING_DIRECTORY} - VERBATIM ) add_custom_target(${COMMAND_NAME} ALL DEPENDS ${STAMP_FILE}) diff --git a/Targets/WebRTC/CMakeLists.txt b/Targets/WebRTC/CMakeLists.txt index cd00db8..f2f5dc2 100644 --- a/Targets/WebRTC/CMakeLists.txt +++ b/Targets/WebRTC/CMakeLists.txt @@ -67,7 +67,7 @@ libwebrtc_command( # # 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) set(_GEN_ARGS ${_GEN_ARGS} is_debug=false) @@ -81,10 +81,10 @@ endif (NOT BUILD_TESTS) if (WIN32) 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) 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) libwebrtc_command(