diff --git a/ports/onnx/portfile.cmake b/ports/onnx/portfile.cmake index 4487ecb4..4e9fac0c 100644 --- a/ports/onnx/portfile.cmake +++ b/ports/onnx/portfile.cmake @@ -23,7 +23,10 @@ else() set(USE_PROTOBUF_SHARED OFF) endif() -find_program(PROTOC NAMES protoc PATHS "${CURRENT_HOST_INSTALLED_DIR}/tools/protobuf" REQUIRED) +find_program(PROTOC NAMES protoc + PATHS "${CURRENT_HOST_INSTALLED_DIR}/tools/protobuf" + REQUIRED NO_DEFAULT_PATH NO_CMAKE_PATH +) message(STATUS "Using protoc: ${PROTOC}") vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -65,6 +68,7 @@ vcpkg_cmake_configure( -DPYTHON_EXECUTABLE:FILEPATH=${PYTHON3} -DProtobuf_PROTOC_EXECUTABLE=${PROTOC} -DONNX_CUSTOM_PROTOC_EXECUTABLE=${PROTOC} + -DONNX_VERIFY_PROTO3=ON # --protoc_path for gen_proto.py -DONNX_ML=ON -DONNX_GEN_PB_TYPE_STUBS=ON -DONNX_USE_PROTOBUF_SHARED_LIBS=${USE_PROTOBUF_SHARED} diff --git a/ports/onnx/vcpkg.json b/ports/onnx/vcpkg.json index a0f4ccab..31f831a7 100644 --- a/ports/onnx/vcpkg.json +++ b/ports/onnx/vcpkg.json @@ -1,7 +1,7 @@ { "name": "onnx", "version-semver": "1.16.0", - "port-version": 1, + "port-version": 2, "description": "Open standard for machine learning interoperability", "homepage": "https://onnx.ai", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 361898a3..581d9095 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -130,7 +130,7 @@ }, "onnx": { "baseline": "1.16.0", - "port-version": 1 + "port-version": 2 }, "onnxruntime": { "baseline": "1.18.0", diff --git a/versions/o-/onnx.json b/versions/o-/onnx.json index a3ccb021..1f5e153b 100644 --- a/versions/o-/onnx.json +++ b/versions/o-/onnx.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7da4ed72675423754cd88d6ef4f7f1c0acc4903e", + "version-semver": "1.16.0", + "port-version": 2 + }, { "git-tree": "84056c069b4cc59b487fc92bbcebb5aaa22b7f9b", "version-semver": "1.16.0",