diff options
| author | Chuck Walbourn <walbourn@users.noreply.github.com> | 2021-01-12 20:01:37 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-12 20:01:37 -0800 |
| commit | 3fcfccf0ca97cfd3e9f98da5d152e2d38d75ed34 (patch) | |
| tree | 3b39cb3a8f7463087d0cc0494492f7597f8c5fb8 /ports/uvatlas | |
| parent | 2dd2e623455c79f53914f403280071b40a0bb2c8 (diff) | |
| download | vcpkg-3fcfccf0ca97cfd3e9f98da5d152e2d38d75ed34.tar.gz vcpkg-3fcfccf0ca97cfd3e9f98da5d152e2d38d75ed34.zip | |
directxmesh, directxtex, and uvatlas now support linux (#15554)
* Update for directx-headers release 1.0.1
* DirectXMesh, DirectXTex, and UVAtlas now support Linux
* Updated hashes and bins
* Fix linux builds
* Fixed directxtex[openexr] for x64-linux
* Removed stray file
* directxmath hot-fix for GCC arm64
* Fixed hash
* Hash fix again
* x64-linux CIs use GCC 7, but I require GCC 9
* Added warning message for GCC 9 requirement
Diffstat (limited to 'ports/uvatlas')
| -rw-r--r-- | ports/uvatlas/CONTROL | 6 | ||||
| -rw-r--r-- | ports/uvatlas/portfile.cmake | 17 |
2 files changed, 13 insertions, 10 deletions
diff --git a/ports/uvatlas/CONTROL b/ports/uvatlas/CONTROL index 9ebfccb6e..a65d710e2 100644 --- a/ports/uvatlas/CONTROL +++ b/ports/uvatlas/CONTROL @@ -1,6 +1,6 @@ Source: uvatlas
-Version: dec2020b
+Version: jan2021
Homepage: https://github.com/Microsoft/UVAtlas
Description: UVAtlas isochart texture atlas
-Build-Depends: directxmesh(!uwp), directxtex(!uwp)
-Supports: windows
\ No newline at end of file +Build-Depends: directxmesh(!(uwp|linux)), directxtex(!(uwp|linux)), directxmath(linux), directx-headers(linux)
+Supports: windows|linux
diff --git a/ports/uvatlas/portfile.cmake b/ports/uvatlas/portfile.cmake index 9982641ce..14f7a5eed 100644 --- a/ports/uvatlas/portfile.cmake +++ b/ports/uvatlas/portfile.cmake @@ -1,16 +1,19 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) -vcpkg_fail_port_install(ON_TARGET "OSX" "Linux") +vcpkg_fail_port_install(ON_TARGET "OSX") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/UVAtlas - REF dec2020b - SHA512 4a81f5e45d906a897a73af940e63f684e416e7b851c4c439fb2dc7fe761838f7a84ccd5088bc94460cdb5d5fd9f5105c719a81e65a381bbdd2fad3465cdf3d46 + REF jan2021 + SHA512 a0248f31626a0835c9aaf7ed9cabfc5771e34257b8e8e4a3139dca69d7242d79fbb7883071379cd9202edecef3a518d6cf9e7ef9b0338afd384bf2c9830878d3 HEAD_REF master - FILE_DISAMBIGUATOR 2 ) +if (VCPKG_HOST_IS_LINUX) + message(WARNING "Build ${PORT} requires GCC version 9 or later") +endif() + if(VCPKG_TARGET_IS_UWP) set(EXTRA_OPTIONS -DBUILD_TOOLS=OFF) else() @@ -26,7 +29,7 @@ vcpkg_configure_cmake( vcpkg_install_cmake() vcpkg_fixup_cmake_targets(CONFIG_PATH cmake) -if(NOT VCPKG_TARGET_IS_UWP) +if((VCPKG_TARGET_IS_WINDOWS) AND (NOT VCPKG_TARGET_IS_UWP)) vcpkg_copy_tools( TOOL_NAMES uvatlastool SEARCH_DIR ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bin/CMake @@ -34,9 +37,9 @@ if(NOT VCPKG_TARGET_IS_UWP) elseif((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64)) vcpkg_download_distfile(uvatlastool - URLS "https://github.com/Microsoft/UVAtlas/releases/download/dec2020/uvatlastool.exe" + URLS "https://github.com/Microsoft/UVAtlas/releases/download/jan2021/uvatlastool.exe" FILENAME "uvatlastool.exe" - SHA512 f3388e590bb45281a089d6d38ff603e99f2ff9124ec1e6caebae2663e4ab8ccaf06f5cce671f78ed9a1f882c6d2e2b1188212ef0219f96b46872faa20cc649fd + SHA512 8727510f3ec41c2fa7ed75100b8c0f4daa41e93a1b812e5ec3c265dc87c3f48651da37a18af5d8b57a0aa096c42232b58a50a00c036ec7c04dcae4767a2691f9 ) file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/uvatlas/") |