Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Crayon鑫
Paddle
提交
31b75698
P
Paddle
项目概览
Crayon鑫
/
Paddle
与 Fork 源项目一致
Fork自
PaddlePaddle / Paddle
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
Paddle
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
31b75698
编写于
5月 31, 2017
作者:
Y
Yi Wang
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Create link_glog_gflags and link_gtest to replace link_paddle_exe and link_paddle_test
上级
9baac14b
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
20 addition
and
12 deletion
+20
-12
cmake/generic.cmake
cmake/generic.cmake
+20
-12
未找到文件。
cmake/generic.cmake
浏览文件 @
31b75698
...
@@ -29,11 +29,25 @@
...
@@ -29,11 +29,25 @@
# https://cmake.org/cmake/help/v3.0/module/CMakeParseArguments.html
# https://cmake.org/cmake/help/v3.0/module/CMakeParseArguments.html
#
#
# generic.cmake depends on {GLOG,GFLAGS,GTEST,GTEST_MAIN}_LIBRARIES
# generated by cmake/external/*.cmake.
# Because gflags depends on pthread, I copied the following snippet
# Because gflags depends on pthread, I copied the following snippet
# from https://stackoverflow.com/a/29871891/724872.
# from https://stackoverflow.com/a/29871891/724872.
set
(
THREADS_PREFER_PTHREAD_FLAG ON
)
set
(
THREADS_PREFER_PTHREAD_FLAG ON
)
find_package
(
Threads REQUIRED
)
find_package
(
Threads REQUIRED
)
function
(
link_glog_gflags TARGET_NAME
)
target_link_libraries
(
${
TARGET_NAME
}
${
GLOG_LIBRARIES
}
${
GFLAGS_LIBRARIES
}
Threads::Threads
)
add_dependencies
(
${
TARGET_NAME
}
glog gflags
)
endfunction
()
function
(
link_gtest TARGET_NAME
)
target_link_libraries
(
${
TARGET_NAME
}
${
GTEST_LIBRARIES
}
${
GTEST_MAIN_LIBRARIES
}
)
add_dependencies
(
${
TARGET_NAME
}
gtest
)
endfunction
()
# cc_library parses tensor.cc and figures out that target also depend on tensor.h.
# cc_library parses tensor.cc and figures out that target also depend on tensor.h.
# cc_library(tensor
# cc_library(tensor
# SRCS
# SRCS
...
@@ -69,6 +83,7 @@ function(cc_binary TARGET_NAME)
...
@@ -69,6 +83,7 @@ function(cc_binary TARGET_NAME)
target_link_libraries
(
${
TARGET_NAME
}
${
cc_binary_DEPS
}
)
target_link_libraries
(
${
TARGET_NAME
}
${
cc_binary_DEPS
}
)
add_dependencies
(
${
TARGET_NAME
}
${
cc_binary_DEPS
}
)
add_dependencies
(
${
TARGET_NAME
}
${
cc_binary_DEPS
}
)
endif
()
endif
()
link_glog_gflags
(
${
TARGET_NAME
}
)
endfunction
(
cc_binary
)
endfunction
(
cc_binary
)
# The dependency to target tensor implies that if any of
# The dependency to target tensor implies that if any of
...
@@ -88,12 +103,8 @@ function(cc_test TARGET_NAME)
...
@@ -88,12 +103,8 @@ function(cc_test TARGET_NAME)
target_link_libraries
(
${
TARGET_NAME
}
${
cc_test_DEPS
}
)
target_link_libraries
(
${
TARGET_NAME
}
${
cc_test_DEPS
}
)
add_dependencies
(
${
TARGET_NAME
}
${
cc_test_DEPS
}
)
add_dependencies
(
${
TARGET_NAME
}
${
cc_test_DEPS
}
)
endif
()
endif
()
target_link_libraries
(
${
TARGET_NAME
}
link_glog_gflags
(
${
TARGET_NAME
}
)
${
GTEST_LIBRARIES
}
${
GTEST_MAIN_LIBRARIES
}
link_gtest
(
${
TARGET_NAME
}
)
${
GLOG_LIBRARIES
}
${
GFLAGS_LIBRARIES
}
Threads::Threads
)
add_dependencies
(
${
TARGET_NAME
}
gtest glog gflags
)
add_test
(
${
TARGET_NAME
}
${
TARGET_NAME
}
)
add_test
(
${
TARGET_NAME
}
${
TARGET_NAME
}
)
endfunction
(
cc_test
)
endfunction
(
cc_test
)
...
@@ -130,6 +141,7 @@ function(nv_binary TARGET_NAME)
...
@@ -130,6 +141,7 @@ function(nv_binary TARGET_NAME)
target_link_libraries
(
${
TARGET_NAME
}
${
nv_binary_DEPS
}
)
target_link_libraries
(
${
TARGET_NAME
}
${
nv_binary_DEPS
}
)
add_dependencies
(
${
TARGET_NAME
}
${
nv_binary_DEPS
}
)
add_dependencies
(
${
TARGET_NAME
}
${
nv_binary_DEPS
}
)
endif
()
endif
()
link_glog_gflags
(
${
TARGET_NAME
}
)
endfunction
(
nv_binary
)
endfunction
(
nv_binary
)
# The dependency to target tensor implies that if any of
# The dependency to target tensor implies that if any of
...
@@ -149,12 +161,8 @@ function(nv_test TARGET_NAME)
...
@@ -149,12 +161,8 @@ function(nv_test TARGET_NAME)
target_link_libraries
(
${
TARGET_NAME
}
${
nv_test_DEPS
}
)
target_link_libraries
(
${
TARGET_NAME
}
${
nv_test_DEPS
}
)
add_dependencies
(
${
TARGET_NAME
}
${
nv_test_DEPS
}
)
add_dependencies
(
${
TARGET_NAME
}
${
nv_test_DEPS
}
)
endif
()
endif
()
target_link_libraries
(
${
TARGET_NAME
}
link_glog_gflags
(
${
TARGET_NAME
}
)
${
GTEST_LIBRARIES
}
${
GTEST_MAIN_LIBRARIES
}
link_gtest
(
${
TARGET_NAME
}
)
${
GLOG_LIBRARIES
}
${
GFLAGS_LIBRARIES
}
Threads::Threads
)
add_dependencies
(
${
TARGET_NAME
}
gtest glog gflags
)
add_test
(
${
TARGET_NAME
}
${
TARGET_NAME
}
)
add_test
(
${
TARGET_NAME
}
${
TARGET_NAME
}
)
endfunction
(
nv_test
)
endfunction
(
nv_test
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录