Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
PaddleDetection
提交
a71ed273
P
PaddleDetection
项目概览
PaddlePaddle
/
PaddleDetection
大约 1 年 前同步成功
通知
694
Star
11112
Fork
2696
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
184
列表
看板
标记
里程碑
合并请求
40
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
PaddleDetection
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
184
Issue
184
列表
看板
标记
里程碑
合并请求
40
合并请求
40
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
a71ed273
编写于
6月 30, 2017
作者:
D
dzhwinter
提交者:
GitHub
6月 30, 2017
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #2688 from gangliao/static_lib
FIX: Replace static libs check via system warning
上级
ddc0c214
9e445eca
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
6 addition
and
13 deletion
+6
-13
cmake/generic.cmake
cmake/generic.cmake
+6
-13
未找到文件。
cmake/generic.cmake
浏览文件 @
a71ed273
...
@@ -101,23 +101,16 @@ function(merge_static_libs TARGET_NAME)
...
@@ -101,23 +101,16 @@ function(merge_static_libs TARGET_NAME)
# First get the file names of the libraries to be merged
# First get the file names of the libraries to be merged
foreach
(
lib
${
libs
}
)
foreach
(
lib
${
libs
}
)
get_target_property
(
libtype
${
lib
}
TYPE
)
if
(
NOT libtype STREQUAL
"STATIC_LIBRARY"
)
message
(
FATAL_ERROR
"merge_static_libs can only process static libraries"
)
endif
()
set
(
libfiles
${
libfiles
}
$<TARGET_FILE:
${
lib
}
>
)
set
(
libfiles
${
libfiles
}
$<TARGET_FILE:
${
lib
}
>
)
endforeach
()
endforeach
()
if
(
APPLE
)
# Use OSX's libtool to merge archives
if
(
APPLE
)
# Use OSX's libtool to merge archives
add_custom_target
(
${
TARGET_NAME
}
_archive
set
(
dummyfile
${
CMAKE_CURRENT_BINARY_DIR
}
/
${
TARGET_NAME
}
_dummy.c
)
COMMAND libtool -static -o
"
${
CMAKE_CURRENT_BINARY_DIR
}
/lib
${
TARGET_NAME
}
.a"
${
libfiles
}
file
(
WRITE
${
dummyfile
}
"const char * dummy =
\"
${
dummyfile
}
\"
;"
)
WORKING_DIRECTORY
${
CMAKE_CURRENT_BINARY_DIR
}
add_library
(
${
TARGET_NAME
}
STATIC
${
dummyfile
}
)
DEPENDS
${
libs
}
add_custom_command
(
TARGET
${
TARGET_NAME
}
POST_BUILD
)
COMMAND rm
"
${
CMAKE_CURRENT_BINARY_DIR
}
/lib
${
TARGET_NAME
}
.a"
add_library
(
${
TARGET_NAME
}
STATIC IMPORTED GLOBAL
)
COMMAND /usr/bin/libtool -static -o
"
${
CMAKE_CURRENT_BINARY_DIR
}
/lib
${
TARGET_NAME
}
.a"
${
libfiles
}
)
set_property
(
TARGET
${
TARGET_NAME
}
PROPERTY
IMPORTED_LOCATION
"
${
CMAKE_CURRENT_BINARY_DIR
}
/lib
${
TARGET_NAME
}
.a"
)
add_dependencies
(
${
TARGET_NAME
}
${
TARGET_NAME
}
_archive
)
else
()
# general UNIX: use "ar" to extract objects and re-add to a common lib
else
()
# general UNIX: use "ar" to extract objects and re-add to a common lib
foreach
(
lib
${
libs
}
)
foreach
(
lib
${
libs
}
)
set
(
objlistfile
${
lib
}
.objlist
)
# list of objects in the input library
set
(
objlistfile
${
lib
}
.objlist
)
# list of objects in the input library
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录