diff options
| author | Alexander Karatarakis <alex@karatarakis.com> | 2017-08-22 11:54:06 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-22 11:54:06 -0700 |
| commit | ca45ab367fa8f2a106354bfa04ef7ae6ee676b7b (patch) | |
| tree | 34bbf3091b550f1549c0e2cd704a40fa01cec140 | |
| parent | ea4799847f4440fa25942fab8049a33c92ead6ce (diff) | |
| parent | a8d69a697b4e4c98b8886d4ac4b2baf9a8a09283 (diff) | |
| download | vcpkg-ca45ab367fa8f2a106354bfa04ef7ae6ee676b7b.tar.gz vcpkg-ca45ab367fa8f2a106354bfa04ef7ae6ee676b7b.zip | |
Merge pull request #1672 from codicodi/zstd-1.3.1
[zstd] update to 1.3.1
| -rw-r--r-- | ports/zstd/CONTROL | 2 | ||||
| -rw-r--r-- | ports/zstd/portfile.cmake | 12 |
2 files changed, 10 insertions, 4 deletions
diff --git a/ports/zstd/CONTROL b/ports/zstd/CONTROL index 52713f2b8..ba363a585 100644 --- a/ports/zstd/CONTROL +++ b/ports/zstd/CONTROL @@ -1,3 +1,3 @@ Source: zstd -Version: 1.3.0 +Version: 1.3.1 Description: Zstandard - Fast real-time compression algorithm http://www.zstd.net diff --git a/ports/zstd/portfile.cmake b/ports/zstd/portfile.cmake index ba60826e0..1f93cac74 100644 --- a/ports/zstd/portfile.cmake +++ b/ports/zstd/portfile.cmake @@ -2,8 +2,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebook/zstd - REF v1.3.0 - SHA512 5eb9e001e14d3342e76eb57b672c636fd56839ba8fc0ba9a751484ea93389c72c494ad2125dc2f9be1f72481f3af34568477123f7e9d3c7504e061e4c083cb30 + REF v1.3.1 + SHA512 cc2ace7b2dd19a2bbf4c43a89d64a7ce121309f712bfb4940ccfd6f9353f1466612ef7096adcd852f54eaea8663d884acf681c83ae5b274b24c9b85f21367b7c HEAD_REF dev) if(VCPKG_LIBRARY_LINKAGE STREQUAL static) @@ -14,6 +14,11 @@ else() set(ZSTD_SHARED 1) endif() +# Enable multithreaded mode. CMake build doesn't provide a multithreaded +# library target, but it is the default in Makefile and VS projects. +set(VCPKG_C_FLAGS "${VCPKG_C_FLAGS} /DZSTD_MULTITHREAD") +set(VCPKG_CXX_FLAGS "${VCPKG_CXX_FLAGS}") + vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH}/build/cmake PREFER_NINJA @@ -38,4 +43,5 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) endif() file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/zstd) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/zstd/LICENSE ${CURRENT_PACKAGES_DIR}/share/zstd/copyright) +file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/zstd) +file(WRITE ${CURRENT_PACKAGES_DIR}/share/zstd/copyright "ZSTD is dual licensed - see LICENSE and COPYING files\n") |