diff options
| author | chausner <15180557+chausner@users.noreply.github.com> | 2021-09-29 17:36:24 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-29 08:36:24 -0700 |
| commit | 39ed6e65af18f838f4acb7b031f00d5328c59f5d (patch) | |
| tree | 81f06a1e39dce3f2c6eae641ad62e9e37158b1d5 | |
| parent | 2c4a0b808c950f23cfb91690729371e2986023df (diff) | |
| download | vcpkg-39ed6e65af18f838f4acb7b031f00d5328c59f5d.tar.gz vcpkg-39ed6e65af18f838f4acb7b031f00d5328c59f5d.zip | |
[meshoptimizer] Update to 0.16 (#20395)
* Update meshoptimizer to 0.16
* Update CI baseline
* Address PR feedback
* Update git-tree hash
Co-authored-by: chausner <chausner@users.noreply.github.com>
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
| -rw-r--r-- | ports/meshoptimizer/portfile.cmake | 21 | ||||
| -rw-r--r-- | ports/meshoptimizer/vcpkg.json | 15 | ||||
| -rw-r--r-- | versions/baseline.json | 4 | ||||
| -rw-r--r-- | versions/m-/meshoptimizer.json | 5 |
4 files changed, 28 insertions, 17 deletions
diff --git a/ports/meshoptimizer/portfile.cmake b/ports/meshoptimizer/portfile.cmake index e46b17460..f72d3e493 100644 --- a/ports/meshoptimizer/portfile.cmake +++ b/ports/meshoptimizer/portfile.cmake @@ -1,29 +1,26 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO zeux/meshoptimizer - REF v0.14 - SHA512 303b3bf1bed7cba8f89bce1c2782e3718fc8f4ec01f7ffd64f5ca23406130097f07d234b142916b16fe586db97c7deaa0ae9135b4e558543cc1664e7db85de67 + REF v0.16 + SHA512 CC6D28359FB99A615E1046A4AF1B247CBC6EA0266D9E7F41EA0516C1FC09FA1E67376071DAF138A126C77BCA3BAF9D565636ED0E3ADF045F1A08498C38B7A7E7 HEAD_REF master ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_SHARED_LIBS) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DMESHOPT_BUILD_SHARED_LIBS=${BUILD_SHARED_LIBS} ) -vcpkg_install_cmake() +vcpkg_cmake_install() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/meshoptimizer) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/meshoptimizer) # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE.md - DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} - RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) -vcpkg_copy_pdbs() +vcpkg_copy_pdbs()
\ No newline at end of file diff --git a/ports/meshoptimizer/vcpkg.json b/ports/meshoptimizer/vcpkg.json index 47439742e..7124de078 100644 --- a/ports/meshoptimizer/vcpkg.json +++ b/ports/meshoptimizer/vcpkg.json @@ -1,7 +1,16 @@ { "name": "meshoptimizer", - "version-string": "0.14", - "port-version": 2, + "version": "0.16", "description": "Mesh optimization library that makes meshes smaller and faster to render", - "homepage": "https://github.com/zeux/meshoptimizer" + "homepage": "https://github.com/zeux/meshoptimizer", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index d9f5c29bb..c91372a19 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4217,8 +4217,8 @@ "port-version": 4 }, "meshoptimizer": { - "baseline": "0.14", - "port-version": 2 + "baseline": "0.16", + "port-version": 0 }, "metis": { "baseline": "5.1.0", diff --git a/versions/m-/meshoptimizer.json b/versions/m-/meshoptimizer.json index cb58f7af4..57964ad9d 100644 --- a/versions/m-/meshoptimizer.json +++ b/versions/m-/meshoptimizer.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "a1693991d70ae383ea21f4f634f8d0f136e15bd7", + "version": "0.16", + "port-version": 0 + }, + { "git-tree": "f565fc6b5cc9a3c133af9193a7d06915cf9b6845", "version-string": "0.14", "port-version": 2 |