diff options
| author | Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> | 2021-01-27 18:16:47 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-27 18:16:47 -0800 |
| commit | 29286672eed3a6827f7720f04cbd5bc86e931b0b (patch) | |
| tree | 77a21dddfc846e458f0343769052552ad4d3f5de | |
| parent | 511e887ee71a8088401518ec79450f6f1f412c94 (diff) | |
| download | vcpkg-29286672eed3a6827f7720f04cbd5bc86e931b0b.tar.gz vcpkg-29286672eed3a6827f7720f04cbd5bc86e931b0b.zip | |
[openvdb] Fix vcpkg-cmake-wrapper (#15902)
* [openvdb] Fix vcpkg-cmake-wrapper
* update version record
| -rw-r--r-- | ports/openvdb/CONTROL | 2 | ||||
| -rw-r--r-- | ports/openvdb/portfile.cmake | 2 | ||||
| -rw-r--r-- | ports/openvdb/vcpkg-cmake-wrapper.cmake.in (renamed from ports/openvdb/vcpkg-cmake-wrapper.cmake) | 2 | ||||
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | versions/o-/openvdb.json | 5 |
5 files changed, 10 insertions, 3 deletions
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.in index fd1c5d23d..7b9e5ac67 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})
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,6 +1,11 @@ { "versions": [ { + "git-tree": "7851d7cc48fbd6ae64e2a625afc0a21024f0eb31", + "version-string": "7.1.0", + "port-version": 2 + }, + { "git-tree": "7bd35d581cf4764e95b80e0e1a91554238a45f25", "version-string": "7.1.0", "port-version": 1 |