Use original onnx (openvinotoolkit#6673)

* Merged ONNX editor and ONNX importer to the one folder * Try to migrate to original ONNX * Remove ONNX_BUILD_SHARED_LIBS * Update ONNX
andrei-cv · Aug 30, 2021 · c1c8657 · c1c8657
1 parent f3a34c7
commit c1c8657
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -40,7 +40,7 @@
 	ignore = dirty
 [submodule "thirdparty/onnx"]
 	path = thirdparty/onnx/onnx
-	url = https://github.com/openvinotoolkit/onnx.git
+	url = https://github.com/onnx/onnx.git
 [submodule "thirdparty/protobuf"]
 	path = thirdparty/protobuf/protobuf
 	url = https://github.com/protocolbuffers/protobuf.git

diff --git a/thirdparty/onnx/CMakeLists.txt b/thirdparty/onnx/CMakeLists.txt
@@ -19,7 +19,6 @@ macro(onnx_set_target_properties)
     target_include_directories(onnx_proto SYSTEM PRIVATE "${Protobuf_INCLUDE_DIRS}")
 
     ov_disable_all_warnings(onnx onnx_proto)
-    target_compile_definitions(onnx PUBLIC ONNX_BUILD_SHARED_LIBS)
 endmacro()
 
 set(ONNX_USE_PROTOBUF_SHARED_LIBS ${BUILD_SHARED_LIBS} CACHE BOOL "Use dynamic protobuf by ONNX library" FORCE)

diff --git a/thirdparty/onnx/onnx b/thirdparty/onnx/onnx