Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
s920243400
PaddleDetection
提交
37114700
P
PaddleDetection
项目概览
s920243400
/
PaddleDetection
与 Fork 源项目一致
Fork自
PaddlePaddle / PaddleDetection
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
PaddleDetection
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
37114700
编写于
5月 26, 2017
作者:
Y
Yu Yang
提交者:
GitHub
5月 26, 2017
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #2281 from reyoung/feature/make_user_can_define_protobuf
Add user can define PROTOBUF_ROOT.
上级
1220f385
f6cf9fa8
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
25 addition
and
3 deletion
+25
-3
.gitignore
.gitignore
+2
-0
cmake/external/protobuf.cmake
cmake/external/protobuf.cmake
+23
-3
未找到文件。
.gitignore
浏览文件 @
37114700
...
@@ -16,3 +16,5 @@ third_party/
...
@@ -16,3 +16,5 @@ third_party/
*~
*~
bazel-*
bazel-*
third_party/
third_party/
# for clion
cmake-build-*
cmake/external/protobuf.cmake
浏览文件 @
37114700
...
@@ -14,6 +14,28 @@
...
@@ -14,6 +14,28 @@
INCLUDE
(
ExternalProject
)
INCLUDE
(
ExternalProject
)
macro
(
PROMPT_PROTOBUF_LIB
)
MESSAGE
(
STATUS
"Protobuf protoc executable:
${
PROTOBUF_PROTOC_EXECUTABLE
}
"
)
MESSAGE
(
STATUS
"Protobuf library:
${
PROTOBUF_LIBRARY
}
"
)
INCLUDE_DIRECTORIES
(
${
PROTOBUF_INCLUDE_DIR
}
)
RETURN
()
endmacro
()
set
(
PROTOBUF_ROOT
""
CACHE PATH
"Folder contains protobuf"
)
if
(
NOT
"
${
PROTOBUF_ROOT
}
"
STREQUAL
""
)
find_path
(
PROTOBUF_INCLUDE_DIR google/protobuf/message.h PATHS
${
PROTOBUF_ROOT
}
/include
)
find_library
(
PROTOBUF_LIBRARY protobuf PATHS
${
PROTOBUF_ROOT
}
/lib
)
find_library
(
PROTOBUF_LITE_LIBRARY protobuf-lite PATHS
${
PROTOBUF_ROOT
}
/lib
)
find_library
(
PROTOBUF_PROTOC_LIBRARY protoc PATHS
${
PROTOBUF_ROOT
}
/lib
)
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
)
message
(
STATUS
"Using custom protobuf library in
${
PROTOBUF_ROOT
}
."
)
PROMPT_PROTOBUF_LIB
()
else
()
message
(
WARNING
"Cannot find protobuf library in
${
PROTOBUF_ROOT
}
."
)
endif
()
endif
()
FUNCTION
(
build_protobuf TARGET_NAME BUILD_FOR_HOST
)
FUNCTION
(
build_protobuf TARGET_NAME BUILD_FOR_HOST
)
SET
(
PROTOBUF_SOURCES_DIR
${
THIRD_PARTY_PATH
}
/
${
TARGET_NAME
}
)
SET
(
PROTOBUF_SOURCES_DIR
${
THIRD_PARTY_PATH
}
/
${
TARGET_NAME
}
)
SET
(
PROTOBUF_INSTALL_DIR
${
THIRD_PARTY_PATH
}
/install/
${
TARGET_NAME
}
)
SET
(
PROTOBUF_INSTALL_DIR
${
THIRD_PARTY_PATH
}
/install/
${
TARGET_NAME
}
)
...
@@ -107,6 +129,4 @@ IF(NOT PROTOBUF_FOUND)
...
@@ -107,6 +129,4 @@ IF(NOT PROTOBUF_FOUND)
SET
(
PROTOBUF_PROTOC_LIBRARY
${
protobuf_PROTOC_LIBRARY
}
CACHE FILEPATH
"protoc library."
FORCE
)
SET
(
PROTOBUF_PROTOC_LIBRARY
${
protobuf_PROTOC_LIBRARY
}
CACHE FILEPATH
"protoc library."
FORCE
)
ENDIF
(
NOT PROTOBUF_FOUND
)
ENDIF
(
NOT PROTOBUF_FOUND
)
MESSAGE
(
STATUS
"Protobuf protoc executable:
${
PROTOBUF_PROTOC_EXECUTABLE
}
"
)
PROMPT_PROTOBUF_LIB
()
MESSAGE
(
STATUS
"Protobuf library:
${
PROTOBUF_LIBRARY
}
"
)
\ No newline at end of file
INCLUDE_DIRECTORIES
(
${
PROTOBUF_INCLUDE_DIR
}
)
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录