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

Correct library usage.

Browse Source
This commit is contained in:
chriseth 2016-08-08 12:26:07 +02:00
parent 226ed7b9dc
commit ccd78d05d6
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmake/UseDev.cmake
View File

@ -22,9 +22,9 @@ function(eth_apply TARGET REQUIRED SUBMODULE)
endif() endif()
if (${SUBMODULE} STREQUAL "devcore") if (${SUBMODULE} STREQUAL "soldevcore")
eth_use(${TARGET} ${REQUIRED} Dev::base) eth_use(${TARGET} ${REQUIRED} Dev::base)
target_link_libraries(${TARGET} devcore) target_link_libraries(${TARGET} soldevcore)
endif() endif()
endfunction() endfunction()

2
cmake/UseSolidity.cmake
View File

@ -25,7 +25,7 @@ function(eth_apply TARGET REQUIRED SUBMODULE)
endif() endif()
if (${SUBMODULE} STREQUAL "solidity" OR ${SUBMODULE} STREQUAL "") if (${SUBMODULE} STREQUAL "solidity" OR ${SUBMODULE} STREQUAL "")
eth_use(${TARGET} ${REQUIRED} Dev::devcore Solidity::evmasm) eth_use(${TARGET} ${REQUIRED} Dev::soldevcore Solidity::evmasm)
target_link_libraries(${TARGET} ${Solidity_SOLIDITY_LIBRARIES}) target_link_libraries(${TARGET} ${Solidity_SOLIDITY_LIBRARIES})
endif() endif()

2
libevmasm/CMakeLists.txt
View File

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

2
libsolidity/CMakeLists.txt
View File

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

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

@ -116,7 +116,7 @@ emcmake cmake \
-DJSONCPP_INCLUDE_DIR="$WORKSPACE"/jsoncpp/include/ \ -DJSONCPP_INCLUDE_DIR="$WORKSPACE"/jsoncpp/include/ \
-DCRYPTOPP_LIBRARY="$WORKSPACE"/cryptopp/src/libcryptlib.a \ -DCRYPTOPP_LIBRARY="$WORKSPACE"/cryptopp/src/libcryptlib.a \
-DCRYPTOPP_INCLUDE_DIR="$WORKSPACE"/cryptopp/src/ \ -DCRYPTOPP_INCLUDE_DIR="$WORKSPACE"/cryptopp/src/ \
-DDev_DEVCORE_LIBRARY="$WORKSPACE"/solidity/build/libdevcore/libdevcore.a \ -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/libevmasm.a \
-DETH_STATIC=1 -DTESTS=0 \ -DETH_STATIC=1 -DTESTS=0 \
.. ..