diff --git a/cmake/configure.cmake b/cmake/configure.cmake index 630c7df5f05a0327acabf510eb13e58366109682..67dfc3c42a840dfcb3943eadb24199dc5670293b 100644 --- a/cmake/configure.cmake +++ b/cmake/configure.cmake @@ -54,9 +54,6 @@ endif(WIN32) if(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") SET(WITH_MKL OFF) diff --git a/cmake/external/protobuf.cmake b/cmake/external/protobuf.cmake index f1a22fb8f6b72988257dcf4cda12209d63cd73b0..8b3ad30b58e3f3217fc61ffef576ccea9f5cc4c1 100644 --- a/cmake/external/protobuf.cmake +++ b/cmake/external/protobuf.cmake @@ -199,7 +199,6 @@ FUNCTION(build_protobuf TARGET_NAME BUILD_FOR_HOST) ENDIF() SET(PROTOBUF_REPOSITORY https://github.com/protocolbuffers/protobuf.git) - #SET(PROTOBUF_TAG 9f75c5aa851cd877fb0d93ccc31b8567a6706546) SET(PROTOBUF_TAG 2761122b810fe8861004ae785cc3ab39f384d342) cache_third_party(${TARGET_NAME} @@ -235,7 +234,6 @@ FUNCTION(build_protobuf TARGET_NAME BUILD_FOR_HOST) ) ENDFUNCTION() -#SET(PROTOBUF_VERSION 3.1.0) SET(PROTOBUF_VERSION 3.5.0) IF(NOT PROTOBUF_FOUND)