aboutsummaryrefslogtreecommitdiff
path: root/ports/tinyobjloader
diff options
context:
space:
mode:
authorVictor Romero <romerosanchezv@gmail.com>2019-05-02 22:57:43 -0700
committerGitHub <noreply@github.com>2019-05-02 22:57:43 -0700
commit050e71d01dc9e65e6cdf1d13534fc14889e4ae38 (patch)
tree7e39943693b8ac392f37d43a03c66815c6048963 /ports/tinyobjloader
parentb72f36e8cdd96ec482785e33f72f99cceebda8ad (diff)
downloadvcpkg-050e71d01dc9e65e6cdf1d13534fc14889e4ae38.tar.gz
vcpkg-050e71d01dc9e65e6cdf1d13534fc14889e4ae38.zip
Remove references to CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS (#5937)
* [various ports] remove references to CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS * [alac,benchmark,capnproto] Fix check_linkage call * [fastlz] Fix SHA512 * [coroutine] Fix dynamic build * [folly] Find double-conversion * [gamma] Use vcpkg_from_github * [librsync] Enable static builds * [netcdf-cxx4] Fix SHA512 * [octomap] Fix static build * [tidy-html5] Fix static build * [various ports] remove custom messages for shared/static builds, modernize some scripts in the meantime * [folly] Use ras0219's fix for link paths * [octomap] Fix exported targets * [uvatlas] Set tool download SHA512 * [duktape+python2] fix portfile to call configure with correct python version, manage python2 also outside win32 * [suitesparse] osx fix * [gtkmm] Call vcpkg_check_linkage after including vcpkg functions * [duktape] Resolve conflicts * [duktape] FIxed typo in Python paths * [wangle] Find zlib * [openssl-uwp] Fix SHA512 * [glib] Allow static builds on non-Windows * [suitesparse] Fix build on Windows * [multiple ports] Bump CONTROL version * [multiple ports] Fix description indent * [directxtk] Fix CONTROL file * [bde,duktape,qpid-proton] Build packages with python2 installed * [binn] remove CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS * [gdal,live555,uriparser] Fix regressions * [live555] Update to 2019.04.24
Diffstat (limited to 'ports/tinyobjloader')
-rw-r--r--ports/tinyobjloader/CONTROL2
-rw-r--r--ports/tinyobjloader/portfile.cmake73
2 files changed, 36 insertions, 39 deletions
diff --git a/ports/tinyobjloader/CONTROL b/ports/tinyobjloader/CONTROL
index 7967039a7..8ec7ef7a7 100644
--- a/ports/tinyobjloader/CONTROL
+++ b/ports/tinyobjloader/CONTROL
@@ -1,3 +1,3 @@
Source: tinyobjloader
-Version: 1.4.1
+Version: 1.4.1-1
Description: Tiny but powerful single file wavefront obj loader
diff --git a/ports/tinyobjloader/portfile.cmake b/ports/tinyobjloader/portfile.cmake
index fd2dbf8a4..ee6d64dc7 100644
--- a/ports/tinyobjloader/portfile.cmake
+++ b/ports/tinyobjloader/portfile.cmake
@@ -1,38 +1,35 @@
-if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic" AND (NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore"))
- message("tinyobjloader doesn't support dynamic linkage on Windows. Building static instead.")
- set(VCPKG_LIBRARY_LINKAGE static)
-endif()
-
-include(vcpkg_common_functions)
-
-vcpkg_from_github(
- OUT_SOURCE_PATH SOURCE_PATH
- REPO syoyo/tinyobjloader
- REF v1.4.1
- SHA512 5b18fed89435a95fb3fc89829ea6904b4cc4508b0907642b39194e3e3c55678ddc1c07687e4b7ea171f270f7188ca593ed53b828c022667e54a889c36c60373e
- HEAD_REF master
-)
-
-vcpkg_configure_cmake(
- SOURCE_PATH "${SOURCE_PATH}"
- PREFER_NINJA
- OPTIONS
- -DCMAKE_INSTALL_DOCDIR:STRING=share/tinyobjloader
-)
-
-vcpkg_install_cmake()
-
-vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/tinyobjloader/cmake")
-
-file(
- REMOVE_RECURSE
- ${CURRENT_PACKAGES_DIR}/debug/include
- ${CURRENT_PACKAGES_DIR}/debug/share
- ${CURRENT_PACKAGES_DIR}/lib/tinyobjloader
- ${CURRENT_PACKAGES_DIR}/debug/lib/tinyobjloader
-)
-
-vcpkg_copy_pdbs()
-
-# Put the licence file where vcpkg expects it
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/tinyobjloader/LICENSE ${CURRENT_PACKAGES_DIR}/share/tinyobjloader/copyright)
+include(vcpkg_common_functions)
+
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
+vcpkg_from_github(
+ OUT_SOURCE_PATH SOURCE_PATH
+ REPO syoyo/tinyobjloader
+ REF v1.4.1
+ SHA512 5b18fed89435a95fb3fc89829ea6904b4cc4508b0907642b39194e3e3c55678ddc1c07687e4b7ea171f270f7188ca593ed53b828c022667e54a889c36c60373e
+ HEAD_REF master
+)
+
+vcpkg_configure_cmake(
+ SOURCE_PATH "${SOURCE_PATH}"
+ PREFER_NINJA
+ OPTIONS
+ -DCMAKE_INSTALL_DOCDIR:STRING=share/tinyobjloader
+)
+
+vcpkg_install_cmake()
+
+vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/tinyobjloader/cmake")
+
+file(
+ REMOVE_RECURSE
+ ${CURRENT_PACKAGES_DIR}/debug/include
+ ${CURRENT_PACKAGES_DIR}/debug/share
+ ${CURRENT_PACKAGES_DIR}/lib/tinyobjloader
+ ${CURRENT_PACKAGES_DIR}/debug/lib/tinyobjloader
+)
+
+vcpkg_copy_pdbs()
+
+# Put the licence file where vcpkg expects it
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/tinyobjloader/LICENSE ${CURRENT_PACKAGES_DIR}/share/tinyobjloader/copyright)