diff options
| author | Lily <47812810+LilyWangL@users.noreply.github.com> | 2020-11-06 10:24:53 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-05 18:24:53 -0800 |
| commit | 9d2f4a59b30a8b0730096ad3b63eff859437d6db (patch) | |
| tree | 7e1cc085e2b76d01232879679b505afa6d305e8d | |
| parent | bf7f7a1162bf704f2b1a3047caf923bd0d5db0b3 (diff) | |
| download | vcpkg-9d2f4a59b30a8b0730096ad3b63eff859437d6db.tar.gz vcpkg-9d2f4a59b30a8b0730096ad3b63eff859437d6db.zip | |
[rhash] Update to the latest version (#13658)
| -rw-r--r-- | ports/rhash/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | ports/rhash/CONTROL | 2 | ||||
| -rw-r--r-- | ports/rhash/portfile.cmake | 18 | ||||
| -rw-r--r-- | scripts/ci.baseline.txt | 2 |
4 files changed, 11 insertions, 13 deletions
diff --git a/ports/rhash/CMakeLists.txt b/ports/rhash/CMakeLists.txt index b395b5c9a..e3a088170 100644 --- a/ports/rhash/CMakeLists.txt +++ b/ports/rhash/CMakeLists.txt @@ -4,7 +4,7 @@ project(rhash C) file(STRINGS ${CMAKE_CURRENT_SOURCE_DIR}/Makefile RHASH_SOURCES REGEX "^SOURCES = .*$") string(REPLACE "SOURCES = " "" RHASH_SOURCES "${RHASH_SOURCES}") string(REPLACE " " ";" RHASH_SOURCES "${RHASH_SOURCES}") - +add_definitions(-DRHASH_XVERSION="${RHASH_XVERSION}") add_library(rhash ${RHASH_SOURCES}) set_target_properties(rhash PROPERTIES COMPILE_DEFINITIONS "IN_RHASH" DEFINE_SYMBOL "RHASH_EXPORTS") diff --git a/ports/rhash/CONTROL b/ports/rhash/CONTROL index 8e6aaa514..c8d0e5691 100644 --- a/ports/rhash/CONTROL +++ b/ports/rhash/CONTROL @@ -1,5 +1,5 @@ Source: rhash -Version: 1.3.9 +Version: 1.4.0 Homepage: https://github.com/rhash/RHash Description: C library for computing a wide variety of hash sums Supports: !uwp diff --git a/ports/rhash/portfile.cmake b/ports/rhash/portfile.cmake index 096634bb0..76c03c58c 100644 --- a/ports/rhash/portfile.cmake +++ b/ports/rhash/portfile.cmake @@ -1,13 +1,13 @@ -if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") - message(FATAL_ERROR "UWP builds not supported") -endif() +set(RHASH_XVERSION 1.4.0) +vcpkg_fail_port_install(ON_TARGET "UWP") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO rhash/RHash - REF 75716b45c21416c98c0ab2e3c2735b150e7afb03 # v1.3.9 - SHA512 dfadd7878aa88959f058b677ef96c9837e7efd851f45f2fbc93198c7ae1beadccbe1112b0e6c5822565eba102948d762b65b9cc46e43eeae97a9cd1f362c1554 - HEAD_REF master) + REF df0c969966b5da10f2db5060cf329790db95080e # v1.4.0 + SHA512 eebd5872f5d40d5ef5b7fe857ff3099c3b60e37cedaacf7ae8da63bd18790a16546de1809fa9f8e4fa7eef178121051b267fedd5d237135b80201f8609d613b6 + HEAD_REF master +) file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}/librhash) @@ -15,10 +15,10 @@ vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH}/librhash PREFER_NINJA OPTIONS_DEBUG - -DRHASH_SKIP_HEADERS=ON) + -DRHASH_SKIP_HEADERS=ON +) vcpkg_install_cmake() vcpkg_copy_pdbs() -file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/rhash) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/rhash/COPYING ${CURRENT_PACKAGES_DIR}/share/rhash/copyright) +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index e2c7b7730..749b81c20 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1415,8 +1415,6 @@ rest-rpc:arm64-windows=skip rest-rpc:x64-linux=skip rest-rpc:x64-osx=skip rhash:arm64-windows=fail -rhash:arm-uwp=fail -rhash:x64-uwp=fail rocksdb:arm-uwp=fail rocksdb:x64-uwp=fail rpclib:arm64-windows=fail |