Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[zstd] Removing de-duplication of cmake flags #13454

Merged
merged 5 commits into from
Oct 27, 2020
Merged

[zstd] Removing de-duplication of cmake flags #13454

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3006af8
Fix zstd until https://github.com/facebook/zstd/pull/2205 is merged i…
Sep 9, 2020
502d7c9
Update CONTROL
Nemirtingas Sep 11, 2020
a83a11b
Merge remote-tracking branch 'vcpkg/master' into zstd_crosscompile_fix
GameDumper Sep 26, 2020
877a1c4
Merge branch 'master' of https://github.com/Microsoft/vcpkg into zstd…
Oct 14, 2020
15319ce
Merge branch 'master' of https://github.com/Microsoft/vcpkg into zstd…
Oct 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions ports/zstd/0002-crosscompile-windows.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 ()
2 changes: 1 addition & 1 deletion ports/zstd/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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/
1 change: 1 addition & 0 deletions ports/zstd/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down