Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
BaiXuePrincess
Paddle
提交
ed562402
P
Paddle
项目概览
BaiXuePrincess
/
Paddle
与 Fork 源项目一致
Fork自
PaddlePaddle / Paddle
通知
1
Star
1
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看板
提交
ed562402
编写于
1月 21, 2017
作者:
F
FoREacH
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Set protobuf CMAKE_INSTALL_LIBDIR to fixed value lib
上级
ad4c62f3
变更
1
显示空白变更内容
内联
并排
Showing
1 changed file
with
4 addition
and
8 deletion
+4
-8
cmake/external/protobuf.cmake
cmake/external/protobuf.cmake
+4
-8
未找到文件。
cmake/external/protobuf.cmake
浏览文件 @
ed562402
...
@@ -29,17 +29,12 @@ IF(WIN32)
...
@@ -29,17 +29,12 @@ IF(WIN32)
"
${
PROTOBUF_INSTALL_DIR
}
/lib/libprotoc.lib"
CACHE FILEPATH
"protoc library."
FORCE
)
"
${
PROTOBUF_INSTALL_DIR
}
/lib/libprotoc.lib"
CACHE FILEPATH
"protoc library."
FORCE
)
SET
(
PROTOBUF_PROTOC_EXECUTABLE
"
${
PROTOBUF_INSTALL_DIR
}
/bin/protoc.exe"
CACHE FILEPATH
"protobuf executable."
FORCE
)
SET
(
PROTOBUF_PROTOC_EXECUTABLE
"
${
PROTOBUF_INSTALL_DIR
}
/bin/protoc.exe"
CACHE FILEPATH
"protobuf executable."
FORCE
)
ELSE
(
WIN32
)
ELSE
(
WIN32
)
IF
(
${
HOST_SYSTEM
}
STREQUAL
"centos"
)
SET
(
LIB
"lib64"
)
ELSE
()
SET
(
LIB
"lib"
)
ENDIF
()
SET
(
PROTOBUF_LITE_LIBRARY
SET
(
PROTOBUF_LITE_LIBRARY
"
${
PROTOBUF_INSTALL_DIR
}
/
${
LIB
}
/libprotobuf-lite.a"
CACHE FILEPATH
"protobuf lite library."
FORCE
)
"
${
PROTOBUF_INSTALL_DIR
}
/
lib
/libprotobuf-lite.a"
CACHE FILEPATH
"protobuf lite library."
FORCE
)
SET
(
PROTOBUF_LIBRARY
SET
(
PROTOBUF_LIBRARY
"
${
PROTOBUF_INSTALL_DIR
}
/
${
LIB
}
/libprotobuf.a"
CACHE FILEPATH
"protobuf library."
FORCE
)
"
${
PROTOBUF_INSTALL_DIR
}
/
lib
/libprotobuf.a"
CACHE FILEPATH
"protobuf library."
FORCE
)
SET
(
PROTOBUF_PROTOC_LIBRARY
SET
(
PROTOBUF_PROTOC_LIBRARY
"
${
PROTOBUF_INSTALL_DIR
}
/
${
LIB
}
/libprotoc.a"
CACHE FILEPATH
"protoc library."
FORCE
)
"
${
PROTOBUF_INSTALL_DIR
}
/
lib
/libprotoc.a"
CACHE FILEPATH
"protoc library."
FORCE
)
SET
(
PROTOBUF_PROTOC_EXECUTABLE
"
${
PROTOBUF_INSTALL_DIR
}
/bin/protoc"
CACHE FILEPATH
"protobuf executable."
FORCE
)
SET
(
PROTOBUF_PROTOC_EXECUTABLE
"
${
PROTOBUF_INSTALL_DIR
}
/bin/protoc"
CACHE FILEPATH
"protobuf executable."
FORCE
)
ENDIF
(
WIN32
)
ENDIF
(
WIN32
)
...
@@ -58,6 +53,7 @@ ExternalProject_Add(
...
@@ -58,6 +53,7 @@ ExternalProject_Add(
-DCMAKE_POSITION_INDEPENDENT_CODE=ON
-DCMAKE_POSITION_INDEPENDENT_CODE=ON
-DCMAKE_BUILD_TYPE=Release
-DCMAKE_BUILD_TYPE=Release
-DCMAKE_INSTALL_PREFIX=
${
PROTOBUF_INSTALL_DIR
}
-DCMAKE_INSTALL_PREFIX=
${
PROTOBUF_INSTALL_DIR
}
-DCMAKE_INSTALL_LIBDIR=lib
)
)
LIST
(
APPEND external_project_dependencies protobuf
)
LIST
(
APPEND external_project_dependencies protobuf
)
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录