Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
暴走的小小菜鸟
Paddle
提交
e73f4a79
P
Paddle
项目概览
暴走的小小菜鸟
/
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,发现更多精彩内容 >>
提交
e73f4a79
编写于
5月 27, 2017
作者:
Y
Yu Yang
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Set protobuf version when PROTOBUF_ROOT set
上级
e3e0e825
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
7 addition
and
2 deletion
+7
-2
cmake/external/protobuf.cmake
cmake/external/protobuf.cmake
+7
-2
未找到文件。
cmake/external/protobuf.cmake
浏览文件 @
e73f4a79
...
@@ -17,9 +17,14 @@ INCLUDE(ExternalProject)
...
@@ -17,9 +17,14 @@ INCLUDE(ExternalProject)
macro
(
PROMPT_PROTOBUF_LIB
)
macro
(
PROMPT_PROTOBUF_LIB
)
MESSAGE
(
STATUS
"Protobuf protoc executable:
${
PROTOBUF_PROTOC_EXECUTABLE
}
"
)
MESSAGE
(
STATUS
"Protobuf protoc executable:
${
PROTOBUF_PROTOC_EXECUTABLE
}
"
)
MESSAGE
(
STATUS
"Protobuf library:
${
PROTOBUF_LIBRARY
}
"
)
MESSAGE
(
STATUS
"Protobuf library:
${
PROTOBUF_LIBRARY
}
"
)
MESSAGE
(
STATUS
"Protobuf version:
${
PROTOBUF_VERSION
}
"
)
INCLUDE_DIRECTORIES
(
${
PROTOBUF_INCLUDE_DIR
}
)
INCLUDE_DIRECTORIES
(
${
PROTOBUF_INCLUDE_DIR
}
)
RETURN
()
RETURN
()
endmacro
()
endmacro
()
macro
(
SET_PROTOBUF_VERSION
)
EXEC_PROGRAM
(
${
PROTOBUF_PROTOC_EXECUTABLE
}
ARGS --version OUTPUT_VARIABLE PROTOBUF_VERSION
)
STRING
(
REGEX MATCH
"[0-9]+.[0-9]+"
PROTOBUF_VERSION
"
${
PROTOBUF_VERSION
}
"
)
endmacro
()
set
(
PROTOBUF_ROOT
""
CACHE PATH
"Folder contains protobuf"
)
set
(
PROTOBUF_ROOT
""
CACHE PATH
"Folder contains protobuf"
)
if
(
NOT
"
${
PROTOBUF_ROOT
}
"
STREQUAL
""
)
if
(
NOT
"
${
PROTOBUF_ROOT
}
"
STREQUAL
""
)
...
@@ -30,6 +35,7 @@ if (NOT "${PROTOBUF_ROOT}" STREQUAL "")
...
@@ -30,6 +35,7 @@ if (NOT "${PROTOBUF_ROOT}" STREQUAL "")
find_program
(
PROTOBUF_PROTOC_EXECUTABLE protoc PATHS
${
PROTOBUF_ROOT
}
/bin
)
find_program
(
PROTOBUF_PROTOC_EXECUTABLE protoc PATHS
${
PROTOBUF_ROOT
}
/bin
)
if
(
PROTOBUF_INCLUDE_DIR AND PROTOBUF_LIBRARY AND PROTOBUF_LITE_LIBRARY AND PROTOBUF_PROTOC_LIBRARY AND PROTOBUF_PROTOC_EXECUTABLE
)
if
(
PROTOBUF_INCLUDE_DIR AND PROTOBUF_LIBRARY AND PROTOBUF_LITE_LIBRARY AND PROTOBUF_PROTOC_LIBRARY AND PROTOBUF_PROTOC_EXECUTABLE
)
message
(
STATUS
"Using custom protobuf library in
${
PROTOBUF_ROOT
}
."
)
message
(
STATUS
"Using custom protobuf library in
${
PROTOBUF_ROOT
}
."
)
SET_PROTOBUF_VERSION
()
PROMPT_PROTOBUF_LIB
()
PROMPT_PROTOBUF_LIB
()
else
()
else
()
message
(
WARNING
"Cannot find protobuf library in
${
PROTOBUF_ROOT
}
."
)
message
(
WARNING
"Cannot find protobuf library in
${
PROTOBUF_ROOT
}
."
)
...
@@ -100,8 +106,7 @@ IF(NOT CMAKE_CROSSCOMPILING)
...
@@ -100,8 +106,7 @@ IF(NOT CMAKE_CROSSCOMPILING)
FIND_PACKAGE
(
Protobuf
${
PROTOBUF_VERSION
}
)
FIND_PACKAGE
(
Protobuf
${
PROTOBUF_VERSION
}
)
IF
(
PROTOBUF_FOUND
)
IF
(
PROTOBUF_FOUND
)
EXEC_PROGRAM
(
${
PROTOBUF_PROTOC_EXECUTABLE
}
ARGS --version OUTPUT_VARIABLE PROTOBUF_VERSION
)
SET_PROTOBUF_VERSION
()
STRING
(
REGEX MATCH
"[0-9]+.[0-9]+"
PROTOBUF_VERSION
"
${
PROTOBUF_VERSION
}
"
)
IF
(
"
${
PROTOBUF_VERSION
}
"
VERSION_LESS
"3.1.0"
)
IF
(
"
${
PROTOBUF_VERSION
}
"
VERSION_LESS
"3.1.0"
)
SET
(
PROTOBUF_FOUND OFF
)
SET
(
PROTOBUF_FOUND OFF
)
ENDIF
()
ENDIF
()
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录