Skip to content
This repository has been archived by the owner on Oct 28, 2021. It is now read-only.

Copy evmjit.dll to output on windows #2490

Merged
merged 6 commits into from
Jul 20, 2015
Merged

Copy evmjit.dll to output on windows #2490

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
016ce69
copy evmjit dll to output on windows
arkpar Jul 16, 2015
63ef6a7
reverted libsecp256k1 changes
arkpar Jul 16, 2015
e7f34be
fixed eth_copy_dlls
arkpar Jul 16, 2015
bd28d0f
Merge branch 'develop' of https://github.com/ethereum/cpp-ethereum into
arkpar Jul 19, 2015
ce67987
Merge branch 'win-jit-dll' of https://github.com/arkpar/cpp-ethereum
arkpar Jul 19, 2015
a2df538
opencl.dll copied to alethzero outputs
arkpar Jul 20, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion alethzero/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

2 changes: 1 addition & 1 deletion eth/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It does not work!!

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

MSVC isn't CMAKE_COMPILER_IS_MINGW :)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@subtly, NOT DEFINED CMAKE_COMPILER_IS_MINGW there, so msvc fits.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In other parts "compiler match msvc" is used. And it's just simpler.

endif()

if (APPLE)
Expand Down
1 change: 0 additions & 1 deletion evmjit/libevmjit/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down