cerc-io/solidity
16
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 #855 from chriseth/libraries

Browse Source 
Rename libevmasm.
This commit is contained in:
chriseth 2016-08-10 14:46:24 +02:00 committed by GitHub
commit cacc3b6bca
8 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -39,5 +39,3 @@ endif()
if (TESTS AND NOT EMSCRIPTEN)
add_subdirectory(test)
endif()
# TODO installation and packaging rules

2
cmake/FindSolidity.cmake
View File

@ -7,7 +7,7 @@
# SOLIDITY_INCLUDE_DIRS
include(EthUtils)
set(LIBS solidity;lll;evmasm)
set(LIBS solidity;lll;solevmasm)
set(Solidity_INCLUDE_DIRS "${SOL_DIR}")

10
cmake/UseSolidity.cmake
View File

@ -14,18 +14,18 @@ function(eth_apply TARGET REQUIRED SUBMODULE)
target_include_directories(${TARGET} PUBLIC ${Solidity_INCLUDE_DIRS})
if (${SUBMODULE} STREQUAL "evmasm")
eth_use(${TARGET} ${REQUIRED} )
target_link_libraries(${TARGET} ${Solidity_EVMASM_LIBRARIES})
if (${SUBMODULE} STREQUAL "solevmasm")
eth_use(${TARGET} ${REQUIRED} Jsoncpp)
target_link_libraries(${TARGET} ${Solidity_SOLEVMASM_LIBRARIES})
endif()
if (${SUBMODULE} STREQUAL "lll")
eth_use(${TARGET} ${REQUIRED} Solidity::evmasm)
eth_use(${TARGET} ${REQUIRED} Solidity::solevmasm)
target_link_libraries(${TARGET} ${Solidity_LLL_LIBRARIES})
endif()
if (${SUBMODULE} STREQUAL "solidity" OR ${SUBMODULE} STREQUAL "")
eth_use(${TARGET} ${REQUIRED} Dev::soldevcore Solidity::evmasm)
eth_use(${TARGET} ${REQUIRED} Dev::soldevcore Solidity::solevmasm)
target_link_libraries(${TARGET} ${Solidity_SOLIDITY_LIBRARIES})
endif()

2
libevmasm/CMakeLists.txt
View File

@ -2,7 +2,7 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DSTATICLIB")
aux_source_directory(. SRC_LIST)
set(EXECUTABLE evmasm)
set(EXECUTABLE solevmasm)
file(GLOB HEADERS "*.h")

2
liblll/CMakeLists.txt
View File

@ -15,7 +15,7 @@ file(GLOB HEADERS "*.h")
include_directories(BEFORE ..)
add_library(${EXECUTABLE} ${SRC_LIST} ${HEADERS})
eth_use(${EXECUTABLE} REQUIRED Solidity::evmasm)
eth_use(${EXECUTABLE} REQUIRED Solidity::solevmasm)
#target_link_libraries(${EXECUTABLE} evmasm)
install( TARGETS ${EXECUTABLE} RUNTIME DESTINATION bin ARCHIVE DESTINATION lib LIBRARY DESTINATION lib )

2
libsolidity/CMakeLists.txt
View File

@ -15,7 +15,7 @@ file(GLOB HEADERS "*/*.h")
include_directories(BEFORE ..)
add_library(${EXECUTABLE} ${SRC_LIST} ${HEADERS})
eth_use(${EXECUTABLE} REQUIRED Dev::soldevcore Solidity::evmasm)
eth_use(${EXECUTABLE} REQUIRED Dev::soldevcore Solidity::solevmasm)
install( TARGETS ${EXECUTABLE} RUNTIME DESTINATION bin ARCHIVE DESTINATION lib LIBRARY DESTINATION lib )

2
lllc/CMakeLists.txt
View File

@ -6,7 +6,7 @@ file(GLOB HEADERS "*.h")
include_directories(BEFORE ..)
eth_simple_add_executable(${EXECUTABLE} ${SRC_LIST} ${HEADERS})
eth_use(${EXECUTABLE} REQUIRED Solidity::lll Dev::buildinfo Solidity::evmasm)
eth_use(${EXECUTABLE} REQUIRED Solidity::lll Dev::buildinfo Solidity::solevmasm)
install( TARGETS ${EXECUTABLE} DESTINATION bin )

2
scripts/travis-emscripten/build_emscripten.sh
View File

@ -117,7 +117,7 @@ emcmake cmake \
-DCRYPTOPP_LIBRARY="$WORKSPACE"/cryptopp/src/libcryptlib.a \
-DCRYPTOPP_INCLUDE_DIR="$WORKSPACE"/cryptopp/src/ \
-DDev_DEVCORE_LIBRARY="$WORKSPACE"/solidity/build/libdevcore/libsoldevcore.a \
-DEth_EVMASM_LIBRARY="$WORKSPACE"/solidity/build/libevmasm/libevmasm.a \
-DEth_EVMASM_LIBRARY="$WORKSPACE"/solidity/build/libevmasm/libsolevmasm.a \
-DETH_STATIC=1 -DTESTS=0 \
..
emmake make -j 4