From ffd60ae7d81706a80c38892a3490251aa2e35244 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20M=C3=BCllenhaupt?= <mm+git@netlair.de>
Date: Thu, 5 Oct 2017 19:14:18 +0200
Subject: [PATCH] build jsoncpp

---
 CMakeModules/Gn.cmake    | 2 +-
 libwebrtc/CMakeLists.txt | 4 +++-
 webrtc/CMakeLists.txt.in | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/CMakeModules/Gn.cmake b/CMakeModules/Gn.cmake
index 9152904..6cb41dd 100644
--- a/CMakeModules/Gn.cmake
+++ b/CMakeModules/Gn.cmake
@@ -1,4 +1,4 @@
-set(_GEN_ARGS use_gold=false target_cpu=\\"${TARGET_CPU}\\" target_os=\\"${TARGET_OS}\\" is_component_build=false)
+set(_GEN_ARGS use_gold=false target_cpu=\\"${TARGET_CPU}\\" target_os=\\"${TARGET_OS}\\" is_component_build=false rtc_build_json=true)
 
 if (MSVC OR XCODE)
   set(_GEN_ARGS ${_GEN_ARGS} is_debug=$<$<CONFIG:Debug>:true>$<$<CONFIG:Release>:false>$<$<CONFIG:RelWithDebInfo>:false>$<$<CONFIG:MinSizeRel>:false>)
diff --git a/libwebrtc/CMakeLists.txt b/libwebrtc/CMakeLists.txt
index 08e316e..aed7b21 100644
--- a/libwebrtc/CMakeLists.txt
+++ b/libwebrtc/CMakeLists.txt
@@ -19,7 +19,6 @@ file(GLOB_RECURSE _OBJ_EXCLUDED
      ${WEBRTC_OUTPUT_DIR}/obj/third_party/protobuf/protoc/*${_OBJ_EXT}
      ${WEBRTC_OUTPUT_DIR}/obj/third_party/protobuf/protobuf_full/*${_OBJ_EXT}
      ${WEBRTC_OUTPUT_DIR}/obj/webrtc/examples/*${_OBJ_EXT}
-     ${WEBRTC_OUTPUT_DIR}/obj/webrtc/tools/*${_OBJ_EXT}
      ${WEBRTC_OUTPUT_DIR}/obj/webrtc/modules/audio_coding/delay_test/utility${_OBJ_EXT}
      ${WEBRTC_OUTPUT_DIR}/obj/webrtc/modules/modules_tests/utility${_OBJ_EXT}
      ${WEBRTC_OUTPUT_DIR}/obj/webrtc/modules/video_capture/video_capture/video_capture_external${_OBJ_EXT}
@@ -46,6 +45,9 @@ set_target_properties(webrtc PROPERTIES
 install(DIRECTORY ${WEBRTC_SOURCE_DIR}
         DESTINATION "include"
         FILES_MATCHING PATTERN "*.h")
+install(DIRECTORY "${WEBRTC_SOURCE_DIR}/../third_party/jsoncpp/source/include/"
+        DESTINATION "include/third_party"
+        FILES_MATCHING PATTERN "*.h")
 
 #
 # Install library
diff --git a/webrtc/CMakeLists.txt.in b/webrtc/CMakeLists.txt.in
index 50b7349..1898836 100644
--- a/webrtc/CMakeLists.txt.in
+++ b/webrtc/CMakeLists.txt.in
@@ -144,7 +144,7 @@ libwebrtc_command(
     DEPENDS ${_DEPENDENCIES}
 )
 
-set(_NINJA_COMMAND ninja ${NINJA_ARGS} -C ${_NINJA_BUILD_DIR} webrtc system_wrappers_default)
+set(_NINJA_COMMAND ninja ${NINJA_ARGS} -C ${_NINJA_BUILD_DIR} webrtc system_wrappers_default jsoncpp)
 
 if (BUILD_TESTS)
   set(_NINJA_COMMAND ${_NINJA_COMMAND} webrtc_tests)