From 2196a2c7d653602b40ef5ee5cec4db16cb8ace21 Mon Sep 17 00:00:00 2001
From: jim wang <122244446+jimwang118@users.noreply.github.com>
Date: Wed, 8 Feb 2023 22:32:21 +0000
Subject: [PATCH] [libtorch] Fix libtorch build (#29497)

* [libtorch] fixed libtorch build

* fix libtorch build

---------

Co-authored-by: jimwang118 <wangzhijie05@byondsoft.com>
---
 ports/libtorch/vcpkg-dependencies.cmake | 2 +-
 ports/libtorch/vcpkg.json               | 1 +
 versions/baseline.json                  | 2 +-
 versions/l-/libtorch.json               | 5 +++++
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/ports/libtorch/vcpkg-dependencies.cmake b/ports/libtorch/vcpkg-dependencies.cmake
index 6efceefb0b..bf6028b922 100644
--- a/ports/libtorch/vcpkg-dependencies.cmake
+++ b/ports/libtorch/vcpkg-dependencies.cmake
@@ -160,7 +160,7 @@ endif()
  
 if(USE_ZSTD)
   find_package(zstd CONFIG REQUIRED) # zstd::libzstd_static
-  list(APPEND Caffe2_DEPENDENCY_LIBS zstd::libzstd_static)
+  list(APPEND Caffe2_DEPENDENCY_LIBS $<IF:$<TARGET_EXISTS:zstd::libzstd_shared>,zstd::libzstd_shared,zstd::libzstd_static>)
 endif()
 
 if(USE_SYSTEM_ONNX)
diff --git a/ports/libtorch/vcpkg.json b/ports/libtorch/vcpkg.json
index 6182a4a0cf..31e25a5330 100644
--- a/ports/libtorch/vcpkg.json
+++ b/ports/libtorch/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "libtorch",
   "version": "1.12.1",
+  "port-version": 1,
   "description": "Tensors and Dynamic neural networks in Python with strong GPU acceleration",
   "homepage": "https://pytorch.org/",
   "license": null,
diff --git a/versions/baseline.json b/versions/baseline.json
index 8a84a9e999..570b05fb27 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -4434,7 +4434,7 @@
     },
     "libtorch": {
       "baseline": "1.12.1",
-      "port-version": 0
+      "port-version": 1
     },
     "libtorrent": {
       "baseline": "2.0.8",
diff --git a/versions/l-/libtorch.json b/versions/l-/libtorch.json
index 2f27c40b26..5ab0875760 100644
--- a/versions/l-/libtorch.json
+++ b/versions/l-/libtorch.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "99e1c00f462716fc1899f7c0f5773e5dccbe8ee8",
+      "version": "1.12.1",
+      "port-version": 1
+    },
     {
       "git-tree": "c9504da41dc33e2294aeda9e3c215c505f1627d0",
       "version": "1.12.1",