Skip to content

Commit

Permalink
Remove defunct options WITH_INFLATE_STRICT and WITH_INFLATE_ALLOW_INV…
Browse files Browse the repository at this point in the history
…ALID_DIST.
  • Loading branch information
Dead2 committed May 12, 2023
1 parent fe5df79 commit 95d3eae
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 35 deletions.
18 changes: 0 additions & 18 deletions .github/workflows/cmake.yml
Original file line number Diff line number Diff line change
Expand Up @@ -323,24 +323,6 @@ jobs:
build-shared: ON
packages: clang-11 llvm-11 lld

- name: Ubuntu Clang Inflate Strict
os: ubuntu-latest
compiler: clang-11
cxx-compiler: clang++-11
cmake-args: -DWITH_INFLATE_STRICT=ON
packages: clang-11 llvm-11 llvm-11-tools
gcov-exec: llvm-cov-11 gcov
codecov: ubuntu_clang_inflate_strict

- name: Ubuntu Clang Inflate Allow Invalid Dist
os: ubuntu-latest
compiler: clang-11
cxx-compiler: clang++-11
cmake-args: -DWITH_INFLATE_ALLOW_INVALID_DIST=ON
packages: clang-11 llvm-11 llvm-11-tools
gcov-exec: llvm-cov-11 gcov
codecov: ubuntu_clang_inflate_allow_invalid_dist

- name: Ubuntu Clang Reduced Memory
os: ubuntu-latest
compiler: clang-11
Expand Down
17 changes: 0 additions & 17 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,6 @@ option(WITH_NATIVE_INSTRUCTIONS
"Instruct the compiler to use the full instruction set on this host (gcc/clang -march=native)" OFF)
option(WITH_MAINTAINER_WARNINGS "Build with project maintainer warnings" OFF)
option(WITH_CODE_COVERAGE "Enable code coverage reporting" OFF)
option(WITH_INFLATE_STRICT "Build with strict inflate distance checking" OFF)
option(WITH_INFLATE_ALLOW_INVALID_DIST "Build with zero fill for inflate invalid distances" OFF)
option(WITH_UNALIGNED "Support unaligned reads on platforms that support it" ON)

set(ZLIB_SYMBOL_PREFIX "" CACHE STRING "Give this prefix to all publicly exported symbols.
Expand Down Expand Up @@ -138,8 +136,6 @@ mark_as_advanced(FORCE
WITH_POWER8
WITH_POWER9
WITH_RVV
WITH_INFLATE_STRICT
WITH_INFLATE_ALLOW_INVALID_DIST
WITH_UNALIGNED
INSTALL_UTILS
)
Expand Down Expand Up @@ -521,17 +517,6 @@ if(NOT WITH_NEW_STRATEGIES)
add_definitions(-DNO_MEDIUM_STRATEGY)
endif()
#
# Enable inflate compilation options
#
if(WITH_INFLATE_STRICT)
add_definitions(-DINFLATE_STRICT)
message(STATUS "Inflate strict distance checking enabled")
endif()
if(WITH_INFLATE_ALLOW_INVALID_DIST)
add_definitions(-DINFLATE_ALLOW_INVALID_DISTANCE_TOOFAR_ARRR)
message(STATUS "Inflate zero data for invalid distances enabled")
endif()
#
# Enable reduced memory configuration
#
if(WITH_REDUCED_MEM)
Expand Down Expand Up @@ -1235,8 +1220,6 @@ add_feature_info(WITH_NATIVE_INSTRUCTIONS WITH_NATIVE_INSTRUCTIONS
"Instruct the compiler to use the full instruction set on this host (gcc/clang -march=native)")
add_feature_info(WITH_MAINTAINER_WARNINGS WITH_MAINTAINER_WARNINGS "Build with project maintainer warnings")
add_feature_info(WITH_CODE_COVERAGE WITH_CODE_COVERAGE "Enable code coverage reporting")
add_feature_info(WITH_INFLATE_STRICT WITH_INFLATE_STRICT "Build with strict inflate distance checking")
add_feature_info(WITH_INFLATE_ALLOW_INVALID_DIST WITH_INFLATE_ALLOW_INVALID_DIST "Build with zero fill for inflate invalid distances")

if(BASEARCH_ARM_FOUND)
add_feature_info(WITH_ACLE WITH_ACLE "Build with ACLE")
Expand Down

0 comments on commit 95d3eae

Please sign in to comment.