From 8317bf972a8f48559cb96e8fbc2e43fbff978a82 Mon Sep 17 00:00:00 2001 From: Park DongHa Date: Tue, 9 Feb 2021 10:54:38 +0900 Subject: [metrohash] support iOS triplets (#16035) * [metrohash] ignore arm * this change will allow android/ios triplets * [metrohash] update baseline * [metrohash] check platform variables * [metrohash] fix wrong git-tee --- ports/metrohash/CMakeLists.txt | 2 +- ports/metrohash/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/m-/metrohash.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/metrohash/CMakeLists.txt b/ports/metrohash/CMakeLists.txt index 1c5081203..3d6c3d59d 100644 --- a/ports/metrohash/CMakeLists.txt +++ b/ports/metrohash/CMakeLists.txt @@ -8,7 +8,7 @@ add_library(metrohash ) list(APPEND metro_headers src/metrohash.h src/metrohash64.h src/metrohash128.h) -if(NOT ANDROID) +if(NOT ANDROID AND NOT IOS) list(APPEND metro_headers src/metrohash128crc.h) target_sources(metrohash PRIVATE src/metrohash128crc.cpp) if(CMAKE_CXX_COMPILER_ID MATCHES Clang) diff --git a/ports/metrohash/vcpkg.json b/ports/metrohash/vcpkg.json index bfb1e6722..a439e2c6a 100644 --- a/ports/metrohash/vcpkg.json +++ b/ports/metrohash/vcpkg.json @@ -1,7 +1,7 @@ { "name": "metrohash", "version-string": "1.1.3", - "port-version": 2, + "port-version": 3, "description": "MetroHash is a set of state-of-the-art hash functions for non-cryptographic use cases", "homepage": "https://github.com/jandrewrogers/MetroHash", "supports": "!(uwp | arm | x86)" diff --git a/versions/baseline.json b/versions/baseline.json index 45c3a76a6..7136d913d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3742,7 +3742,7 @@ }, "metrohash": { "baseline": "1.1.3", - "port-version": 2 + "port-version": 3 }, "mgnlibs": { "baseline": "2019-09-29", diff --git a/versions/m-/metrohash.json b/versions/m-/metrohash.json index 8bdb8f146..f062696f4 100644 --- a/versions/m-/metrohash.json +++ b/versions/m-/metrohash.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "33078163f0311cfecce47b42c304650b602c9ddf", + "version-string": "1.1.3", + "port-version": 3 + }, { "git-tree": "0c764c9b22fa64b5194e65f69bfb28bc47dc20fc", "version-string": "1.1.3", -- cgit v1.2.3