mirror of
https://github.com/saymrwulf/onnxruntime.git
synced 2026-06-30 03:37:44 +00:00
80f807c03d
### Description upgrade protobuf to 3.20.2, same as onnx 1.13.0 ### Motivation and Context Per component governance requirement and Fixes #14060 unused-parameter error occurs in 2 conditions. 1. compile protolbuf `onnxruntime_src/cmake/external/protobuf/src/google/protobuf/repeated_ptr_field.h:752:66: error: unused parameter ‘prototype’ [-Werror=unused-parameter]` 2. include onnx_pb.h ``` 2023-01-28T10:20:15.0410853Z FAILED: CMakeFiles/onnxruntime_pybind11_state.dir/onnxruntime_src/onnxruntime/python/onnxruntime_pybind_iobinding.cc.o ...... 2023-01-28T10:20:15.0466024Z from /build/Debug/_deps/onnx-src/onnx/onnx_pb.h:51, 2023-01-28T10:20:15.0466958Z from /onnxruntime_src/include/onnxruntime/core/framework/to_tensor_proto_element_type.h:10, .... 2023-01-28T10:20:15.0609678Z /build/Debug/_deps/onnx-build/onnx/onnx-operators-ml.pb.h:1178:25: required from here 2023-01-28T10:20:15.0610895Z /onnxruntime_src/cmake/external/protobuf/src/google/protobuf/repeated_ptr_field.h:752:66: error: unused parameter ‘prototype’ [-Werror=unused-parameter] 2023-01-28T10:20:15.0611707Z cc1plus: all warnings being treated as errors ``` https://dev.azure.com/onnxruntime/2a773b67-e88b-4c7f-9fc0-87d31fea8ef2/_apis/build/builds/874605/logs/22
31 lines
1.3 KiB
Diff
31 lines
1.3 KiB
Diff
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
|
|
index ac92442a1..e930cbd2e 100644
|
|
--- a/cmake/CMakeLists.txt
|
|
+++ b/cmake/CMakeLists.txt
|
|
@@ -240,9 +240,7 @@ if (MSVC)
|
|
# MSVC warning suppressions
|
|
add_definitions(
|
|
/wd4065 # switch statement contains 'default' but no 'case' labels
|
|
- /wd4244 # 'conversion' conversion from 'type1' to 'type2', possible loss of data
|
|
/wd4251 # 'identifier' : class 'type' needs to have dll-interface to be used by clients of class 'type2'
|
|
- /wd4267 # 'var' : conversion from 'size_t' to 'type', possible loss of data
|
|
/wd4305 # 'identifier' : truncation from 'type1' to 'type2'
|
|
/wd4307 # 'operator' : integral constant overflow
|
|
/wd4309 # 'conversion' : truncation of constant value
|
|
@@ -250,7 +248,6 @@ if (MSVC)
|
|
/wd4355 # 'this' : used in base member initializer list
|
|
/wd4506 # no definition for inline function 'function'
|
|
/wd4800 # 'type' : forcing value to bool 'true' or 'false' (performance warning)
|
|
- /wd4996 # The compiler encountered a deprecated declaration.
|
|
)
|
|
# Allow big object
|
|
add_definitions(/bigobj)
|
|
@@ -272,6 +269,8 @@ if (MSVC)
|
|
endif()
|
|
|
|
configure_file(version.rc.in ${CMAKE_CURRENT_BINARY_DIR}/version.rc @ONLY)
|
|
+else (MSVC)
|
|
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-parameter")
|
|
endif (MSVC)
|
|
|
|
|