Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
Paddle
提交
fb434083
P
Paddle
项目概览
PaddlePaddle
/
Paddle
11 个月 前同步成功
通知
2292
Star
20931
Fork
5422
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1423
列表
看板
标记
里程碑
合并请求
543
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
Paddle
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1,423
Issue
1,423
列表
看板
标记
里程碑
合并请求
543
合并请求
543
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
fb434083
编写于
5月 31, 2017
作者:
G
gangliao
提交者:
GitHub
5月 31, 2017
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #2326 from wangkuiyi/fix_deps_generic_cmake
Make generic.cmake no longer depend on util.cmake
上级
2b22871d
31b75698
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
31 addition
and
6 deletion
+31
-6
cmake/generic.cmake
cmake/generic.cmake
+31
-6
未找到文件。
cmake/generic.cmake
浏览文件 @
fb434083
...
...
@@ -29,6 +29,25 @@
# 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
# from https://stackoverflow.com/a/29871891/724872.
set
(
THREADS_PREFER_PTHREAD_FLAG ON
)
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(tensor
# SRCS
...
...
@@ -45,7 +64,9 @@ function(cc_library TARGET_NAME)
else
()
add_library
(
${
TARGET_NAME
}
STATIC
${
cc_library_SRCS
}
)
endif
()
add_dependencies
(
${
TARGET_NAME
}
${
cc_library_DEPS
}
${
external_project_dependencies
}
)
if
(
cc_library_DEPS
)
add_dependencies
(
${
TARGET_NAME
}
${
cc_library_DEPS
}
)
endif
()
endfunction
(
cc_library
)
# cc_binary parses tensor.cc and figures out that target also depend on tensor.h.
...
...
@@ -58,11 +79,11 @@ function(cc_binary TARGET_NAME)
set
(
multiValueArgs SRCS DEPS
)
cmake_parse_arguments
(
cc_binary
"
${
options
}
"
"
${
oneValueArgs
}
"
"
${
multiValueArgs
}
"
${
ARGN
}
)
add_executable
(
${
TARGET_NAME
}
${
cc_binary_SRCS
}
)
link_paddle_exe
(
${
TARGET_NAME
}
)
if
(
cc_binary_DEPS
)
target_link_libraries
(
${
TARGET_NAME
}
${
cc_binary_DEPS
}
)
add_dependencies
(
${
TARGET_NAME
}
${
cc_binary_DEPS
}
)
endif
()
link_glog_gflags
(
${
TARGET_NAME
}
)
endfunction
(
cc_binary
)
# The dependency to target tensor implies that if any of
...
...
@@ -78,11 +99,12 @@ function(cc_test TARGET_NAME)
set
(
multiValueArgs SRCS DEPS
)
cmake_parse_arguments
(
cc_test
"
${
options
}
"
"
${
oneValueArgs
}
"
"
${
multiValueArgs
}
"
${
ARGN
}
)
add_executable
(
${
TARGET_NAME
}
${
cc_test_SRCS
}
)
link_paddle_test
(
${
TARGET_NAME
}
)
if
(
cc_test_DEPS
)
target_link_libraries
(
${
TARGET_NAME
}
${
cc_test_DEPS
}
)
add_dependencies
(
${
TARGET_NAME
}
${
cc_test_DEPS
}
)
endif
()
link_glog_gflags
(
${
TARGET_NAME
}
)
link_gtest
(
${
TARGET_NAME
}
)
add_test
(
${
TARGET_NAME
}
${
TARGET_NAME
}
)
endfunction
(
cc_test
)
...
...
@@ -104,7 +126,9 @@ function(nv_library TARGET_NAME)
else
()
cuda_add_library
(
${
TARGET_NAME
}
STATIC
${
nv_library_SRCS
}
)
endif
()
add_dependencies
(
${
TARGET_NAME
}
${
nv_library_DEPS
}
${
external_project_dependencies
}
)
if
(
nv_library_DEPS
)
add_dependencies
(
${
TARGET_NAME
}
${
nv_library_DEPS
}
)
endif
()
endfunction
(
nv_library
)
function
(
nv_binary TARGET_NAME
)
...
...
@@ -113,11 +137,11 @@ function(nv_binary TARGET_NAME)
set
(
multiValueArgs SRCS DEPS
)
cmake_parse_arguments
(
nv_binary
"
${
options
}
"
"
${
oneValueArgs
}
"
"
${
multiValueArgs
}
"
${
ARGN
}
)
cuda_add_executable
(
${
TARGET_NAME
}
${
nv_binary_SRCS
}
)
link_paddle_exe
(
${
TARGET_NAME
}
)
if
(
nv_binary_DEPS
)
target_link_libraries
(
${
TARGET_NAME
}
${
nv_binary_DEPS
}
)
add_dependencies
(
${
TARGET_NAME
}
${
nv_binary_DEPS
}
)
endif
()
link_glog_gflags
(
${
TARGET_NAME
}
)
endfunction
(
nv_binary
)
# The dependency to target tensor implies that if any of
...
...
@@ -133,11 +157,12 @@ function(nv_test TARGET_NAME)
set
(
multiValueArgs SRCS DEPS
)
cmake_parse_arguments
(
nv_test
"
${
options
}
"
"
${
oneValueArgs
}
"
"
${
multiValueArgs
}
"
${
ARGN
}
)
cuda_add_executable
(
${
TARGET_NAME
}
${
nv_test_SRCS
}
)
link_paddle_test
(
${
TARGET_NAME
}
)
if
(
nv_test_DEPS
)
target_link_libraries
(
${
TARGET_NAME
}
${
nv_test_DEPS
}
)
add_dependencies
(
${
TARGET_NAME
}
${
nv_test_DEPS
}
)
endif
()
link_glog_gflags
(
${
TARGET_NAME
}
)
link_gtest
(
${
TARGET_NAME
}
)
add_test
(
${
TARGET_NAME
}
${
TARGET_NAME
}
)
endfunction
(
nv_test
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录