aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Kirchner <daniel@ekpyron.org>2018-08-03 22:50:08 +0800
committerchriseth <chris@ethereum.org>2018-09-13 00:57:14 +0800
commit84d92450767480dcd0748c781e3cbda8e4a82ebd (patch)
treea2f4c573cd49babd0214249c2270ab764ee4fbc5
parentd2d9162bb95c2d3eb2ae57422b24ca5c3b69a935 (diff)
downloaddexon-solidity-84d92450767480dcd0748c781e3cbda8e4a82ebd.tar
dexon-solidity-84d92450767480dcd0748c781e3cbda8e4a82ebd.tar.gz
dexon-solidity-84d92450767480dcd0748c781e3cbda8e4a82ebd.tar.bz2
dexon-solidity-84d92450767480dcd0748c781e3cbda8e4a82ebd.tar.lz
dexon-solidity-84d92450767480dcd0748c781e3cbda8e4a82ebd.tar.xz
dexon-solidity-84d92450767480dcd0748c781e3cbda8e4a82ebd.tar.zst
dexon-solidity-84d92450767480dcd0748c781e3cbda8e4a82ebd.zip
Rename JSONCPP_EXTRA_FLAGS to JSONCPP_CXX_FLAGS, add EMSCRIPTEN workaround and remove obsolete MSVC workaround.
-rw-r--r--cmake/jsoncpp.cmake14
1 files changed, 11 insertions, 3 deletions
diff --git a/cmake/jsoncpp.cmake b/cmake/jsoncpp.cmake
index a6ca0e7f..ea3218ef 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}
)