diff --git a/CMakeLists.txt b/CMakeLists.txt index 271f3ed65..48f1efee0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -368,6 +368,10 @@ if (EVMJIT) endif() set(EVMJIT_CPP TRUE) # include CPP-JIT connector 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() if (TOOLS OR GUI OR SOLIDITY OR NCURSES OR TESTS) @@ -409,10 +413,8 @@ if (JSCONSOLE) add_subdirectory(ethconsole) endif () -if (NOT WIN32) - add_definitions(-DETH_HAVE_SECP256K1) - add_subdirectory(secp256k1) -endif () +add_definitions(-DETH_HAVE_SECP256K1) +add_subdirectory(secp256k1) add_subdirectory(libscrypt) add_subdirectory(libdevcrypto) diff --git a/alethzero/CMakeLists.txt b/alethzero/CMakeLists.txt index 8bc349fb2..6f9dc59b3 100644 --- a/alethzero/CMakeLists.txt +++ b/alethzero/CMakeLists.txt @@ -72,5 +72,5 @@ if (SERPENT) endif() # 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) diff --git a/eth/CMakeLists.txt b/eth/CMakeLists.txt index d317be28a..dd4d61cd2 100644 --- a/eth/CMakeLists.txt +++ b/eth/CMakeLists.txt @@ -42,7 +42,7 @@ if (JSCONSOLE) endif() 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() if (APPLE) diff --git a/evmjit/libevmjit/CMakeLists.txt b/evmjit/libevmjit/CMakeLists.txt index 80108e15b..a41c7b365 100644 --- a/evmjit/libevmjit/CMakeLists.txt +++ b/evmjit/libevmjit/CMakeLists.txt @@ -29,7 +29,6 @@ else() set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-rtti") endif() - set(EVMJIT_VERSION "0.0.0") set(EVMJIT_VERSION_MAJOR 0) set(EVMJIT_VERSION_MINOR 0)