Browse Source

copy evmjit dll to output on windows

cl-refactor
arkpar 10 years ago
parent
commit
016ce6964f
  1. 10
      CMakeLists.txt
  2. 2
      alethzero/CMakeLists.txt
  3. 2
      eth/CMakeLists.txt
  4. 1
      evmjit/libevmjit/CMakeLists.txt

10
CMakeLists.txt

@ -368,6 +368,10 @@ if (EVMJIT)
endif() endif()
set(EVMJIT_CPP TRUE) # include CPP-JIT connector set(EVMJIT_CPP TRUE) # include CPP-JIT connector
add_subdirectory(evmjit) add_subdirectory(evmjit)
if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
get_property(EVMJIT_DLLS_LOCAL TARGET "evmjit" PROPERTY LOCATION)
set(EVMJIT_DLLS optimized ${EVMJIT_DLLS_LOCAL} debug ${EVMJIT_DLLS_LOCAL})
endif()
endif() endif()
if (TOOLS OR GUI OR SOLIDITY OR NCURSES OR TESTS) if (TOOLS OR GUI OR SOLIDITY OR NCURSES OR TESTS)
@ -409,10 +413,8 @@ if (JSCONSOLE)
add_subdirectory(ethconsole) add_subdirectory(ethconsole)
endif () endif ()
if (NOT WIN32) add_definitions(-DETH_HAVE_SECP256K1)
add_definitions(-DETH_HAVE_SECP256K1) add_subdirectory(secp256k1)
add_subdirectory(secp256k1)
endif ()
add_subdirectory(libscrypt) add_subdirectory(libscrypt)
add_subdirectory(libdevcrypto) add_subdirectory(libdevcrypto)

2
alethzero/CMakeLists.txt

@ -72,5 +72,5 @@ if (SERPENT)
endif() endif()
# eth_install_executable is defined in cmake/EthExecutableHelper.cmake # eth_install_executable is defined in cmake/EthExecutableHelper.cmake
eth_install_executable(${EXECUTABLE} DLLS MHD_DLLS) eth_install_executable(${EXECUTABLE} DLLS MHD_DLLS EVMJIT_DLLS)

2
eth/CMakeLists.txt

@ -42,7 +42,7 @@ if (JSCONSOLE)
endif() endif()
if (DEFINED WIN32 AND NOT DEFINED CMAKE_COMPILER_IS_MINGW) if (DEFINED WIN32 AND NOT DEFINED CMAKE_COMPILER_IS_MINGW)
eth_copy_dlls("${EXECUTABLE}" MHD_DLLS) eth_copy_dlls("${EXECUTABLE}" MHD_DLLS EVMJIT_DLLS)
endif() endif()
if (APPLE) if (APPLE)

1
evmjit/libevmjit/CMakeLists.txt

@ -29,7 +29,6 @@ else()
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-rtti") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-rtti")
endif() endif()
set(EVMJIT_VERSION "0.0.0") set(EVMJIT_VERSION "0.0.0")
set(EVMJIT_VERSION_MAJOR 0) set(EVMJIT_VERSION_MAJOR 0)
set(EVMJIT_VERSION_MINOR 0) set(EVMJIT_VERSION_MINOR 0)

Loading…
Cancel
Save