Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Oneflow-Inc
oneflow
提交
fd3b230e
O
oneflow
项目概览
Oneflow-Inc
/
oneflow
上一次同步 2 年多
通知
13
Star
2733
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
O
oneflow
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
fd3b230e
编写于
4月 13, 2017
作者:
J
jinhui yuan
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'dev_jiyuan' of
https://github.com/Oneflow-Inc/oneflow
into dev_jiyuan
上级
bed4ede7
2061e2bf
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
7 addition
and
11 deletion
+7
-11
CMakeLists.txt
CMakeLists.txt
+0
-4
cmake/external/gflags.cmake
cmake/external/gflags.cmake
+1
-1
cmake/external/glog.cmake
cmake/external/glog.cmake
+1
-1
cmake/external/googletest.cmake
cmake/external/googletest.cmake
+1
-1
cmake/external/grpc.cmake
cmake/external/grpc.cmake
+1
-1
cmake/external/protobuf.cmake
cmake/external/protobuf.cmake
+3
-3
未找到文件。
CMakeLists.txt
浏览文件 @
fd3b230e
...
...
@@ -156,7 +156,3 @@ foreach(cc ${of_all_test})
add_test
(
NAME
${
test_name
}
COMMAND
${
test_exe_name
}
)
endforeach
()
# SHOW_VARIABLES()
message
(
STATUS
"Generator:
${
CMAKE_GENERATOR
}
"
)
message
(
STATUS
"APPLE:
${
APPLE
}
"
)
message
(
STATUS
"WIN32:
${
WIN32
}
"
)
\ No newline at end of file
cmake/external/gflags.cmake
浏览文件 @
fd3b230e
...
...
@@ -11,7 +11,7 @@ set(gflags_TAG 9314597d4b742ed6f95665241345e590a0f5759b)
if
(
WIN32
)
set
(
GFLAGS_BUILD_LIBRARY_DIR
${
gflags_LIB_DIR
}
/
${
CMAKE_BUILD_TYPE
}
)
set
(
GFLAGS_LIBRARY_NAMES gflags_static.lib
)
elseif
(
APPLE
and
(
${
CMAKE_GENERATOR
}
STREQUAL
"Xcode"
))
elseif
(
APPLE
AND
(
"
${
CMAKE_GENERATOR
}
"
STREQUAL
"Xcode"
))
set
(
GFLAGS_BUILD_LIBRARY_DIR
${
gflags_LIB_DIR
}
/
${
CMAKE_BUILD_TYPE
}
)
set
(
GFLAGS_LIBRARY_NAMES libgflags.a
)
else
()
...
...
cmake/external/glog.cmake
浏览文件 @
fd3b230e
...
...
@@ -9,7 +9,7 @@ set(glog_TAG da816ea70645e463aa04f9564544939fa327d5a7)
if
(
WIN32
)
set
(
GLOG_BUILD_LIBRARY_DIR
${
CMAKE_CURRENT_BINARY_DIR
}
/glog/src/glog/
${
CMAKE_BUILD_TYPE
}
)
set
(
GLOG_LIBRARY_NAMES glog.lib
)
elseif
(
APPLE
and
(
${
CMAKE_GENERATOR
}
STREQUAL
"Xcode"
))
elseif
(
APPLE
AND
(
"
${
CMAKE_GENERATOR
}
"
STREQUAL
"Xcode"
))
set
(
GLOG_BUILD_LIBRARY_DIR
${
CMAKE_CURRENT_BINARY_DIR
}
/glog/src/glog/
${
CMAKE_BUILD_TYPE
}
)
set
(
GLOG_LIBRARY_NAMES libglog.a
)
else
()
...
...
cmake/external/googletest.cmake
浏览文件 @
fd3b230e
...
...
@@ -10,7 +10,7 @@ set(googletest_TAG ec44c6c1675c25b9827aacd08c02433cccde7780)
if
(
WIN32
)
set
(
GOOGLETEST_BUILD_LIBRARY_DIR
${
CMAKE_CURRENT_BINARY_DIR
}
/googletest/src/googletest/googletest/
${
CMAKE_BUILD_TYPE
}
)
set
(
GOOGLETEST_LIBRARY_NAMES gtest.lib
)
elseif
(
APPLE
and
(
${
CMAKE_GENERATOR
}
STREQUAL
"Xcode"
))
elseif
(
APPLE
AND
(
"
${
CMAKE_GENERATOR
}
"
STREQUAL
"Xcode"
))
set
(
GOOGLETEST_BUILD_LIBRARY_DIR
${
CMAKE_CURRENT_BINARY_DIR
}
/googletest/src/googletest/googletest/
${
CMAKE_BUILD_TYPE
}
)
set
(
GOOGLETEST_LIBRARY_NAMES libgtest.a
)
else
()
...
...
cmake/external/grpc.cmake
浏览文件 @
fd3b230e
...
...
@@ -12,7 +12,7 @@ if(WIN32)
set
(
GRPC_LIBRARY_NAMES gpr.lib
grpc_unsecure.lib
grpc++_unsecure.lib
)
elseif
(
APPLE
and
(
${
CMAKE_GENERATOR
}
STREQUAL
"Xcode"
))
elseif
(
APPLE
AND
(
"
${
CMAKE_GENERATOR
}
"
STREQUAL
"Xcode"
))
set
(
GRPC_BUILD_LIBRARY_DIR
${
CMAKE_CURRENT_BINARY_DIR
}
/grpc/src/grpc/
${
CMAKE_BUILD_TYPE
}
)
set
(
GRPC_LIBRARY_NAMES libgpr.a
libgrpc_unsecure.a
...
...
cmake/external/protobuf.cmake
浏览文件 @
fd3b230e
...
...
@@ -12,8 +12,8 @@ if(WIN32)
set
(
PROTOBUF_BUILD_LIBRARY_DIR
${
CMAKE_CURRENT_BINARY_DIR
}
/protobuf/src/protobuf/
${
CMAKE_BUILD_TYPE
}
)
set
(
PROTOBUF_LIBRARY_NAMES libprotobufd.lib
)
set
(
PROTOC_EXECUTABLE_NAME protoc.exe
)
elseif
(
APPLE
and
(
${
CMAKE_GENERATOR
}
STREQUAL
"Xcode"
))
set
(
PROTOBUF_BUILD_LIBRARY_DIR
${
CMAKE_CURRENT_BINARY_DIR
}
/protobuf/src/protobuf
/
${
CMAKE_BUILD_TYPE
}
)
elseif
(
APPLE
AND
(
"
${
CMAKE_GENERATOR
}
"
STREQUAL
"Xcode"
))
set
(
PROTOBUF_BUILD_LIBRARY_DIR
${
CMAKE_CURRENT_BINARY_DIR
}
/protobuf/src/protobuf
)
set
(
PROTOBUF_LIBRARY_NAMES libprotobuf.a
)
set
(
PROTOC_EXECUTABLE_NAME protoc
)
else
()
...
...
@@ -75,4 +75,4 @@ add_custom_target(protobuf_create_binary_dir
add_custom_target
(
protobuf_copy_binary_to_destination
COMMAND
${
CMAKE_COMMAND
}
-E copy_if_different
${
PROTOBUF_BUILD_PROTOC_EXECUTABLE
}
${
PROTOBUF_BINARY_DIR
}
DEPENDS protobuf_create_binary_dir
)
\ No newline at end of file
DEPENDS protobuf_create_binary_dir
)
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录