aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaweł Bylica <chfast@gmail.com>2017-08-16 19:29:59 +0800
committerPaweł Bylica <chfast@gmail.com>2017-08-18 19:32:35 +0800
commit8404e2b6d76dd3681bf30e99e2cb21112b491d70 (patch)
tree446df1ce4fad9e3f7828c08858effef4c9d3ad29
parent7337054d8e4c68bc2c82b7c01b695880a86e902b (diff)
downloaddexon-solidity-8404e2b6d76dd3681bf30e99e2cb21112b491d70.tar
dexon-solidity-8404e2b6d76dd3681bf30e99e2cb21112b491d70.tar.gz
dexon-solidity-8404e2b6d76dd3681bf30e99e2cb21112b491d70.tar.bz2
dexon-solidity-8404e2b6d76dd3681bf30e99e2cb21112b491d70.tar.lz
dexon-solidity-8404e2b6d76dd3681bf30e99e2cb21112b491d70.tar.xz
dexon-solidity-8404e2b6d76dd3681bf30e99e2cb21112b491d70.tar.zst
dexon-solidity-8404e2b6d76dd3681bf30e99e2cb21112b491d70.zip
CMake: Simplify libsolidity config
-rw-r--r--libsolidity/CMakeLists.txt24
1 files changed, 5 insertions, 19 deletions
diff --git a/libsolidity/CMakeLists.txt b/libsolidity/CMakeLists.txt
index e6398507..5e9c79f0 100644
--- a/libsolidity/CMakeLists.txt
+++ b/libsolidity/CMakeLists.txt
@@ -1,21 +1,7 @@
-aux_source_directory(analysis SRC_LIST)
-aux_source_directory(ast SRC_LIST)
-aux_source_directory(codegen SRC_LIST)
-aux_source_directory(formal SRC_LIST)
-aux_source_directory(interface SRC_LIST)
-aux_source_directory(parsing SRC_LIST)
-aux_source_directory(inlineasm SRC_LIST)
# Until we have a clear separation, libjulia has to be included here
-aux_source_directory(../libjulia SRC_LIST)
-
-set(EXECUTABLE solidity)
-
-file(GLOB HEADERS "*/*.h" "../libjulia/backends/evm/*")
-
-include_directories(BEFORE ..)
-add_library(${EXECUTABLE} ${SRC_LIST} ${HEADERS})
-
-eth_use(${EXECUTABLE} REQUIRED Dev::soldevcore Solidity::solevmasm)
-
-install( TARGETS ${EXECUTABLE} RUNTIME DESTINATION bin ARCHIVE DESTINATION lib LIBRARY DESTINATION lib )
+file(GLOB_RECURSE sources "*.cpp" "../libjulia/*.cpp")
+file(GLOB_RECURSE headers "*.h" "../libjulia/*.h")
+add_library(solidity ${sources} ${headers})
+target_link_libraries(solidity PUBLIC evmasm PRIVATE ${Boost_REGEX_LIBRARIES})
+target_include_directories(solidity PUBLIC ..)