Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
YottaChain
YTBP
提交
9d277af9
Y
YTBP
项目概览
YottaChain
/
YTBP
通知
0
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
Y
YTBP
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
9d277af9
编写于
9月 18, 2018
作者:
A
arhag
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'develop' into 5589-fix-get-transaction-bug
上级
9adf8bd0
fd9a57bf
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
22 addition
and
1 deletion
+22
-1
CMakeModules/EosioTester.cmake.in
CMakeModules/EosioTester.cmake.in
+10
-0
CMakeModules/EosioTesterBuild.cmake.in
CMakeModules/EosioTesterBuild.cmake.in
+10
-0
libraries/CMakeLists.txt
libraries/CMakeLists.txt
+1
-0
libraries/wabt
libraries/wabt
+1
-1
未找到文件。
CMakeModules/EosioTester.cmake.in
浏览文件 @
9d277af9
...
...
@@ -50,6 +50,7 @@ endif()
find_library(libbinaryen binaryen @CMAKE_INSTALL_FULL_LIBDIR@)
find_library(libwasm WASM @CMAKE_INSTALL_FULL_LIBDIR@)
find_library(libwast WAST @CMAKE_INSTALL_FULL_LIBDIR@)
find_library(libwabt wabt @CMAKE_INSTALL_FULL_LIBDIR@)
find_library(libir IR @CMAKE_INSTALL_FULL_LIBDIR@)
find_library(libplatform Platform @CMAKE_INSTALL_FULL_LIBDIR@)
find_library(liblogging Logging @CMAKE_INSTALL_FULL_LIBDIR@)
...
...
@@ -59,6 +60,13 @@ find_library(liboscrypto crypto @OPENSSL_ROOT_DIR@/lib)
find_library(libosssl ssl @OPENSSL_ROOT_DIR@/lib)
find_library(libchainbase chainbase @CMAKE_INSTALL_FULL_LIBDIR@)
find_library(libbuiltins builtins @CMAKE_INSTALL_FULL_LIBDIR@)
find_library(libsecp256k1 secp256k1 @CMAKE_INSTALL_FULL_LIBDIR@)
find_library(GMP_LIBRARIES NAMES libgmp.a gmp.lib gmp libgmp-10 mpir
HINTS ENV GMP_LIB_DIR
ENV GMP_DIR
PATH_SUFFIXES lib
DOC "Path to the GMP library"
)
macro(add_eosio_test test_name)
add_executable( ${test_name} ${ARGN} )
...
...
@@ -70,6 +78,7 @@ macro(add_eosio_test test_name)
${libbinaryen}
${libwast}
${libwasm}
${libwabt}
${libruntime}
${libplatform}
${libir}
...
...
@@ -79,6 +88,7 @@ macro(add_eosio_test test_name)
${liblogging}
${libchainbase}
${libbuiltins}
${GMP_LIBRARIES}
${libsecp256k1}
LLVMX86Disassembler
...
...
CMakeModules/EosioTesterBuild.cmake.in
浏览文件 @
9d277af9
...
...
@@ -51,6 +51,7 @@ find_library(libbinaryen binaryen @CMAKE_BINARY_DIR@/externals/binaryen/lib)
find_library(libwasm WASM @CMAKE_BINARY_DIR@/libraries/wasm-jit/Source/WASM)
find_library(libwast WAST @CMAKE_BINARY_DIR@/libraries/wasm-jit/Source/WAST)
find_library(libir IR @CMAKE_BINARY_DIR@/libraries/wasm-jit/Source/IR)
find_library(libwabt wabt @CMAKE_BINARY_DIR@/libraries/wabt)
find_library(libplatform Platform @CMAKE_BINARY_DIR@/libraries/wasm-jit/Source/Platform)
find_library(liblogging Logging @CMAKE_BINARY_DIR@/libraries/wasm-jit/Source/Logging)
find_library(libruntime Runtime @CMAKE_BINARY_DIR@/libraries/wasm-jit/Source/Runtime)
...
...
@@ -59,6 +60,13 @@ find_library(liboscrypto crypto @OPENSSL_ROOT_DIR@/lib)
find_library(libosssl ssl @OPENSSL_ROOT_DIR@/lib)
find_library(libchainbase chainbase @CMAKE_BINARY_DIR@/libraries/chainbase)
find_library(libbuiltins builtins @CMAKE_BINARY_DIR@/libraries/builtins)
find_library(libsecp256k1 secp256k1 @CMAKE_BINARY_DIR@/libraries/fc/secp256k1)
find_library(GMP_LIBRARIES NAMES libgmp.a gmp.lib gmp libgmp-10 mpir
HINTS ENV GMP_LIB_DIR
ENV GMP_DIR
PATH_SUFFIXES lib
DOC "Path to the GMP library"
)
macro(add_eosio_test test_name)
add_executable( ${test_name} ${ARGN} )
...
...
@@ -70,6 +78,7 @@ macro(add_eosio_test test_name)
${libbinaryen}
${libwast}
${libwasm}
${libwabt}
${libruntime}
${libplatform}
${libir}
...
...
@@ -79,6 +88,7 @@ macro(add_eosio_test test_name)
${liblogging}
${libchainbase}
${libbuiltins}
${GMP_LIBRARIES}
${libsecp256k1}
LLVMX86Disassembler
...
...
libraries/CMakeLists.txt
浏览文件 @
9d277af9
...
...
@@ -11,5 +11,6 @@ add_subdirectory( abi_generator )
#turn these off for now
set
(
BUILD_TESTS OFF CACHE BOOL
"Build GTest-based tests"
)
set
(
BUILD_TOOLS OFF CACHE BOOL
"Build wabt tools"
)
set
(
RUN_RE2C OFF CACHE BOOL
"Run re2c"
)
add_subdirectory
(
wabt
)
wabt
@
270e1f9e
比较
67381cbe
...
270e1f9e
Subproject commit
67381cbe17e0ef87d40f3376e99aea7fff0fa0b
1
Subproject commit
270e1f9ee63004578c82a2fe594b81afd84c163
1
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录