diff options
| author | Nemirtingas <9432037+Nemirtingas@users.noreply.github.com> | 2020-10-27 04:59:39 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-26 20:59:39 -0700 |
| commit | c7db4c3498e751dc0e2503212de49af1df2a3ab1 (patch) | |
| tree | 0c119f3b838073d94b8cc3f456afb8bdb093c72a | |
| parent | c31cfd3c81a792d7073e71e8e4f9ab604f0f305e (diff) | |
| download | vcpkg-c7db4c3498e751dc0e2503212de49af1df2a3ab1.tar.gz vcpkg-c7db4c3498e751dc0e2503212de49af1df2a3ab1.zip | |
[zstd] Removing de-duplication of cmake flags (#13454)
| -rw-r--r-- | ports/zstd/0002-crosscompile-windows.patch | 12 | ||||
| -rw-r--r-- | ports/zstd/CONTROL | 2 | ||||
| -rw-r--r-- | ports/zstd/portfile.cmake | 1 |
3 files changed, 14 insertions, 1 deletions
diff --git a/ports/zstd/0002-crosscompile-windows.patch b/ports/zstd/0002-crosscompile-windows.patch new file mode 100644 index 000000000..c084da1ff --- /dev/null +++ b/ports/zstd/0002-crosscompile-windows.patch @@ -0,0 +1,12 @@ +diff --git a/build/cmake/CMakeModules/AddZstdCompilationFlags.cmake b/build/cmake/CMakeModules/AddZstdCompilationFlags.cmake +index 7adca875..8835d1c6 100644 +--- a/build/cmake/CMakeModules/AddZstdCompilationFlags.cmake 2019-11-04 17:54:32.000000000 +0000 ++++ b/build/cmake/CMakeModules/AddZstdCompilationFlags.cmake 2020-09-09 20:54:13.817515706 +0000 +@@ -52,7 +52,6 @@ + CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELWITHDEBINFO) + if( ${flag_var} ) + separate_arguments(${flag_var}) +- list(REMOVE_DUPLICATES ${flag_var}) + string(REPLACE ";" " " ${flag_var} "${${flag_var}}") + endif() + endforeach () diff --git a/ports/zstd/CONTROL b/ports/zstd/CONTROL index 63ca9098c..7c8ba66f2 100644 --- a/ports/zstd/CONTROL +++ b/ports/zstd/CONTROL @@ -1,5 +1,5 @@ Source: zstd Version: 1.4.4 -Port-Version: 2 +Port-Version: 3 Description: Zstandard - Fast real-time compression algorithm Homepage: https://facebook.github.io/zstd/ diff --git a/ports/zstd/portfile.cmake b/ports/zstd/portfile.cmake index 8ed5f36e9..af1af2b2f 100644 --- a/ports/zstd/portfile.cmake +++ b/ports/zstd/portfile.cmake @@ -6,6 +6,7 @@ vcpkg_from_github( HEAD_REF dev PATCHES 0001-export-zstd-config.patch + 0002-crosscompile-windows.patch ) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") |