From 559fb5e0f4349ffe782d2286b1fde80b4a5038d8 Mon Sep 17 00:00:00 2001
From: Axel Isouard <ax@eml.cc>
Date: Sat, 8 Oct 2016 23:19:01 +0200
Subject: [PATCH] CMake: Fix for Windows platform

---
 CMakeModules/Common.cmake    | 16 ++++++++++++++--
 Targets/Build/CMakeLists.txt |  2 +-
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/CMakeModules/Common.cmake b/CMakeModules/Common.cmake
index c1f6c01..504310e 100644
--- a/CMakeModules/Common.cmake
+++ b/CMakeModules/Common.cmake
@@ -1,3 +1,13 @@
+set(ENV_COMMAND export)
+set(ENV_SEP ":")
+set(DEPOTTOOLS_PATH ${CMAKE_SOURCE_DIR}/Dependencies/depot_tools)
+
+if(WIN32)
+    set(ENV_COMMAND set)
+    set(ENV_SEP ";")
+    set(DEPOTTOOLS_PATH "${DEPOTTOOLS_PATH};${DEPOTTOOLS_PATH}/python276_bin;")
+endif(WIN32)
+
 macro(add_libwebrtc_command
         ARG_NAME
         ARG_OUTPUT
@@ -5,11 +15,13 @@ macro(add_libwebrtc_command
         ARG_WORKING_DIRECTORY
         ARG_COMMENT
 )
-    set (ARG_DEPENDENCIES ${ARGN})
+    set(ARG_DEPENDENCIES ${ARGN})
 
     add_custom_command(
             OUTPUT  ${ARG_OUTPUT}
-            COMMAND export "PATH=${CMAKE_SOURCE_DIR}/Dependencies/depot_tools:$ENV{PATH}" && ${ARG_COMMAND}
+            COMMAND ${ENV_COMMAND} "DEPOT_TOOLS_WIN_TOOLCHAIN=0"
+            COMMAND ${ENV_COMMAND} "PATH=${DEPOTTOOLS_PATH}${ENV_SEP}$ENV{PATH}"
+            COMMAND ${ARG_COMMAND}
             WORKING_DIRECTORY ${ARG_WORKING_DIRECTORY}
             COMMENT ${ARG_COMMENT}
     )
diff --git a/Targets/Build/CMakeLists.txt b/Targets/Build/CMakeLists.txt
index 3b9311a..504877f 100644
--- a/Targets/Build/CMakeLists.txt
+++ b/Targets/Build/CMakeLists.txt
@@ -14,7 +14,7 @@ if(NOT BUILD_TESTS)
     set(LIBWEBRTC_GEN_ARGS ${LIBWEBRTC_GEN_ARGS} rtc_include_tests=false)
 endif(NOT BUILD_TESTS)
 
-set(GENERATE_COMMAND gn gen out/Default --args='${LIBWEBRTC_GEN_ARGS}')
+set(GENERATE_COMMAND gn gen out/Default --args="${LIBWEBRTC_GEN_ARGS}")
 
 add_libwebrtc_command(libwebrtc_generate_build
         ${CMAKE_BINARY_DIR}/Nevermind