aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorchriseth <c@ethdev.com>2016-03-24 06:10:10 +0800
committerchriseth <c@ethdev.com>2016-03-24 06:10:10 +0800
commit79167aa8977af99c93d79de1de51c71082922f23 (patch)
treebce91de02f7fe301fbb436f3733589e515a822c7
parent2851967dac1c23888dc24602bf6a61d4270159d9 (diff)
downloaddexon-solidity-79167aa8977af99c93d79de1de51c71082922f23.tar
dexon-solidity-79167aa8977af99c93d79de1de51c71082922f23.tar.gz
dexon-solidity-79167aa8977af99c93d79de1de51c71082922f23.tar.bz2
dexon-solidity-79167aa8977af99c93d79de1de51c71082922f23.tar.lz
dexon-solidity-79167aa8977af99c93d79de1de51c71082922f23.tar.xz
dexon-solidity-79167aa8977af99c93d79de1de51c71082922f23.tar.zst
dexon-solidity-79167aa8977af99c93d79de1de51c71082922f23.zip
Move libevmasm and lll.
-rw-r--r--CMakeLists.txt2
-rw-r--r--liblll/CMakeLists.txt2
-rw-r--r--libsolidity/CMakeLists.txt2
-rw-r--r--lllc/CMakeLists.txt2
4 files changed, 3 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 10b83aad..18566bc7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -32,8 +32,6 @@ add_subdirectory(solc)
if (NOT EMSCRIPTEN)
add_subdirectory(liblll)
add_subdirectory(test)
-endif()
-if (ETHASHCL)
add_subdirectory(lllc)
endif()
diff --git a/liblll/CMakeLists.txt b/liblll/CMakeLists.txt
index 734f6901..97a1a186 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 Eth::evmasm)
+eth_use(${EXECUTABLE} REQUIRED Solidity::evmasm)
#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 fa2f4e9c..ab9ee1e2 100644
--- a/libsolidity/CMakeLists.txt
+++ b/libsolidity/CMakeLists.txt
@@ -14,7 +14,7 @@ file(GLOB HEADERS "*/*.h")
include_directories(BEFORE ..)
add_library(${EXECUTABLE} ${SRC_LIST} ${HEADERS})
-eth_use(${EXECUTABLE} REQUIRED Dev::devcore Eth::evmcore Eth::evmasm)
+eth_use(${EXECUTABLE} REQUIRED Dev::devcore Eth::evmcore Solidity::evmasm)
install( TARGETS ${EXECUTABLE} RUNTIME DESTINATION bin ARCHIVE DESTINATION lib LIBRARY DESTINATION lib )
install( FILES ${HEADERS} DESTINATION include/${EXECUTABLE} )
diff --git a/lllc/CMakeLists.txt b/lllc/CMakeLists.txt
index a9432432..989b8cbf 100644
--- a/lllc/CMakeLists.txt
+++ b/lllc/CMakeLists.txt
@@ -6,7 +6,7 @@ file(GLOB HEADERS "*.h")
include_directories(BEFORE ..)
add_executable(${EXECUTABLE} ${SRC_LIST} ${HEADERS})
-eth_use(${EXECUTABLE} REQUIRED Eth::lll Dev::buildinfo)
+eth_use(${EXECUTABLE} REQUIRED Solidity::lll Dev::buildinfo)
install( TARGETS ${EXECUTABLE} DESTINATION bin )