Browse Source

Clean up and remove some explicit dependencies in cmake files

cl-refactor
Paweł Bylica 10 years ago
parent
commit
e80dffeec5
  1. 3
      alethzero/CMakeLists.txt
  2. 2
      evmjit
  3. 3
      libethereum/CMakeLists.txt
  4. 3
      libevm/CMakeLists.txt
  5. 3
      test/CMakeLists.txt

3
alethzero/CMakeLists.txt

@ -46,9 +46,6 @@ target_link_libraries(${EXECUTABLE} evmcore)
target_link_libraries(${EXECUTABLE} devcore)
target_link_libraries(${EXECUTABLE} web3jsonrpc)
target_link_libraries(${EXECUTABLE} jsqrc)
if (EVMJIT)
target_link_libraries(${EXECUTEABLE} evmjit)
endif()
# eth_install_executable is defined in cmake/EthExecutableHelper.cmake
eth_install_executable(${EXECUTABLE})

2
evmjit

@ -1 +1 @@
Subproject commit 8287c6040a4900cb8b091ffbe284c7f478c60c49
Subproject commit 232f9fee527e454f4008c2c03a9c7dac1c5c85ff

3
libethereum/CMakeLists.txt

@ -34,9 +34,6 @@ target_link_libraries(${EXECUTABLE} p2p)
target_link_libraries(${EXECUTABLE} devcrypto)
target_link_libraries(${EXECUTABLE} ethcore)
target_link_libraries(${EXECUTABLE} secp256k1)
if (EVMJIT)
target_link_libraries(${EXECUTABLE} evmjit-cpp)
endif()
install( TARGETS ${EXECUTABLE} ARCHIVE DESTINATION lib LIBRARY DESTINATION lib )
install( FILES ${HEADERS} DESTINATION include/${EXECUTABLE} )

3
libevm/CMakeLists.txt

@ -30,6 +30,9 @@ target_link_libraries(${EXECUTABLE} ethcore)
target_link_libraries(${EXECUTABLE} devcrypto)
target_link_libraries(${EXECUTABLE} evmcore)
target_link_libraries(${EXECUTABLE} devcore)
if (EVMJIT)
target_link_libraries(${EXECUTABLE} evmjit-cpp)
endif()
install( TARGETS ${EXECUTABLE} ARCHIVE DESTINATION lib LIBRARY DESTINATION lib )
install( FILES ${HEADERS} DESTINATION include/${EXECUTABLE} )

3
test/CMakeLists.txt

@ -25,9 +25,6 @@ if (JSONRPC)
target_link_libraries(testeth web3jsonrpc)
target_link_libraries(testeth ${JSON_RPC_CPP_CLIENT_LIBRARIES})
endif()
if (EVMJIT)
target_link_libraries(testeth evmjit-cpp)
endif()
target_link_libraries(createRandomTest ${Boost_UNIT_TEST_FRAMEWORK_LIBRARIES})
target_link_libraries(createRandomTest ethereum)

Loading…
Cancel
Save