aboutsummaryrefslogtreecommitdiff
path: root/ports/tinyobjloader
diff options
context:
space:
mode:
authorRobert Schumacher <roschuma@microsoft.com>2019-11-22 09:47:40 -0800
committerGitHub <noreply@github.com>2019-11-22 09:47:40 -0800
commit45f4b820e5743b89bca3508ba2028cdd5d8bbd17 (patch)
treef874a8c4a7392309bdbb86447288597ec0a4a281 /ports/tinyobjloader
parent62d67d3bf8eeff1afa8009041fd08b8822676b7b (diff)
parent8831e8f25f1ff6546ee4a5291b91d599421637b3 (diff)
downloadvcpkg-45f4b820e5743b89bca3508ba2028cdd5d8bbd17.tar.gz
vcpkg-45f4b820e5743b89bca3508ba2028cdd5d8bbd17.zip
Merge branch 'master' into vcpkg_nuget
Diffstat (limited to 'ports/tinyobjloader')
-rw-r--r--ports/tinyobjloader/CONTROL6
-rw-r--r--ports/tinyobjloader/portfile.cmake12
2 files changed, 14 insertions, 4 deletions
diff --git a/ports/tinyobjloader/CONTROL b/ports/tinyobjloader/CONTROL
index f80f52f96..8785e862b 100644
--- a/ports/tinyobjloader/CONTROL
+++ b/ports/tinyobjloader/CONTROL
@@ -1,3 +1,7 @@
Source: tinyobjloader
-Version: 1.0.7
+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 b33a2dd74..87b606946 100644
--- a/ports/tinyobjloader/portfile.cmake
+++ b/ports/tinyobjloader/portfile.cmake
@@ -5,21 +5,27 @@ 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()
-vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/tinyobjloader/cmake")
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/tinyobjloader/cmake)
file(
REMOVE_RECURSE