diff options
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | cmake/FindSolidity.cmake | 2 | ||||
| -rw-r--r-- | cmake/UseSolidity.cmake | 8 | ||||
| -rw-r--r-- | libevmasm/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | liblll/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | libsolidity/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | lllc/CMakeLists.txt | 2 | ||||
| -rwxr-xr-x | scripts/travis-emscripten/build_emscripten.sh | 2 |
8 files changed, 10 insertions, 12 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 95eaf91c..48447a49 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -39,5 +39,3 @@ endif() if (TESTS AND NOT EMSCRIPTEN) add_subdirectory(test) endif() - -# TODO installation and packaging rules 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 af921b1d..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") + if (${SUBMODULE} STREQUAL "solevmasm") eth_use(${TARGET} ${REQUIRED} Jsoncpp) - target_link_libraries(${TARGET} ${Solidity_EVMASM_LIBRARIES}) + 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() diff --git a/libevmasm/CMakeLists.txt b/libevmasm/CMakeLists.txt index 61162eee..14800f41 100644 --- a/libevmasm/CMakeLists.txt +++ b/libevmasm/CMakeLists.txt @@ -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") diff --git a/liblll/CMakeLists.txt b/liblll/CMakeLists.txt index 3b63e495..b9d220ab 100644 --- a/liblll/CMakeLists.txt +++ b/liblll/CMakeLists.txt @@ -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 ) diff --git a/libsolidity/CMakeLists.txt b/libsolidity/CMakeLists.txt index 56aea829..bcc47e5a 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::soldevcore Solidity::evmasm) +eth_use(${EXECUTABLE} REQUIRED Dev::soldevcore Solidity::solevmasm) install( TARGETS ${EXECUTABLE} RUNTIME DESTINATION bin ARCHIVE DESTINATION lib LIBRARY DESTINATION lib ) diff --git a/lllc/CMakeLists.txt b/lllc/CMakeLists.txt index 5726fbd6..3bd11187 100644 --- a/lllc/CMakeLists.txt +++ b/lllc/CMakeLists.txt @@ -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 ) diff --git a/scripts/travis-emscripten/build_emscripten.sh b/scripts/travis-emscripten/build_emscripten.sh index bb118ba6..285c6338 100755 --- a/scripts/travis-emscripten/build_emscripten.sh +++ b/scripts/travis-emscripten/build_emscripten.sh @@ -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 |