Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
afeixing77
Paddle
提交
ae2026e1
P
Paddle
项目概览
afeixing77
/
Paddle
与 Fork 源项目一致
Fork自
PaddlePaddle / Paddle
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
Paddle
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
ae2026e1
编写于
3月 01, 2018
作者:
Y
Yiqun Liu
提交者:
GitHub
3月 01, 2018
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix building error of missing end-group for Android. (#8680)
上级
9fbe2e36
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
18 addition
and
11 deletion
+18
-11
CMakeLists.txt
CMakeLists.txt
+5
-5
cmake/external/zlib.cmake
cmake/external/zlib.cmake
+5
-3
cmake/generic.cmake
cmake/generic.cmake
+8
-3
未找到文件。
CMakeLists.txt
浏览文件 @
ae2026e1
...
...
@@ -166,11 +166,11 @@ include_directories("${CMAKE_CURRENT_BINARY_DIR}/proto")
include_directories
(
"
${
CMAKE_CURRENT_BINARY_DIR
}
/go/pserver/client/c"
)
set
(
EXTERNAL_LIBS
${
GFLAGS_LIBRARIES
}
${
GLOG_LIBRARIES
}
${
CBLAS_LIBRARIES
}
${
PROTOBUF_LIBRARY
}
${
ZLIB_LIBRARIES
}
gflags
glog
cblas
protobuf
zlib
${
PYTHON_LIBRARIES
}
)
...
...
cmake/external/zlib.cmake
浏览文件 @
ae2026e1
...
...
@@ -28,7 +28,7 @@ ENDIF(WIN32)
INCLUDE_DIRECTORIES
(
${
ZLIB_INCLUDE_DIR
}
)
ExternalProject_Add
(
zlib
extern_
zlib
${
EXTERNAL_PROJECT_LOG_ARGS
}
GIT_REPOSITORY
"https://github.com/madler/zlib.git"
GIT_TAG
"v1.2.8"
...
...
@@ -49,9 +49,11 @@ ExternalProject_Add(
-DCMAKE_BUILD_TYPE:STRING=
${
THIRD_PARTY_BUILD_TYPE
}
)
ADD_LIBRARY
(
zlib STATIC IMPORTED GLOBAL
)
SET_PROPERTY
(
TARGET zlib PROPERTY IMPORTED_LOCATION
${
ZLIB_LIBRARIES
}
)
ADD_DEPENDENCIES
(
zlib extern_zlib
)
LIST
(
APPEND external_project_dependencies zlib
)
ADD_LIBRARY
(
zlib_target STATIC IMPORTED GLOBAL
)
SET_PROPERTY
(
TARGET zlib_target PROPERTY IMPORTED_LOCATION
${
ZLIB_LIBRARIES
}
)
IF
(
WITH_C_API
)
INSTALL
(
DIRECTORY
${
ZLIB_INCLUDE_DIR
}
DESTINATION third_party/zlib
)
...
...
cmake/generic.cmake
浏览文件 @
ae2026e1
...
...
@@ -104,7 +104,9 @@ function(merge_static_libs TARGET_NAME)
foreach
(
lib
${
libs
}
)
list
(
APPEND libs_deps
${${
lib
}
_LIB_DEPENDS
}
)
endforeach
()
list
(
REMOVE_DUPLICATES libs_deps
)
if
(
libs_deps
)
list
(
REMOVE_DUPLICATES libs_deps
)
endif
()
# To produce a library we need at least one source file.
# It is created by add_custom_command below and will helps
...
...
@@ -191,10 +193,13 @@ function(cc_library TARGET_NAME)
list
(
REMOVE_ITEM cc_library_DEPS warpctc
)
add_dependencies
(
${
TARGET_NAME
}
warpctc
)
endif
()
# Support linking flags: --whole-archive (Linux) / -force_load (MacOS)
target_circle_link_libraries
(
${
TARGET_NAME
}
${
cc_library_DEPS
}
)
if
(
"
${
cc_library_DEPS
}
"
MATCHES
"ARCHIVE_START"
)
# Support linking flags: --whole-archive (Linux) / -force_load (MacOS).
# WARNING: Please don't use ARCHIVE_START&ARCHIVE_END if TARGET_NAME will be linked by other libraries.
target_circle_link_libraries
(
${
TARGET_NAME
}
${
cc_library_DEPS
}
)
list
(
REMOVE_ITEM cc_library_DEPS ARCHIVE_START ARCHIVE_END
)
else
()
target_link_libraries
(
${
TARGET_NAME
}
${
cc_library_DEPS
}
)
endif
()
add_dependencies
(
${
TARGET_NAME
}
${
cc_library_DEPS
}
)
endif
()
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录