Browse Source

jit-related CMakeLists.txt fixes

cl-refactor
Artur Zawłocki 10 years ago
parent
commit
fab154454d
  1. 3
      CMakeLists.txt
  2. 3
      eth/CMakeLists.txt
  3. 2
      exp/CMakeLists.txt
  4. 1
      libethereum/CMakeLists.txt
  5. 3
      neth/CMakeLists.txt
  6. 6
      test/CMakeLists.txt

3
CMakeLists.txt

@ -176,8 +176,7 @@ if (NOT LANGUAGES)
endif() endif()
if (EVMJIT) if (EVMJIT)
add_subdirectory(libevmjit) add_subdirectory(evmjit)
add_subdirectory(evmcc)
endif() endif()

3
eth/CMakeLists.txt

@ -14,8 +14,7 @@ target_link_libraries(${EXECUTABLE} secp256k1)
target_link_libraries(${EXECUTABLE} gmp) target_link_libraries(${EXECUTABLE} gmp)
if(EVMJIT) if(EVMJIT)
target_link_libraries(${EXECUTABLE} evm) target_link_libraries(${EXECUTABLE} evmjit-cpp)
target_link_libraries(${EXECUTABLE} evmjit)
endif() endif()
if(MINIUPNPC_LS) if(MINIUPNPC_LS)

2
exp/CMakeLists.txt

@ -18,7 +18,7 @@ endif()
target_link_libraries(${EXECUTABLE} ${LEVELDB_LS}) target_link_libraries(${EXECUTABLE} ${LEVELDB_LS})
if(EVMJIT) if(EVMJIT)
target_link_libraries(${EXECUTABLE} evmjit) target_link_libraries(${EXECUTABLE} evmjit-cpp)
endif() endif()
if ("${TARGET_PLATFORM}" STREQUAL "w64") if ("${TARGET_PLATFORM}" STREQUAL "w64")

1
libethereum/CMakeLists.txt

@ -30,6 +30,7 @@ target_link_libraries(${EXECUTABLE} ${CRYPTOPP_LS})
target_link_libraries(${EXECUTABLE} gmp) target_link_libraries(${EXECUTABLE} gmp)
if (EVMJIT) if (EVMJIT)
target_link_libraries(${EXECUTABLE} evmjit) target_link_libraries(${EXECUTABLE} evmjit)
target_link_libraries(${EXECUTABLE} evmjit-cpp)
endif() endif()
if("${TARGET_PLATFORM}" STREQUAL "w64") if("${TARGET_PLATFORM}" STREQUAL "w64")

3
neth/CMakeLists.txt

@ -23,8 +23,7 @@ target_link_libraries(${EXECUTABLE} web3jsonrpc)
endif() endif()
if(EVMJIT) if(EVMJIT)
target_link_libraries(${EXECUTABLE} evm) target_link_libraries(${EXECUTABLE} evmjit-cpp)
target_link_libraries(${EXECUTABLE} evmjit)
endif() endif()
if ("${TARGET_PLATFORM}" STREQUAL "w64") if ("${TARGET_PLATFORM}" STREQUAL "w64")

6
test/CMakeLists.txt

@ -21,8 +21,7 @@ if(JSONRPC_LS)
target_link_libraries(testeth web3jsonrpc) target_link_libraries(testeth web3jsonrpc)
endif() endif()
if (EVMJIT) if (EVMJIT)
target_link_libraries(testeth evm) target_link_libraries(testeth evmjit-cpp)
target_link_libraries(testeth evmjit)
endif() endif()
target_link_libraries(createRandomTest ethereum) target_link_libraries(createRandomTest ethereum)
@ -30,8 +29,7 @@ target_link_libraries(createRandomTest ethcore)
target_link_libraries(createRandomTest boost_chrono) target_link_libraries(createRandomTest boost_chrono)
target_link_libraries(createRandomTest boost_unit_test_framework) target_link_libraries(createRandomTest boost_unit_test_framework)
if (EVMJIT) if (EVMJIT)
target_link_libraries(createRandomTest evm) target_link_libraries(createRandomTest evmjit-cpp)
target_link_libraries(createRandomTest evmjit)
endif() endif()
if ("${TARGET_PLATFORM}" STREQUAL "w64") if ("${TARGET_PLATFORM}" STREQUAL "w64")

Loading…
Cancel
Save