aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorMarek Kotewicz <marek.kotewicz@gmail.com>2015-08-24 21:57:48 +0800
committerMarek Kotewicz <marek.kotewicz@gmail.com>2015-08-24 21:57:48 +0800
commit40e65295ffc4678d5d316eb7c5243858e4822f7b (patch)
treef27401c1dc0c786915b26182aae18a0e2a15c8f0 /test
parentffcf18406b605afe56f545fa4a41bc3bbb870c28 (diff)
parent3ea1a62fa98e57cc2b882c8593c7d58cd8dd4701 (diff)
downloaddexon-solidity-40e65295ffc4678d5d316eb7c5243858e4822f7b.tar
dexon-solidity-40e65295ffc4678d5d316eb7c5243858e4822f7b.tar.gz
dexon-solidity-40e65295ffc4678d5d316eb7c5243858e4822f7b.tar.bz2
dexon-solidity-40e65295ffc4678d5d316eb7c5243858e4822f7b.tar.lz
dexon-solidity-40e65295ffc4678d5d316eb7c5243858e4822f7b.tar.xz
dexon-solidity-40e65295ffc4678d5d316eb7c5243858e4822f7b.tar.zst
dexon-solidity-40e65295ffc4678d5d316eb7c5243858e4822f7b.zip
Merge pull request #26 from arkpar/cmake
Refactored CMakeLists for new module system
Diffstat (limited to 'test')
-rw-r--r--test/CMakeLists.txt17
1 files changed, 10 insertions, 7 deletions
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)