cerc-io/solidity
10
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #3933 from ethereum/jsoncpp-cmake

Browse Source 
Fixes jsoncpp compilation when it is also installed system-wide
This commit is contained in:
Alex Beregszaszi 2018-04-20 21:10:24 +01:00 committed by GitHub
commit c8167a9acd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -21,6 +21,7 @@ include(EthCcache)
# Let's find our dependencies # Let's find our dependencies
include(EthDependencies) include(EthDependencies)
include(jsoncpp) include(jsoncpp)
include_directories(${JSONCPP_INCLUDE_DIR})
find_package(Threads) find_package(Threads)

2
libevmasm/CMakeLists.txt
View File

@ -2,4 +2,4 @@ file(GLOB sources "*.cpp")
file(GLOB headers "*.h") file(GLOB headers "*.h")
add_library(evmasm ${sources} ${headers}) add_library(evmasm ${sources} ${headers})
target_link_libraries(evmasm PUBLIC jsoncpp devcore) target_link_libraries(evmasm PUBLIC devcore)