diff options
| author | Christian <c@ethdev.com> | 2014-11-03 23:13:40 +0800 |
|---|---|---|
| committer | Christian <c@ethdev.com> | 2014-11-03 23:13:40 +0800 |
| commit | 8a9da8648d7eeeab5dc7951d76b5c8595badef5e (patch) | |
| tree | 6647f477830a591a94d278eb53f53e1136b48a0e /CMakeLists.txt | |
| parent | dab09c595a46a1ab72e9b56578cd203095a61e92 (diff) | |
| parent | 07d08e3af3afb99014cec91d39ce0ca36d710517 (diff) | |
| download | dexon-solidity-8a9da8648d7eeeab5dc7951d76b5c8595badef5e.tar.gz dexon-solidity-8a9da8648d7eeeab5dc7951d76b5c8595badef5e.tar.zst dexon-solidity-8a9da8648d7eeeab5dc7951d76b5c8595badef5e.zip | |
Merge remote-tracking branch 'ethereum/develop' into sol_contractCompiler
Conflicts:
alethzero/CMakeLists.txt
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 6aa99b61..a11c9fa1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,8 +4,6 @@ aux_source_directory(. SRC_LIST) list(REMOVE_ITEM SRC_LIST "./createRandomTest.cpp") include_directories(..) -link_directories(../libethcore) -link_directories(../libethereum) file(GLOB HEADERS "*.h") add_executable(testeth ${SRC_LIST} ${HEADERS}) @@ -17,6 +15,10 @@ target_link_libraries(testeth secp256k1) target_link_libraries(testeth gmp) target_link_libraries(testeth solidity) target_link_libraries(testeth ${CRYPTOPP_LS}) +target_link_libraries(testeth webthree) +if(JSONRPC_LS) +target_link_libraries(testeth web3jsonrpc) +endif() target_link_libraries(createRandomTest ethereum) target_link_libraries(createRandomTest ethcore) |