cerc-io/solidity
15
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #8130 from ethereum/devcorenomore

Browse Source 
CMake: Renaming devcore static library to solutil (to match source code paths)
This commit is contained in:
Christian Parpart 2020-01-13 16:49:29 +01:00 committed by GitHub
commit 408458b7c9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libevmasm/CMakeLists.txt
View File

@ -36,4 +36,4 @@ set(sources
) )
add_library(evmasm ${sources}) add_library(evmasm ${sources})
target_link_libraries(evmasm PUBLIC devcore) target_link_libraries(evmasm PUBLIC solutil)

2
liblangutil/CMakeLists.txt
View File

@ -28,4 +28,4 @@ set(sources
) )
add_library(langutil ${sources}) add_library(langutil ${sources})
target_link_libraries(langutil PUBLIC devcore) target_link_libraries(langutil PUBLIC solutil)

2
liblll/CMakeLists.txt
View File

@ -11,4 +11,4 @@ set(sources
) )
add_library(lll ${sources}) add_library(lll ${sources})
target_link_libraries(lll PUBLIC evmasm devcore) target_link_libraries(lll PUBLIC evmasm solutil)

2
libsolidity/CMakeLists.txt
View File

@ -151,7 +151,7 @@ if (NOT (${Z3_FOUND} OR ${CVC4_FOUND}))
endif() endif()
add_library(solidity ${sources} ${z3_SRCS} ${cvc4_SRCS}) add_library(solidity ${sources} ${z3_SRCS} ${cvc4_SRCS})
target_link_libraries(solidity PUBLIC yul evmasm langutil devcore Boost::boost Boost::filesystem Boost::system) target_link_libraries(solidity PUBLIC yul evmasm langutil solutil Boost::boost Boost::filesystem Boost::system)
if (${Z3_FOUND}) if (${Z3_FOUND})
target_link_libraries(solidity PUBLIC z3::libz3) target_link_libraries(solidity PUBLIC z3::libz3)

10
libsolutil/CMakeLists.txt
View File

@ -33,11 +33,11 @@ set(sources
Whiskers.h Whiskers.h
) )
add_library(devcore ${sources}) add_library(solutil ${sources})
target_link_libraries(devcore PUBLIC jsoncpp Boost::boost Boost::filesystem Boost::system) target_link_libraries(solutil PUBLIC jsoncpp Boost::boost Boost::filesystem Boost::system)
target_include_directories(devcore PUBLIC "${CMAKE_SOURCE_DIR}") target_include_directories(solutil PUBLIC "${CMAKE_SOURCE_DIR}")
add_dependencies(devcore solidity_BuildInfo.h) add_dependencies(solutil solidity_BuildInfo.h)
if(SOLC_LINK_STATIC) if(SOLC_LINK_STATIC)
target_link_libraries(devcore PUBLIC Threads::Threads) target_link_libraries(solutil PUBLIC Threads::Threads)
endif() endif()

2
libyul/CMakeLists.txt
View File

@ -158,4 +158,4 @@ add_library(yul
optimiser/VarNameCleaner.cpp optimiser/VarNameCleaner.cpp
optimiser/VarNameCleaner.h optimiser/VarNameCleaner.h
) )
target_link_libraries(yul PUBLIC evmasm devcore langutil) target_link_libraries(yul PUBLIC evmasm solutil langutil)

2
test/CMakeLists.txt
View File

@ -159,7 +159,7 @@ add_executable(soltest ${sources}
${libsolidity_sources} ${libsolidity_sources}
${libsolidity_util_sources} ${libsolidity_util_sources}
) )
target_link_libraries(soltest PRIVATE libsolc yul solidity yulInterpreter evmasm devcore Boost::boost Boost::program_options Boost::unit_test_framework evmc) target_link_libraries(soltest PRIVATE libsolc yul solidity yulInterpreter evmasm solutil Boost::boost Boost::program_options Boost::unit_test_framework evmc)
# Special compilation flag for Visual Studio (version 2019 at least affected) # Special compilation flag for Visual Studio (version 2019 at least affected)

2
test/tools/yulInterpreter/CMakeLists.txt
View File

@ -8,4 +8,4 @@ set(sources
) )
add_library(yulInterpreter ${sources}) add_library(yulInterpreter ${sources})
target_link_libraries(yulInterpreter PUBLIC yul solidity devcore) target_link_libraries(yulInterpreter PUBLIC yul solidity solutil)