diff options
| author | chriseth <chris@ethereum.org> | 2016-08-10 20:46:24 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-10 20:46:24 +0800 |
| commit | cacc3b6bca65b93bb9315bd1b9e42bebec6ed58b (patch) | |
| tree | cbc6acd77e64277495882e95e28b44aa51af2bc3 /cmake | |
| parent | 539afbeea32fb646e7d0979ee4fb949d914e89bc (diff) | |
| parent | 4c54834908c88c2c7826561fc2a72460ca6050d6 (diff) | |
| download | dexon-solidity-cacc3b6bca65b93bb9315bd1b9e42bebec6ed58b.tar dexon-solidity-cacc3b6bca65b93bb9315bd1b9e42bebec6ed58b.tar.gz dexon-solidity-cacc3b6bca65b93bb9315bd1b9e42bebec6ed58b.tar.bz2 dexon-solidity-cacc3b6bca65b93bb9315bd1b9e42bebec6ed58b.tar.lz dexon-solidity-cacc3b6bca65b93bb9315bd1b9e42bebec6ed58b.tar.xz dexon-solidity-cacc3b6bca65b93bb9315bd1b9e42bebec6ed58b.tar.zst dexon-solidity-cacc3b6bca65b93bb9315bd1b9e42bebec6ed58b.zip | |
Merge pull request #855 from chriseth/libraries
Rename libevmasm.
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/FindSolidity.cmake | 2 | ||||
| -rw-r--r-- | cmake/UseSolidity.cmake | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/cmake/FindSolidity.cmake b/cmake/FindSolidity.cmake index f2086b65..440e7d74 100644 --- a/cmake/FindSolidity.cmake +++ b/cmake/FindSolidity.cmake @@ -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}") diff --git a/cmake/UseSolidity.cmake b/cmake/UseSolidity.cmake index 8db2f848..9780464c 100644 --- a/cmake/UseSolidity.cmake +++ b/cmake/UseSolidity.cmake @@ -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() |