aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorAlex Beregszaszi <alex@rtfs.hu>2017-08-23 19:36:24 +0800
committerGitHub <noreply@github.com>2017-08-23 19:36:24 +0800
commit3b07c4d38e40c52ee8a4d16e56e2afa1a0f27905 (patch)
tree3af9644b27a6fd453610d26ffe65bf4ca98d9aa9 /test
parentc5f11d938f6670d9dbe0d7212097089c757fd91a (diff)
parent09628dee8c86e71119884204eb729fe439fb3bad (diff)
downloaddexon-solidity-3b07c4d38e40c52ee8a4d16e56e2afa1a0f27905.tar
dexon-solidity-3b07c4d38e40c52ee8a4d16e56e2afa1a0f27905.tar.gz
dexon-solidity-3b07c4d38e40c52ee8a4d16e56e2afa1a0f27905.tar.bz2
dexon-solidity-3b07c4d38e40c52ee8a4d16e56e2afa1a0f27905.tar.lz
dexon-solidity-3b07c4d38e40c52ee8a4d16e56e2afa1a0f27905.tar.xz
dexon-solidity-3b07c4d38e40c52ee8a4d16e56e2afa1a0f27905.tar.zst
dexon-solidity-3b07c4d38e40c52ee8a4d16e56e2afa1a0f27905.zip
Merge pull request #2757 from ethereum/cmake
Static linking
Diffstat (limited to 'test')
-rw-r--r--test/CMakeLists.txt29
1 files changed, 6 insertions, 23 deletions
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 8e7b8916..6a8a4399 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -1,26 +1,9 @@
-cmake_policy(SET CMP0015 NEW)
+file(GLOB_RECURSE sources "*.cpp")
+list(REMOVE_ITEM sources "${CMAKE_CURRENT_SOURCE_DIR}/fuzzer.cpp")
+file(GLOB_RECURSE headers "*.h")
-aux_source_directory(. SRC_LIST)
-aux_source_directory(libdevcore SRC_LIST)
-aux_source_directory(libevmasm SRC_LIST)
-aux_source_directory(libsolidity SRC_LIST)
-aux_source_directory(libjulia SRC_LIST)
-aux_source_directory(contracts SRC_LIST)
-aux_source_directory(liblll SRC_LIST)
-aux_source_directory(libjulia SRC_LIST)
-
-list(REMOVE_ITEM SRC_LIST "./fuzzer.cpp")
-
-get_filename_component(TESTS_DIR "${CMAKE_CURRENT_SOURCE_DIR}" ABSOLUTE)
-
-file(GLOB HEADERS "*.h" "*/*.h")
-set(EXECUTABLE soltest)
-eth_simple_add_executable(${EXECUTABLE} ${SRC_LIST} ${HEADERS})
-
-eth_use(${EXECUTABLE} REQUIRED Solidity::solidity Solidity::lll)
-
-include_directories(BEFORE ..)
-target_link_libraries(${EXECUTABLE} soljson ${Boost_UNIT_TEST_FRAMEWORK_LIBRARIES})
+add_executable(soltest ${sources} ${headers})
+target_link_libraries(soltest PRIVATE soljson solidity lll evmasm devcore ${Boost_UNIT_TEST_FRAMEWORK_LIBRARIES})
add_executable(solfuzzer fuzzer.cpp)
-target_link_libraries(solfuzzer soljson ${Boost_PROGRAM_OPTIONS_LIBRARIES})
+target_link_libraries(solfuzzer soljson evmasm ${Boost_PROGRAM_OPTIONS_LIBRARIES})