diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2019-11-22 09:47:40 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-22 09:47:40 -0800 |
| commit | 45f4b820e5743b89bca3508ba2028cdd5d8bbd17 (patch) | |
| tree | f874a8c4a7392309bdbb86447288597ec0a4a281 /ports/zstd | |
| parent | 62d67d3bf8eeff1afa8009041fd08b8822676b7b (diff) | |
| parent | 8831e8f25f1ff6546ee4a5291b91d599421637b3 (diff) | |
| download | vcpkg-45f4b820e5743b89bca3508ba2028cdd5d8bbd17.tar.gz vcpkg-45f4b820e5743b89bca3508ba2028cdd5d8bbd17.zip | |
Merge branch 'master' into vcpkg_nuget
Diffstat (limited to 'ports/zstd')
| -rw-r--r-- | ports/zstd/CONTROL | 2 | ||||
| -rw-r--r-- | ports/zstd/enable-debug-mode.patch | 13 | ||||
| -rw-r--r-- | ports/zstd/portfile.cmake | 1 |
3 files changed, 1 insertions, 15 deletions
diff --git a/ports/zstd/CONTROL b/ports/zstd/CONTROL index bab75367d..47cdf1eff 100644 --- a/ports/zstd/CONTROL +++ b/ports/zstd/CONTROL @@ -1,4 +1,4 @@ Source: zstd -Version: 1.4.0 +Version: 1.4.0-1 Description: Zstandard - Fast real-time compression algorithm Homepage: https://facebook.github.io/zstd/ diff --git a/ports/zstd/enable-debug-mode.patch b/ports/zstd/enable-debug-mode.patch deleted file mode 100644 index a3e829032..000000000 --- a/ports/zstd/enable-debug-mode.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/build/cmake/CMakeLists.txt b/build/cmake/CMakeLists.txt
-index 1e2921d..31fe3d5 100644
---- a/build/cmake/CMakeLists.txt
-+++ b/build/cmake/CMakeLists.txt
-@@ -12,7 +12,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8.9)
- SET(ZSTD_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../..")
-
- # Ensure Release build even if not invoked via Makefile
--SET(CMAKE_BUILD_TYPE "Release")
-+# SET(CMAKE_BUILD_TYPE "Release")
-
- LIST(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules")
- INCLUDE(GNUInstallDirs)
diff --git a/ports/zstd/portfile.cmake b/ports/zstd/portfile.cmake index 4b7522c76..c8efe2812 100644 --- a/ports/zstd/portfile.cmake +++ b/ports/zstd/portfile.cmake @@ -5,7 +5,6 @@ vcpkg_from_github( REF v1.4.0 SHA512 8614934e25eb1e82b554c483bc9d2d055f51344697295e83b22a8d726321b12068cfa7f7d2a9fe28a2de7c9edda59733826277efc7046e13674d6f7f02af5671 HEAD_REF dev - PATCHES enable-debug-mode.patch ) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") |