diff options
| author | chriseth <c@ethdev.com> | 2016-08-08 18:26:07 +0800 |
|---|---|---|
| committer | chriseth <c@ethdev.com> | 2016-08-08 18:26:07 +0800 |
| commit | ccd78d05d6221b5eb47514b30f7e5c5aa7169365 (patch) | |
| tree | d0fe6357e7bf9dd7504aef5936dc5f52c1dea9aa | |
| parent | 226ed7b9dcd4764a32cdc146e69a1156dcd401f6 (diff) | |
| download | dexon-solidity-ccd78d05d6221b5eb47514b30f7e5c5aa7169365.tar dexon-solidity-ccd78d05d6221b5eb47514b30f7e5c5aa7169365.tar.gz dexon-solidity-ccd78d05d6221b5eb47514b30f7e5c5aa7169365.tar.bz2 dexon-solidity-ccd78d05d6221b5eb47514b30f7e5c5aa7169365.tar.lz dexon-solidity-ccd78d05d6221b5eb47514b30f7e5c5aa7169365.tar.xz dexon-solidity-ccd78d05d6221b5eb47514b30f7e5c5aa7169365.tar.zst dexon-solidity-ccd78d05d6221b5eb47514b30f7e5c5aa7169365.zip | |
Correct library usage.
| -rw-r--r-- | cmake/UseDev.cmake | 4 | ||||
| -rw-r--r-- | cmake/UseSolidity.cmake | 2 | ||||
| -rw-r--r-- | libevmasm/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | libsolidity/CMakeLists.txt | 2 | ||||
| -rwxr-xr-x | scripts/travis-emscripten/build_emscripten.sh | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/cmake/UseDev.cmake b/cmake/UseDev.cmake index 1f4c9a2d..4461a8a0 100644 --- a/cmake/UseDev.cmake +++ b/cmake/UseDev.cmake @@ -22,9 +22,9 @@ function(eth_apply TARGET REQUIRED SUBMODULE) endif() - if (${SUBMODULE} STREQUAL "devcore") + if (${SUBMODULE} STREQUAL "soldevcore") eth_use(${TARGET} ${REQUIRED} Dev::base) - target_link_libraries(${TARGET} devcore) + target_link_libraries(${TARGET} soldevcore) endif() endfunction() diff --git a/cmake/UseSolidity.cmake b/cmake/UseSolidity.cmake index 46e2cac9..8db2f848 100644 --- a/cmake/UseSolidity.cmake +++ b/cmake/UseSolidity.cmake @@ -25,7 +25,7 @@ function(eth_apply TARGET REQUIRED SUBMODULE) endif() 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}) endif() diff --git a/libevmasm/CMakeLists.txt b/libevmasm/CMakeLists.txt index 56b2faca..f86da49c 100644 --- a/libevmasm/CMakeLists.txt +++ b/libevmasm/CMakeLists.txt @@ -8,7 +8,7 @@ file(GLOB HEADERS "*.h") include_directories(BEFORE ..) 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( FILES ${HEADERS} DESTINATION include/${EXECUTABLE} ) diff --git a/libsolidity/CMakeLists.txt b/libsolidity/CMakeLists.txt index e86792c1..4ca8d6f7 100644 --- a/libsolidity/CMakeLists.txt +++ b/libsolidity/CMakeLists.txt @@ -15,7 +15,7 @@ file(GLOB HEADERS "*/*.h") include_directories(BEFORE ..) 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( FILES ${HEADERS} DESTINATION include/${EXECUTABLE} ) diff --git a/scripts/travis-emscripten/build_emscripten.sh b/scripts/travis-emscripten/build_emscripten.sh index 2b5e409f..bb118ba6 100755 --- a/scripts/travis-emscripten/build_emscripten.sh +++ b/scripts/travis-emscripten/build_emscripten.sh @@ -116,7 +116,7 @@ emcmake cmake \ -DJSONCPP_INCLUDE_DIR="$WORKSPACE"/jsoncpp/include/ \ -DCRYPTOPP_LIBRARY="$WORKSPACE"/cryptopp/src/libcryptlib.a \ -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_STATIC=1 -DTESTS=0 \ .. |