From 29286672eed3a6827f7720f04cbd5bc86e931b0b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?=
 <47264268+JackBoosY@users.noreply.github.com>
Date: Wed, 27 Jan 2021 18:16:47 -0800
Subject: [openvdb] Fix vcpkg-cmake-wrapper (#15902)

* [openvdb] Fix vcpkg-cmake-wrapper

* update version record
---
 ports/openvdb/CONTROL                      |  2 +-
 ports/openvdb/portfile.cmake               |  2 +-
 ports/openvdb/vcpkg-cmake-wrapper.cmake    | 10 ----------
 ports/openvdb/vcpkg-cmake-wrapper.cmake.in | 12 ++++++++++++
 versions/baseline.json                     |  2 +-
 versions/o-/openvdb.json                   |  5 +++++
 6 files changed, 20 insertions(+), 13 deletions(-)
 delete mode 100644 ports/openvdb/vcpkg-cmake-wrapper.cmake
 create mode 100644 ports/openvdb/vcpkg-cmake-wrapper.cmake.in

diff --git a/ports/openvdb/CONTROL b/ports/openvdb/CONTROL
index f100be3e8..a05640a98 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 fa91fc7f8..2fb9c3e6f 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
deleted file mode 100644
index fd1c5d23d..000000000
--- a/ports/openvdb/vcpkg-cmake-wrapper.cmake
+++ /dev/null
@@ -1,10 +0,0 @@
-set(OPENVDB_PREV_MODULE_PATH ${CMAKE_MODULE_PATH})
-list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR})
-
-list(REMOVE_ITEM ARGS "NO_MODULE")
-list(REMOVE_ITEM ARGS "CONFIG")
-list(REMOVE_ITEM ARGS "MODULE")
-
-_find_package(${ARGS})
-
-set(CMAKE_MODULE_PATH ${OPENVDB_PREV_MODULE_PATH})
diff --git a/ports/openvdb/vcpkg-cmake-wrapper.cmake.in b/ports/openvdb/vcpkg-cmake-wrapper.cmake.in
new file mode 100644
index 000000000..7b9e5ac67
--- /dev/null
+++ b/ports/openvdb/vcpkg-cmake-wrapper.cmake.in
@@ -0,0 +1,12 @@
+set(OPENVDB_PREV_MODULE_PATH ${CMAKE_MODULE_PATH})
+list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR})
+
+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})
diff --git a/versions/baseline.json b/versions/baseline.json
index 062560794..cf68e470a 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -4326,7 +4326,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 8b0d616fb..5b5e207a1 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",
-- 
cgit v1.2.3