diff options
| author | chriseth <chris@ethereum.org> | 2018-05-18 23:18:03 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-18 23:18:03 +0800 |
| commit | 5157c1058c34aee64a0dbbf33c7b63c84240a3a5 (patch) | |
| tree | 4220877b86a64f517eb01303e5ec2b44cb4419ac | |
| parent | 4d7b092cb4eabf7722b1161fda225e36097debc1 (diff) | |
| parent | 7db058074b97bdc6a36e372f8708d3adee62991c (diff) | |
| download | dexon-solidity-5157c1058c34aee64a0dbbf33c7b63c84240a3a5.tar.gz dexon-solidity-5157c1058c34aee64a0dbbf33c7b63c84240a3a5.tar.zst dexon-solidity-5157c1058c34aee64a0dbbf33c7b63c84240a3a5.zip | |
Merge pull request #4160 from ethereum/jsoncpp-libdir
CMake: Fix libdir for jsoncpp external project in special case
| -rw-r--r-- | cmake/jsoncpp.cmake | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/cmake/jsoncpp.cmake b/cmake/jsoncpp.cmake index 3d6b37ed..cc2da7e7 100644 --- a/cmake/jsoncpp.cmake +++ b/cmake/jsoncpp.cmake @@ -7,8 +7,14 @@ else() endif() include(GNUInstallDirs) +set(libdir ${CMAKE_INSTALL_LIBDIR}) +if(CMAKE_LIBRARY_ARCHITECTURE) + # Do not use Debian multiarch library dir. + string(REPLACE "/${CMAKE_LIBRARY_ARCHITECTURE}" "" libdir ${libdir}) +endif() + set(prefix "${CMAKE_BINARY_DIR}/deps") -set(JSONCPP_LIBRARY "${prefix}/${CMAKE_INSTALL_LIBDIR}/${CMAKE_STATIC_LIBRARY_PREFIX}jsoncpp${CMAKE_STATIC_LIBRARY_SUFFIX}") +set(JSONCPP_LIBRARY "${prefix}/${libdir}/${CMAKE_STATIC_LIBRARY_PREFIX}jsoncpp${CMAKE_STATIC_LIBRARY_SUFFIX}") set(JSONCPP_INCLUDE_DIR "${prefix}/include") if(NOT MSVC) |