fix protobuf build error (#59081)

gouzil · web-flow · commit da87ee8d1fd8 · 2023-11-17T11:57:57.000+08:00
diff --git a/cmake/external/protobuf.cmake b/cmake/external/protobuf.cmake
@@ -182,7 +182,7 @@ if(NOT "${PROTOBUF_ROOT}" STREQUAL "")
   endif()
 endif()
 
-function(build_protobuf TARGET_NAME BUILD_FOR_HOST)
+function(build_protobuf TARGET_NAME)
   string(REPLACE "extern_" "" TARGET_DIR_NAME "${TARGET_NAME}")
   set(PROTOBUF_PREFIX_DIR ${THIRD_PARTY_PATH}/${TARGET_DIR_NAME})
   set(PROTOBUF_SOURCE_DIR
@@ -210,22 +210,18 @@ function(build_protobuf TARGET_NAME BUILD_FOR_HOST)
       PARENT_SCOPE)
 
   set(OPTIONAL_CACHE_ARGS "")
-  set(OPTIONAL_ARGS "")
-  if(BUILD_FOR_HOST)
-    set(OPTIONAL_ARGS "-Dprotobuf_WITH_ZLIB=OFF")
-  else()
-    set(OPTIONAL_ARGS
-        "-DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}"
-        "-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}"
-        "-DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}"
-        "-DCMAKE_C_FLAGS_DEBUG=${CMAKE_C_FLAGS_DEBUG}"
-        "-DCMAKE_C_FLAGS_RELEASE=${CMAKE_C_FLAGS_RELEASE}"
-        "-DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}"
-        "-DCMAKE_CXX_FLAGS_RELEASE=${CMAKE_CXX_FLAGS_RELEASE}"
-        "-DCMAKE_CXX_FLAGS_DEBUG=${CMAKE_CXX_FLAGS_DEBUG}"
-        "-Dprotobuf_WITH_ZLIB=ON"
-        "-DZLIB_ROOT:FILEPATH=${ZLIB_ROOT}"
-        ${EXTERNAL_OPTIONAL_ARGS})
+  set(OPTIONAL_ARGS
+      "-DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}"
+      "-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}"
+      "-DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}"
+      "-DCMAKE_C_FLAGS_DEBUG=${CMAKE_C_FLAGS_DEBUG}"
+      "-DCMAKE_C_FLAGS_RELEASE=${CMAKE_C_FLAGS_RELEASE}"
+      "-DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}"
+      "-DCMAKE_CXX_FLAGS_RELEASE=${CMAKE_CXX_FLAGS_RELEASE}"
+      "-DCMAKE_CXX_FLAGS_DEBUG=${CMAKE_CXX_FLAGS_DEBUG}"
+      "-Dprotobuf_WITH_ZLIB=ON"
+      ${EXTERNAL_OPTIONAL_ARGS})
+  if(NOT APPLE)
     set(OPTIONAL_CACHE_ARGS "-DZLIB_ROOT:STRING=${ZLIB_ROOT}")
   endif()
   if(WIN32)
@@ -339,7 +335,7 @@ else()
 endif()
 
 if(NOT PROTOBUF_FOUND)
-  build_protobuf(extern_protobuf FALSE)
+  build_protobuf(extern_protobuf)
 
   set(PROTOBUF_INCLUDE_DIR
       ${extern_protobuf_INCLUDE_DIR}
