提交 dec3371c 编写于 作者: C chenzhiyu

upgrade protobuf version to 3.5.0 to fix problem in compiling with musl lib

上级 0c17f7d9
...@@ -54,9 +54,6 @@ endif(WIN32) ...@@ -54,9 +54,6 @@ endif(WIN32)
if(WITH_MUSL) if(WITH_MUSL)
add_definitions(-DPADDLE_WITH_MUSL) add_definitions(-DPADDLE_WITH_MUSL)
message(STATUS, "WITH_CRYPTO=OFF, when WITH_MUSL=ON")
SET(WITH_CRYPTO OFF)
message(STATUS, "WITH_MKL=OFF, when WITH_MUSL=ON") message(STATUS, "WITH_MKL=OFF, when WITH_MUSL=ON")
SET(WITH_MKL OFF) SET(WITH_MKL OFF)
......
...@@ -199,7 +199,6 @@ FUNCTION(build_protobuf TARGET_NAME BUILD_FOR_HOST) ...@@ -199,7 +199,6 @@ FUNCTION(build_protobuf TARGET_NAME BUILD_FOR_HOST)
ENDIF() ENDIF()
SET(PROTOBUF_REPOSITORY https://github.com/protocolbuffers/protobuf.git) SET(PROTOBUF_REPOSITORY https://github.com/protocolbuffers/protobuf.git)
#SET(PROTOBUF_TAG 9f75c5aa851cd877fb0d93ccc31b8567a6706546)
SET(PROTOBUF_TAG 2761122b810fe8861004ae785cc3ab39f384d342) SET(PROTOBUF_TAG 2761122b810fe8861004ae785cc3ab39f384d342)
cache_third_party(${TARGET_NAME} cache_third_party(${TARGET_NAME}
...@@ -235,7 +234,6 @@ FUNCTION(build_protobuf TARGET_NAME BUILD_FOR_HOST) ...@@ -235,7 +234,6 @@ FUNCTION(build_protobuf TARGET_NAME BUILD_FOR_HOST)
) )
ENDFUNCTION() ENDFUNCTION()
#SET(PROTOBUF_VERSION 3.1.0)
SET(PROTOBUF_VERSION 3.5.0) SET(PROTOBUF_VERSION 3.5.0)
IF(NOT PROTOBUF_FOUND) IF(NOT PROTOBUF_FOUND)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册