Browse Source

compiles fine now (on Linux) with both cryptopp and json-rpc-cpp dependencies

cl-refactor
sveneh 10 years ago
parent
commit
b82e3125ce
  1. 8
      CMakeLists.txt
  2. 2
      eth/CMakeLists.txt
  3. 4
      libweb3jsonrpc/CMakeLists.txt
  4. 2
      neth/CMakeLists.txt
  5. 2
      test/CMakeLists.txt

8
CMakeLists.txt

@ -118,7 +118,7 @@ endif()
add_subdirectory(lllc)
add_subdirectory(solc)
add_subdirectory(sc)
if (JSONRPC_LS)
if (JSON_RPC_CPP_FOUND)
add_subdirectory(libweb3jsonrpc)
endif()
if (NOT LANGUAGES)
@ -152,7 +152,11 @@ if (NOT LANGUAGES)
add_subdirectory(libjsqrc)
add_subdirectory(libqethereum)
add_subdirectory(alethzero)
if (NOT JSON_RPC_CPP_FOUND)
message (FATAL_ERROR "AlethZero requires json-rpc-cpp!")
else()
add_subdirectory(alethzero)
endif()
add_subdirectory(third)
if(QTQML)
#add_subdirectory(iethxi)

2
eth/CMakeLists.txt

@ -16,7 +16,7 @@ if(MINIUPNPC_LS)
target_link_libraries(${EXECUTABLE} ${MINIUPNPC_LS})
endif()
target_link_libraries(${EXECUTABLE} ${LEVELDB_LS})
if(JSONRPC_LS)
if(JSON_RPC_CPP_FOUND)
target_link_libraries(${EXECUTABLE} web3jsonrpc)
endif()
if(READLINE_LS)

4
libweb3jsonrpc/CMakeLists.txt

@ -22,9 +22,7 @@ if(MINIUPNPC_LS)
target_link_libraries(${EXECUTABLE} ${MINIUPNPC_LS})
endif()
target_link_libraries(${EXECUTABLE} ${LEVELDB_LS})
target_link_libraries(${EXECUTABLE} ${CRYPTOPP_LS})
target_link_libraries(${EXECUTABLE} ${JSONRPC_LS})
target_link_libraries(${EXECUTABLE} ${LEVELDB_LS})
target_link_libraries(${EXECUTABLE} ${JSON_RPC_CPP_LIBRARIES})
if(READLINE_LS)
target_link_libraries(${EXECUTABLE} ${READLINE_LS})
endif()

2
neth/CMakeLists.txt

@ -17,7 +17,7 @@ if(MINIUPNPC_LS)
target_link_libraries(${EXECUTABLE} ${MINIUPNPC_LS})
endif()
target_link_libraries(${EXECUTABLE} ${LEVELDB_LS})
if(JSONRPC_LS)
if(JSON_RPC_CPP_FOUND)
target_link_libraries(${EXECUTABLE} web3jsonrpc)
endif()

2
test/CMakeLists.txt

@ -21,7 +21,7 @@ target_link_libraries(testeth webthree)
#TODO this on should not be necessary, it should have been brought in from ethcore dependency...
target_link_libraries(testeth ${CRYPTOPP_LIBRARIES})
if(JSONRPC_LS)
if(JSON_RPC_CPP_FOUND)
target_link_libraries(testeth web3jsonrpc)
endif()

Loading…
Cancel
Save