From 92ae60b01f0cd5494466fead9da742229a7a00e3 Mon Sep 17 00:00:00 2001 From: Changming Sun Date: Mon, 10 Jun 2024 11:20:33 -0700 Subject: [PATCH] Revert a cmake change in protobuf_cmake.patch (#20964) Avoid patching external projects unless absolutely necessary #20875 --- cmake/patches/protobuf/protobuf_cmake.patch | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/cmake/patches/protobuf/protobuf_cmake.patch b/cmake/patches/protobuf/protobuf_cmake.patch index 35ffc8a7f5..00e1f6f81d 100644 --- a/cmake/patches/protobuf/protobuf_cmake.patch +++ b/cmake/patches/protobuf/protobuf_cmake.patch @@ -1,5 +1,5 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 04cb3303a..4025805cf 100644 +index 04cb3303a..c023001de 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -249,9 +249,7 @@ if (MSVC) @@ -20,12 +20,11 @@ index 04cb3303a..4025805cf 100644 ) # Allow big object add_definitions(/bigobj) -@@ -289,7 +286,7 @@ if (MSVC) +@@ -289,7 +286,6 @@ if (MSVC) else (MSVC) # No version.rc file. set(protobuf_version_rc_file) - -+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-parameter") # When building with "make", "lib" prefix will be added automatically by # the build tool. set(LIB_PREFIX)