From 096cac5e6538bb85c3c51fca013ef4bb2cbcf974 Mon Sep 17 00:00:00 2001
From: Guido Vranken <guidovranken@gmail.com>
Date: Thu, 19 Jul 2018 00:05:45 +0200
Subject: [PATCH 1/2] Propagate original CMAKE_CXX_FLAGS to jsoncpp compilation

---
 cmake/jsoncpp.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmake/jsoncpp.cmake b/cmake/jsoncpp.cmake
index e886c6092..a6ca0e7fa 100644
--- a/cmake/jsoncpp.cmake
+++ b/cmake/jsoncpp.cmake
@@ -34,7 +34,7 @@ ExternalProject_Add(jsoncpp-project
                -DCMAKE_POSITION_INDEPENDENT_CODE=${BUILD_SHARED_LIBS}
                -DJSONCPP_WITH_TESTS=OFF
                -DJSONCPP_WITH_PKGCONFIG_SUPPORT=OFF
-               -DCMAKE_CXX_FLAGS=${JSONCPP_EXTRA_FLAGS}
+               -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS} ${JSONCPP_EXTRA_FLAGS}
                -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
     ${byproducts}
 )

From fb0e3b25d00320fd49817ff807a9bfaf1fe16062 Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Fri, 3 Aug 2018 16:50:08 +0200
Subject: [PATCH 2/2] Rename JSONCPP_EXTRA_FLAGS to JSONCPP_CXX_FLAGS, add
 EMSCRIPTEN workaround and remove obsolete MSVC workaround.

---
 cmake/jsoncpp.cmake | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/cmake/jsoncpp.cmake b/cmake/jsoncpp.cmake
index a6ca0e7fa..ea3218efc 100644
--- a/cmake/jsoncpp.cmake
+++ b/cmake/jsoncpp.cmake
@@ -10,8 +10,16 @@ set(prefix "${CMAKE_BINARY_DIR}/deps")
 set(JSONCPP_LIBRARY "${prefix}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}jsoncpp${CMAKE_STATIC_LIBRARY_SUFFIX}")
 set(JSONCPP_INCLUDE_DIR "${prefix}/include")
 
-if(NOT MSVC)
-    set(JSONCPP_EXTRA_FLAGS "-std=c++11")
+# TODO: Investigate why this breaks some emscripten builds and
+# check whether this can be removed after updating the emscripten
+# versions used in the CI runs.
+if(EMSCRIPTEN)
+    # Do not include all flags in CMAKE_CXX_FLAGS for emscripten,
+    # but only use -std=c++11. Using all flags causes build failures
+    # at the moment.
+    set(JSONCPP_CXX_FLAGS -std=c++11)
+else()
+    set(JSONCPP_CXX_FLAGS ${CMAKE_CXX_FLAGS})
 endif()
 
 set(byproducts "")
@@ -34,7 +42,7 @@ ExternalProject_Add(jsoncpp-project
                -DCMAKE_POSITION_INDEPENDENT_CODE=${BUILD_SHARED_LIBS}
                -DJSONCPP_WITH_TESTS=OFF
                -DJSONCPP_WITH_PKGCONFIG_SUPPORT=OFF
-               -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS} ${JSONCPP_EXTRA_FLAGS}
+               -DCMAKE_CXX_FLAGS=${JSONCPP_CXX_FLAGS}
                -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
     ${byproducts}
 )