diff options
author | subtly <subtly@users.noreply.github.com> | 2015-01-15 01:51:10 +0800 |
---|---|---|
committer | subtly <subtly@users.noreply.github.com> | 2015-01-15 01:51:10 +0800 |
commit | 2a268524732020b8175f0d1ea450a9724f07cc8e (patch) | |
tree | b9e0a438ddeb94385a2458f6f15142027d8d0590 /CMakeLists.txt | |
parent | 01ecadd74ed5740aca1fd1a4654a007c7a8a8b73 (diff) | |
parent | 25fc28422bf864f5299a5995e68fa1c17d2cb75c (diff) | |
download | dexon-solidity-2a268524732020b8175f0d1ea450a9724f07cc8e.tar.gz dexon-solidity-2a268524732020b8175f0d1ea450a9724f07cc8e.tar.zst dexon-solidity-2a268524732020b8175f0d1ea450a9724f07cc8e.zip |
Merge branch 'develop' into p2p
Conflicts:
libp2p/Host.cpp
libwebthree/WebThree.h
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r-- | CMakeLists.txt | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 7cedc117..764bf928 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,6 +2,7 @@ cmake_policy(SET CMP0015 NEW) aux_source_directory(. SRC_LIST) list(REMOVE_ITEM SRC_LIST "./createRandomTest.cpp") +list(REMOVE_ITEM SRC_LIST "./checkRandomTest.cpp") include_directories(${Boost_INCLUDE_DIRS}) include_directories(${CRYPTOPP_INCLUDE_DIRS}) @@ -12,6 +13,7 @@ include_directories(..) file(GLOB HEADERS "*.h") add_executable(testeth ${SRC_LIST} ${HEADERS}) add_executable(createRandomTest createRandomTest.cpp vm.cpp TestHelper.cpp) +add_executable(checkRandomTest checkRandomTest.cpp vm.cpp TestHelper.cpp) target_link_libraries(testeth ${Boost_UNIT_TEST_FRAMEWORK_LIBRARIES}) target_link_libraries(testeth ${CURL_LIBRARIES}) @@ -29,3 +31,7 @@ endif() target_link_libraries(createRandomTest ${Boost_UNIT_TEST_FRAMEWORK_LIBRARIES}) target_link_libraries(createRandomTest ethereum) target_link_libraries(createRandomTest ethcore) +target_link_libraries(checkRandomTest ${Boost_UNIT_TEST_FRAMEWORK_LIBRARIES}) +target_link_libraries(checkRandomTest ethereum) +target_link_libraries(checkRandomTest ethcore) + |