From e975c68a428ee77992cb7a150dda4e0e19d52a06 Mon Sep 17 00:00:00 2001 From: Zhaolong Xing Date: Thu, 24 Oct 2019 02:02:21 +0800 Subject: [PATCH] fix protoc compile bug (#2255) test=develop --- cmake/external/protobuf.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/external/protobuf.cmake b/cmake/external/protobuf.cmake index 2a88cf0321..76cc7b21de 100644 --- a/cmake/external/protobuf.cmake +++ b/cmake/external/protobuf.cmake @@ -109,8 +109,7 @@ macro(PROMPT_PROTOBUF_LIB) ADD_LIBRARY(protobuf ${protobuf_LIBTYPE} IMPORTED GLOBAL) SET_PROPERTY(TARGET protobuf PROPERTY IMPORTED_LOCATION ${PROTOBUF_LIBRARY}) - - ADD_LIBRARY(protobuf_lite ${protobuf_LIBTYPE} IMPORTED GLOBAL) +ADD_LIBRARY(protobuf_lite ${protobuf_LIBTYPE} IMPORTED GLOBAL) SET_PROPERTY(TARGET protobuf_lite PROPERTY IMPORTED_LOCATION ${PROTOBUF_LITE_LIBRARY}) ADD_LIBRARY(libprotoc ${protobuf_LIBTYPE} IMPORTED GLOBAL) @@ -253,6 +252,7 @@ FUNCTION(build_protobuf TARGET_NAME BUILD_FOR_HOST) GIT_REPOSITORY "" GIT_TAG ${PROTOBUF_TAG} SOURCE_DIR ${SOURCE_DIR} + BUILD_ALWAYS 1 CONFIGURE_COMMAND ${CMAKE_COMMAND} ${SOURCE_DIR}/cmake ${OPTIONAL_ARGS} -Dprotobuf_BUILD_TESTS=OFF -- GitLab