diff options
| author | Marek Kotewicz <marek.kotewicz@gmail.com> | 2014-10-20 14:24:18 +0800 |
|---|---|---|
| committer | Marek Kotewicz <marek.kotewicz@gmail.com> | 2014-10-20 14:24:18 +0800 |
| commit | 6adaa743f20cecd556b147c3fa0a6708ea6f0547 (patch) | |
| tree | d528bd29d2609520a12c37c1b0808fd233ead0ce /CMakeLists.txt | |
| parent | d5502aee4866b8f321a85d1bd9b320cf574f5378 (diff) | |
| parent | b2e085c7d6f272d2b06a66ebce01259ac99ac9c6 (diff) | |
| download | dexon-solidity-6adaa743f20cecd556b147c3fa0a6708ea6f0547.tar dexon-solidity-6adaa743f20cecd556b147c3fa0a6708ea6f0547.tar.gz dexon-solidity-6adaa743f20cecd556b147c3fa0a6708ea6f0547.tar.bz2 dexon-solidity-6adaa743f20cecd556b147c3fa0a6708ea6f0547.tar.lz dexon-solidity-6adaa743f20cecd556b147c3fa0a6708ea6f0547.tar.xz dexon-solidity-6adaa743f20cecd556b147c3fa0a6708ea6f0547.tar.zst dexon-solidity-6adaa743f20cecd556b147c3fa0a6708ea6f0547.zip | |
Merge branch 'develop' into mk_jsonrpc
Conflicts:
alethzero/MainWin.cpp
libqethereum/QEthereum.cpp
libqethereum/QEthereum.h
third/MainWin.cpp
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 066c38ae..2a6ee0c8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,7 @@ cmake_policy(SET CMP0015 NEW) aux_source_directory(. SRC_LIST) +list(REMOVE_ITEM SRC_LIST "./createRandomTest.cpp") include_directories(..) link_directories(../libethcore) @@ -8,6 +9,7 @@ link_directories(../libethereum) file(GLOB HEADERS "*.h") add_executable(testeth ${SRC_LIST} ${HEADERS}) +add_executable(createRandomTest createRandomTest.cpp vm.cpp) target_link_libraries(testeth ethereum) target_link_libraries(testeth ethcore) @@ -20,6 +22,11 @@ if(JSONRPC_LS) target_link_libraries(testeth ethrpc) 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) + if ("${TARGET_PLATFORM}" STREQUAL "w64") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -static-libgcc -static-libstdc++") target_link_libraries(testeth boost_system-mt-s) |