diff options
| author | RT222 <contact@rt2.fr> | 2019-03-08 09:14:06 +0100 |
|---|---|---|
| committer | Phil Christensen <philc@microsoft.com> | 2019-03-08 00:14:06 -0800 |
| commit | cf7793ad1c2d66618365e5c1eada2929fc1a95f0 (patch) | |
| tree | 54a1a49299aac0fffa0d13ba7be7e737e4dc3295 | |
| parent | adc005f87729d7f4b3f53181a2759a4d72b8d2ac (diff) | |
| download | vcpkg-cf7793ad1c2d66618365e5c1eada2929fc1a95f0.tar.gz vcpkg-cf7793ad1c2d66618365e5c1eada2929fc1a95f0.zip | |
[yoga] Update to v1.13.0 (#5592)
| -rw-r--r-- | ports/yoga/CONTROL | 2 | ||||
| -rw-r--r-- | ports/yoga/portfile.cmake | 23 |
2 files changed, 6 insertions, 19 deletions
diff --git a/ports/yoga/CONTROL b/ports/yoga/CONTROL index a9fcd9419..805d688d5 100644 --- a/ports/yoga/CONTROL +++ b/ports/yoga/CONTROL @@ -1,3 +1,3 @@ Source: yoga -Version: 1.10.0 +Version: 1.13.0 Description: Yoga is a cross-platform layout engine which implements Flexbox diff --git a/ports/yoga/portfile.cmake b/ports/yoga/portfile.cmake index a8d532474..6aa6a1fb3 100644 --- a/ports/yoga/portfile.cmake +++ b/ports/yoga/portfile.cmake @@ -1,28 +1,16 @@ -# Common Ambient Variables: -# CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT} -# CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET} -# CURRENT_PORT_DIR = ${VCPKG_ROOT_DIR}\ports\${PORT} -# PORT = current port name (zlib, etc) -# TARGET_TRIPLET = current triplet (x86-windows, x64-windows-static, etc) -# VCPKG_CRT_LINKAGE = C runtime linkage type (static, dynamic) -# VCPKG_LIBRARY_LINKAGE = target library linkage type (static, dynamic) -# VCPKG_ROOT_DIR = <C:\path\to\current\vcpkg> -# VCPKG_TARGET_ARCHITECTURE = target architecture (x64, x86, arm) -# include(vcpkg_common_functions) -if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - message(WARNING "Dynamic not supported, building static") - set(VCPKG_LIBRARY_LINKAGE static) -elseif (VCPKG_CMAKE_SYSTEM_NAME STREQUAL WindowsStore) +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +if (VCPKG_CMAKE_SYSTEM_NAME STREQUAL WindowsStore) message(FATAL_ERROR "Error: UWP builds not supported yet.") endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebook/yoga - REF 1.10.0 - SHA512 629d9fbc4e4ad3c495a92896803bf7a0fca8dd986068d9862ba2c9aa0a70f8542a35c0e9ce9974ccdc004827e5e072f45b6eabff1d00462ec437b48de9dfacf4 + REF v1.13.0 + SHA512 ca87c4526956ccb0693c4e1cdf825b2d9cfd97b20f6c11a06b3966c99903e06c0ca1013f9c72546bbf1d0f56b501f422dfb18dbcfee82ba340e18dcea80b3caf HEAD_REF master ) @@ -43,5 +31,4 @@ endif() vcpkg_copy_pdbs() -# Handle copyright file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/yoga RENAME copyright)
\ No newline at end of file |