From: Yann Collet <cyan@fb.com>
Date: Thu, 6 May 2021 23:06:00 +0000 (-0700)
Subject: Merge branch 'dev' into fasterCygwin
X-Git-Tag: v1.5.0^2~18^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ee6516265541ef58736e48f9ab18c7674fb93dd9;p=thirdparty%2Fzstd.git

Merge branch 'dev' into fasterCygwin
---

ee6516265541ef58736e48f9ab18c7674fb93dd9
diff --cc build/cmake/tests/CMakeLists.txt
index fe095eb6a,f7b6e9087..27acd41be
--- a/build/cmake/tests/CMakeLists.txt
+++ b/build/cmake/tests/CMakeLists.txt
@@@ -57,8 -57,9 +57,9 @@@ target_link_libraries(datagen libzstd_s
  # fullbench
  #
  add_executable(fullbench ${PROGRAMS_DIR}/datagen.c ${PROGRAMS_DIR}/util.c ${PROGRAMS_DIR}/timefn.c ${PROGRAMS_DIR}/benchfn.c ${PROGRAMS_DIR}/benchzstd.c ${TESTS_DIR}/fullbench.c)
+ set_property(TARGET fullbench APPEND PROPERTY COMPILE_DEFINITIONS "ZSTD_DISABLE_DEPRECATE_WARNINGS")
  target_link_libraries(fullbench libzstd_static)
 -add_test(NAME fullbench COMMAND fullbench)
 +add_test(NAME fullbench COMMAND fullbench ${ZSTD_FULLBENCH_FLAGS})
  
  #
  # fuzzer