]> git.ipfire.org Git - thirdparty/zstd.git/commitdiff
Merge branch 'dev' into fasterCygwin
authorYann Collet <cyan@fb.com>
Thu, 6 May 2021 23:06:00 +0000 (16:06 -0700)
committerYann Collet <cyan@fb.com>
Thu, 6 May 2021 23:06:00 +0000 (16:06 -0700)
1  2 
appveyor.yml
build/cmake/tests/CMakeLists.txt

diff --cc appveyor.yml
Simple merge
index fe095eb6ab9a8f5257144c0e50389ca133995854,f7b6e9087441255ee7f3993aad4b9df6607719e8..27acd41bef4f86678fa33e0b2d717093ccc0a356
@@@ -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