From 3ea1a62fa98e57cc2b882c8593c7d58cd8dd4701 Mon Sep 17 00:00:00 2001
From: arkpar <arkady.paronyan@gmail.com>
Date: Mon, 24 Aug 2015 15:51:52 +0200
Subject: Refactoreed CMakeLists for new module system

---
 test/CMakeLists.txt | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

(limited to 'test/CMakeLists.txt')

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 81053d82..a7e27414 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -39,14 +39,17 @@ foreach(file ${SRC_LIST})
 endforeach(file)
 
 file(GLOB HEADERS "*.h")
-add_executable(test ${SRC_LIST} ${HEADERS})
+set(EXECUTABLE soltest)
+add_executable(${EXECUTABLE} ${SRC_LIST} ${HEADERS})
 
-target_link_libraries(test ${Boost_UNIT_TEST_FRAMEWORK_LIBRARIES})
-target_link_libraries(test ${ETH_ETHEREUM_LIBRARY})
-target_link_libraries(test ${ETH_ETHCORE_LIBRARY})
-target_link_libraries(test solidity)
+eth_use(${EXECUTABLE} REQUIRED EthCore)
+
+include_directories(BEFORE ..)
+include_directories(BEFORE ${JSONCPP_INCLUDE_DIRS})
+target_link_libraries(${EXECUTABLE} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARIES})
+target_link_libraries(${EXECUTABLE} ${ETH_ETHEREUM_LIBRARY})
+target_link_libraries(${EXECUTABLE} ${ETH_ETHCORE_LIBRARY})
+target_link_libraries(${EXECUTABLE} solidity)
 
 enable_testing()
 set(CTEST_OUTPUT_ON_FAILURE TRUE)
-
-include(EthUtils)
-- 
cgit