diff options
| author | Alex Beregszaszi <alex@rtfs.hu> | 2018-04-21 04:10:24 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-21 04:10:24 +0800 |
| commit | c8167a9acd8b558e87181a460a3c4fc148e1c43f (patch) | |
| tree | e7702e2bcd082a0cbed39f62cb617a8984413671 | |
| parent | 72b0412ef68f332c9dcdc66b554aabc3fb69ba59 (diff) | |
| parent | d224d6f98b3de028289594f63345f5377e5f9014 (diff) | |
| download | dexon-solidity-c8167a9acd8b558e87181a460a3c4fc148e1c43f.tar dexon-solidity-c8167a9acd8b558e87181a460a3c4fc148e1c43f.tar.gz dexon-solidity-c8167a9acd8b558e87181a460a3c4fc148e1c43f.tar.bz2 dexon-solidity-c8167a9acd8b558e87181a460a3c4fc148e1c43f.tar.lz dexon-solidity-c8167a9acd8b558e87181a460a3c4fc148e1c43f.tar.xz dexon-solidity-c8167a9acd8b558e87181a460a3c4fc148e1c43f.tar.zst dexon-solidity-c8167a9acd8b558e87181a460a3c4fc148e1c43f.zip | |
Merge pull request #3933 from ethereum/jsoncpp-cmake
Fixes jsoncpp compilation when it is also installed system-wide
| -rw-r--r-- | CMakeLists.txt | 1 | ||||
| -rw-r--r-- | libevmasm/CMakeLists.txt | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 1844b2ed..4ac56b43 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -21,6 +21,7 @@ include(EthCcache) # Let's find our dependencies include(EthDependencies) include(jsoncpp) +include_directories(${JSONCPP_INCLUDE_DIR}) find_package(Threads) diff --git a/libevmasm/CMakeLists.txt b/libevmasm/CMakeLists.txt index cfd59dff..86192c1b 100644 --- a/libevmasm/CMakeLists.txt +++ b/libevmasm/CMakeLists.txt @@ -2,4 +2,4 @@ file(GLOB sources "*.cpp") file(GLOB headers "*.h") add_library(evmasm ${sources} ${headers}) -target_link_libraries(evmasm PUBLIC jsoncpp devcore) +target_link_libraries(evmasm PUBLIC devcore) |