aboutsummaryrefslogtreecommitdiff
path: root/ports/tinyobjloader
diff options
context:
space:
mode:
authorJackBoosY <yuzaiyang@beyondsoft.com>2020-01-13 23:55:59 -0800
committerJackBoosY <yuzaiyang@beyondsoft.com>2020-01-13 23:55:59 -0800
commit2514481b42ebdeec28649582fc666955cf206c84 (patch)
tree60c9809a5c3c8adbad240a40b1088a6f8e42c019 /ports/tinyobjloader
parentb751326c91c9a307aaf5e340b61ab9f2d1ad45a4 (diff)
parent28eee51adb36f2165be846e77ef7b3ee5b3f8789 (diff)
downloadvcpkg-2514481b42ebdeec28649582fc666955cf206c84.tar.gz
vcpkg-2514481b42ebdeec28649582fc666955cf206c84.zip
Merge branch 'master' of https://github.com/Microsoft/vcpkg into dev/jack/upgrade_libi
Diffstat (limited to 'ports/tinyobjloader')
-rw-r--r--ports/tinyobjloader/CONTROL6
-rw-r--r--ports/tinyobjloader/portfile.cmake10
2 files changed, 13 insertions, 3 deletions
diff --git a/ports/tinyobjloader/CONTROL b/ports/tinyobjloader/CONTROL
index 4dc5eebb2..8785e862b 100644
--- a/ports/tinyobjloader/CONTROL
+++ b/ports/tinyobjloader/CONTROL
@@ -1,3 +1,7 @@
Source: tinyobjloader
-Version: 1.0.7-1
+Version: 2.0.0-rc2
Description: Tiny but powerful single file wavefront obj loader
+
+Feature: double
+Description: enable double(64bit) precision
+
diff --git a/ports/tinyobjloader/portfile.cmake b/ports/tinyobjloader/portfile.cmake
index 7b8741d34..87b606946 100644
--- a/ports/tinyobjloader/portfile.cmake
+++ b/ports/tinyobjloader/portfile.cmake
@@ -5,16 +5,22 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO syoyo/tinyobjloader
- REF v1.0.7
- SHA512 e88554ead20354da443489e1b6576b328e92b2e6665071df9b6473b38c34c036dbffb6655330e970c01ccf7f99bbd4f9f5418ce48a14239576ec5e0513256637
+ REF v2.0.0-rc2
+ SHA512 936f7897a87fe00d474231ad5f69816da127f14296c3591144c26c6058bd11ea1490c2db6b8c4a8adf629ae148423705d0c4020f4ed034921f0f2f711498f3bb
HEAD_REF master
)
+vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+ double TINYOBJLOADER_USE_DOUBLE
+)
+
vcpkg_configure_cmake(
SOURCE_PATH "${SOURCE_PATH}"
PREFER_NINJA
OPTIONS
-DCMAKE_INSTALL_DOCDIR:STRING=share/tinyobjloader
+ # FEATURES
+ ${FEATURE_OPTIONS}
)
vcpkg_install_cmake()