diff options
| author | Alexander Karatarakis <alex@karatarakis.com> | 2017-09-08 11:37:45 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-08 11:37:45 -0700 |
| commit | 727f37367115a8910f0422ef888e219412ed5d38 (patch) | |
| tree | c13366800e30455470c4274bf3c8d9f45eb3120d | |
| parent | d2de7d3e7d1a0bea3dba9a0a7f6cfff68ae513a0 (diff) | |
| parent | 5d82583cf9fa36c85e8770a082acacc9d1836e4d (diff) | |
| download | vcpkg-727f37367115a8910f0422ef888e219412ed5d38.tar.gz vcpkg-727f37367115a8910f0422ef888e219412ed5d38.zip | |
Merge pull request #1799 from codicodi/xxhash-0.6.3
[xxhash] update to 0.6.3
| -rw-r--r-- | ports/xxhash/CONTROL | 2 | ||||
| -rw-r--r-- | ports/xxhash/portfile.cmake | 25 |
2 files changed, 11 insertions, 16 deletions
diff --git a/ports/xxhash/CONTROL b/ports/xxhash/CONTROL index 171a1b816..1228319b6 100644 --- a/ports/xxhash/CONTROL +++ b/ports/xxhash/CONTROL @@ -1,3 +1,3 @@ Source: xxhash -Version: 0.6.2 +Version: 0.6.3 Description: Extremely fast hash algorithm diff --git a/ports/xxhash/portfile.cmake b/ports/xxhash/portfile.cmake index e1b913a44..3330174b8 100644 --- a/ports/xxhash/portfile.cmake +++ b/ports/xxhash/portfile.cmake @@ -1,24 +1,15 @@ include(vcpkg_common_functions) -set(XXHASH_VERSION 0.6.2) -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/xxhash-${XXHASH_VERSION}) -vcpkg_download_distfile(ARCHIVE - URLS "https://github.com/Cyan4973/xxHash/archive/v${XXHASH_VERSION}.zip" - FILENAME "xxhash-${XXHASH_VERSION}.zip" - SHA512 a2364421f46116a6e7f6bd686665fe4ee58670af6dad611ca626283c1b448fb1120ab3495903a5c8653d341ef22c0d244604edc20bf82a42734ffb4b871e2724) - -vcpkg_extract_source_archive(${ARCHIVE}) - -if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - set(XXH_STATIC ON) -else() - set(XXH_STATIC OFF) -endif() +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Cyan4973/xxHash + REF v0.6.3 + SHA512 5b11009ecf142725c642be55e9072792709bd40d8674f30afdc13f9b9fd6936ea69e683c7b9df212b5126f9ba3925969fc0b65bb5518506b501bb339d3a29372 + HEAD_REF dev) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH}/cmake_unofficial PREFER_NINJA OPTIONS - -DBUILD_STATIC_LIBS=${XXH_STATIC} -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON) vcpkg_install_cmake() @@ -28,6 +19,10 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) file(READ ${CURRENT_PACKAGES_DIR}/include/xxhash.h XXHASH_H) string(REPLACE "# define XXH_PUBLIC_API /* do nothing */" "# define XXH_PUBLIC_API __declspec(dllimport)" XXHASH_H "${XXHASH_H}") file(WRITE ${CURRENT_PACKAGES_DIR}/include/xxhash.h "${XXHASH_H}") + + file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/xxhsum.exe ${CURRENT_PACKAGES_DIR}/debug/bin/xxhsum.exe) +else() + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) endif() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) |