diff options
| author | Alex Beregszaszi <alex@rtfs.hu> | 2018-04-23 21:39:14 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-23 21:39:14 +0800 |
| commit | c7ee2ca0b9eb6c36ddb15b70f341975bdff47aad (patch) | |
| tree | 8e05d4feae3fbb1389911af6561681f41f62c51e /cmake | |
| parent | 2fae248dbe50bed93268529724c1e3691f3c4a3f (diff) | |
| parent | fa2a28abc2484390a97c83af58646e4327673e96 (diff) | |
| download | dexon-solidity-c7ee2ca0b9eb6c36ddb15b70f341975bdff47aad.tar.gz dexon-solidity-c7ee2ca0b9eb6c36ddb15b70f341975bdff47aad.tar.zst dexon-solidity-c7ee2ca0b9eb6c36ddb15b70f341975bdff47aad.zip | |
Merge pull request #3467 from aarlt/strict-mode-jsoncpp-1.8.4
cmake/jsoncpp.cmake: update to jsoncpp v1.8.4
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/jsoncpp.cmake | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/cmake/jsoncpp.cmake b/cmake/jsoncpp.cmake index 6ddf4c74..3d6b37ed 100644 --- a/cmake/jsoncpp.cmake +++ b/cmake/jsoncpp.cmake @@ -6,17 +6,15 @@ else() set(JSONCPP_CMAKE_COMMAND ${CMAKE_COMMAND}) endif() -# Disable implicit fallthrough warning in jsoncpp for gcc >= 7 until the upstream handles it properly -if (("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU") AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7.0) - set(JSONCCP_EXTRA_FLAGS -Wno-implicit-fallthrough) -else() - set(JSONCCP_EXTRA_FLAGS "") -endif() - +include(GNUInstallDirs) set(prefix "${CMAKE_BINARY_DIR}/deps") -set(JSONCPP_LIBRARY "${prefix}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}jsoncpp${CMAKE_STATIC_LIBRARY_SUFFIX}") +set(JSONCPP_LIBRARY "${prefix}/${CMAKE_INSTALL_LIBDIR}/${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") +endif() + set(byproducts "") if(CMAKE_VERSION VERSION_GREATER 3.1) set(byproducts BUILD_BYPRODUCTS "${JSONCPP_LIBRARY}") @@ -25,9 +23,9 @@ endif() ExternalProject_Add(jsoncpp-project PREFIX "${prefix}" DOWNLOAD_DIR "${CMAKE_SOURCE_DIR}/deps/downloads" - DOWNLOAD_NAME jsoncpp-1.7.7.tar.gz - URL https://github.com/open-source-parsers/jsoncpp/archive/1.7.7.tar.gz - URL_HASH SHA256=087640ebcf7fbcfe8e2717a0b9528fff89c52fcf69fa2a18cc2b538008098f97 + DOWNLOAD_NAME jsoncpp-1.8.4.tar.gz + URL https://github.com/open-source-parsers/jsoncpp/archive/1.8.4.tar.gz + URL_HASH SHA256=c49deac9e0933bcb7044f08516861a2d560988540b23de2ac1ad443b219afdb6 CMAKE_COMMAND ${JSONCPP_CMAKE_COMMAND} CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR> -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} @@ -36,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=${JSONCCP_EXTRA_FLAGS} + -DCMAKE_CXX_FLAGS=${JSONCPP_EXTRA_FLAGS} # Overwrite build and install commands to force Release build on MSVC. BUILD_COMMAND cmake --build <BINARY_DIR> --config Release INSTALL_COMMAND cmake --build <BINARY_DIR> --config Release --target install |