diff options
| author | Alex Beregszaszi <alex@rtfs.hu> | 2018-08-08 20:28:10 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-08 20:28:10 +0800 |
| commit | 22461ca939fdd1f1bdeb879704e3c0c7628e8571 (patch) | |
| tree | 66f1c2678673a07e378f8d0682b9ea80c8eca440 | |
| parent | 42447a14ebc146dd3ff3034360e85bebe3f34ce6 (diff) | |
| parent | fb0e3b25d00320fd49817ff807a9bfaf1fe16062 (diff) | |
| download | dexon-solidity-22461ca939fdd1f1bdeb879704e3c0c7628e8571.tar dexon-solidity-22461ca939fdd1f1bdeb879704e3c0c7628e8571.tar.gz dexon-solidity-22461ca939fdd1f1bdeb879704e3c0c7628e8571.tar.bz2 dexon-solidity-22461ca939fdd1f1bdeb879704e3c0c7628e8571.tar.lz dexon-solidity-22461ca939fdd1f1bdeb879704e3c0c7628e8571.tar.xz dexon-solidity-22461ca939fdd1f1bdeb879704e3c0c7628e8571.tar.zst dexon-solidity-22461ca939fdd1f1bdeb879704e3c0c7628e8571.zip | |
Merge pull request #4528 from guidovranken/propagate_CMAKE_CXX_FLAGS_jsoncpp
Propagate original CMAKE_CXX_FLAGS to jsoncpp compilation
| -rw-r--r-- | cmake/jsoncpp.cmake | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/cmake/jsoncpp.cmake b/cmake/jsoncpp.cmake index e886c609..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=${JSONCPP_EXTRA_FLAGS} + -DCMAKE_CXX_FLAGS=${JSONCPP_CXX_FLAGS} -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} ${byproducts} ) |