Ensure liblangutil is compiled and linked as its own static library.

This commit is contained in:
Christian Parpart 2018-11-14 17:15:39 +01:00 committed by Alex Beregszaszi
parent 2518b5314c
commit 80371e2d25
3 changed files with 10 additions and 3 deletions

View File

@ -45,6 +45,7 @@ include(EthOptions)
configure_project(TESTS) configure_project(TESTS)
add_subdirectory(libdevcore) add_subdirectory(libdevcore)
add_subdirectory(liblangutil)
add_subdirectory(libevmasm) add_subdirectory(libevmasm)
add_subdirectory(libsolidity) add_subdirectory(libsolidity)
add_subdirectory(libsolc) add_subdirectory(libsolc)

View File

@ -0,0 +1,6 @@
# Solidity Commons Library (Solidity related sharing bits between libsolidity and libyul)
file(GLOB sources "*.cpp")
file(GLOB headers "*.h")
add_library(langutil ${sources} ${headers})
target_link_libraries(langutil PUBLIC devcore)

View File

@ -1,6 +1,6 @@
# Until we have a clear separation, libyul has to be included here # Until we have a clear separation, libyul has to be included here
file(GLOB_RECURSE sources "*.cpp" "../libyul/*.cpp" "../liblangutil/*.cpp") file(GLOB_RECURSE sources "*.cpp" "../libyul/*.cpp")
file(GLOB_RECURSE headers "*.h" "../libyul/*.h" "../liblangutil/*.h") file(GLOB_RECURSE headers "*.h" "../libyul/*.h")
find_package(Z3 QUIET) find_package(Z3 QUIET)
if (${Z3_FOUND}) if (${Z3_FOUND})
@ -26,7 +26,7 @@ if (NOT (${Z3_FOUND} OR ${CVC4_FOUND}))
endif() endif()
add_library(solidity ${sources} ${headers}) add_library(solidity ${sources} ${headers})
target_link_libraries(solidity PUBLIC evmasm devcore ${Boost_FILESYSTEM_LIBRARY} ${Boost_SYSTEM_LIBRARY}) target_link_libraries(solidity PUBLIC evmasm langutil devcore ${Boost_FILESYSTEM_LIBRARY} ${Boost_SYSTEM_LIBRARY})
if (${Z3_FOUND}) if (${Z3_FOUND})
target_link_libraries(solidity PUBLIC ${Z3_LIBRARY}) target_link_libraries(solidity PUBLIC ${Z3_LIBRARY})