aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaweł Bylica <pawel.bylica@imapp.pl>2014-10-31 01:10:24 +0800
committerPaweł Bylica <pawel.bylica@imapp.pl>2014-10-31 01:10:24 +0800
commitb2cd52eb0d4998723aa608de9701c1a0c3860809 (patch)
tree61a3c697f9569bd628bdb305c61b80e525e651c5
parent0a89d037e1ccb10bbb30abf8cc9e21450f2afb1e (diff)
parent609d4600255b7d9273995182d2a6148d208398a4 (diff)
downloaddexon-solidity-b2cd52eb0d4998723aa608de9701c1a0c3860809.tar
dexon-solidity-b2cd52eb0d4998723aa608de9701c1a0c3860809.tar.gz
dexon-solidity-b2cd52eb0d4998723aa608de9701c1a0c3860809.tar.bz2
dexon-solidity-b2cd52eb0d4998723aa608de9701c1a0c3860809.tar.lz
dexon-solidity-b2cd52eb0d4998723aa608de9701c1a0c3860809.tar.xz
dexon-solidity-b2cd52eb0d4998723aa608de9701c1a0c3860809.tar.zst
dexon-solidity-b2cd52eb0d4998723aa608de9701c1a0c3860809.zip
Merge branch 'develop-evmcc' into pr-jit
-rw-r--r--CMakeLists.txt9
1 files changed, 6 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 16eb0f40..17dda74d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,7 +7,6 @@ include_directories(..)
link_directories(../libethcore)
link_directories(../libethereum)
link_directories(../libevm)
-link_directories(../libevmjit)
file(GLOB HEADERS "*.h")
add_executable(testeth ${SRC_LIST} ${HEADERS})
@@ -20,13 +19,17 @@ target_link_libraries(testeth gmp)
target_link_libraries(testeth solidity)
target_link_libraries(testeth ${CRYPTOPP_LS})
target_link_libraries(testeth evm)
-target_link_libraries(testeth evmjit)
+if (EVMJIT)
+ target_link_libraries(testeth evmjit)
+endif()
target_link_libraries(createRandomTest ethereum)
target_link_libraries(createRandomTest ethcore)
target_link_libraries(createRandomTest boost_chrono)
target_link_libraries(createRandomTest boost_unit_test_framework)
-target_link_libraries(createRandomTest evmjit)
+if (EVMJIT)
+ target_link_libraries(createRandomTest evmjit)
+endif()
if ("${TARGET_PLATFORM}" STREQUAL "w64")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -static-libgcc -static-libstdc++")