From 71569a12dace4e5be5feefedf5ae6163aa2fcc92 Mon Sep 17 00:00:00 2001
From: JackBoosY <yuzaiyang@beyondsoft.com>
Date: Wed, 27 Jan 2021 00:01:26 -0800
Subject: [PATCH 1/2] [openvdb] Fix vcpkg-cmake-wrapper

---
 ports/openvdb/CONTROL                                           | 2 +-
 ports/openvdb/portfile.cmake                                    | 2 +-
 .../{vcpkg-cmake-wrapper.cmake => vcpkg-cmake-wrapper.cmake.in} | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)
 rename ports/openvdb/{vcpkg-cmake-wrapper.cmake => vcpkg-cmake-wrapper.cmake.in} (82%)

diff --git a/ports/openvdb/CONTROL b/ports/openvdb/CONTROL
index f100be3e8a18c5..a05640a98500cf 100644
--- a/ports/openvdb/CONTROL
+++ b/ports/openvdb/CONTROL
@@ -1,6 +1,6 @@
 Source: openvdb
 Version: 7.1.0
-Port-Version: 1
+Port-Version: 2
 Build-Depends: boost-ptr-container, openexr, tbb, blosc, boost-iostreams, boost-system, boost-thread, boost-date-time, boost-any, boost-uuid, boost-interprocess, ilmbase
 Homepage: https://github.com/dreamworksanimation/openvdb
 Description: Sparse volume data structure and tools
diff --git a/ports/openvdb/portfile.cmake b/ports/openvdb/portfile.cmake
index fa91fc7f884d22..2fb9c3e6ffea8a 100644
--- a/ports/openvdb/portfile.cmake
+++ b/ports/openvdb/portfile.cmake
@@ -54,6 +54,6 @@ if (OPENVDB_BUILD_TOOLS)
     vcpkg_copy_tools(TOOL_NAMES vdb_print vdb_render vdb_view vdb_lod AUTO_CLEAN)
 endif()
 
-file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
+configure_file(${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake.in ${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake @ONLY)
 file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
 file(INSTALL ${SOURCE_PATH}/openvdb/COPYRIGHT DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
diff --git a/ports/openvdb/vcpkg-cmake-wrapper.cmake b/ports/openvdb/vcpkg-cmake-wrapper.cmake.in
similarity index 82%
rename from ports/openvdb/vcpkg-cmake-wrapper.cmake
rename to ports/openvdb/vcpkg-cmake-wrapper.cmake.in
index fd1c5d23de7a6f..7b9e5ac67ac170 100644
--- a/ports/openvdb/vcpkg-cmake-wrapper.cmake
+++ b/ports/openvdb/vcpkg-cmake-wrapper.cmake.in
@@ -5,6 +5,8 @@ list(REMOVE_ITEM ARGS "NO_MODULE")
 list(REMOVE_ITEM ARGS "CONFIG")
 list(REMOVE_ITEM ARGS "MODULE")
 
+set(OPENVDB_USE_STATIC_LIBS @OPENVDB_STATIC@)
+
 _find_package(${ARGS})
 
 set(CMAKE_MODULE_PATH ${OPENVDB_PREV_MODULE_PATH})

From f04593ef72a993e3064257a923bfe34748b2e053 Mon Sep 17 00:00:00 2001
From: JackBoosY <yuzaiyang@beyondsoft.com>
Date: Wed, 27 Jan 2021 00:02:03 -0800
Subject: [PATCH 2/2] update version record

---
 versions/baseline.json   | 2 +-
 versions/o-/openvdb.json | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/versions/baseline.json b/versions/baseline.json
index 9ddbe7a291cdcd..2bc82d04edccc7 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -4322,7 +4322,7 @@
     },
     "openvdb": {
       "baseline": "7.1.0",
-      "port-version": 1
+      "port-version": 2
     },
     "openvpn3": {
       "baseline": "3.4.1-1",
diff --git a/versions/o-/openvdb.json b/versions/o-/openvdb.json
index 8b0d616fb06f6d..5b5e207a1f0308 100644
--- a/versions/o-/openvdb.json
+++ b/versions/o-/openvdb.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "7851d7cc48fbd6ae64e2a625afc0a21024f0eb31",
+      "version-string": "7.1.0",
+      "port-version": 2
+    },
     {
       "git-tree": "7bd35d581cf4764e95b80e0e1a91554238a45f25",
       "version-string": "7.1.0",