]> git.ipfire.org Git - thirdparty/curl.git/commit
cmake: extend zlib's `AUTO` option to brotli, zstd and enable if found
authorViktor Szakats <commit@vsz.me>
Mon, 28 Oct 2024 13:27:00 +0000 (14:27 +0100)
committerViktor Szakats <commit@vsz.me>
Tue, 17 Dec 2024 03:06:45 +0000 (04:06 +0100)
commitf2adb3b6d73cad0c28ec8a32f5fa969d0f6378a0
treefc52a2a821b61ae6b12a2f5be61acc5f0656d39d
parent290607f9d4418a95435b2e4fc91bea25524fc362
cmake: extend zlib's `AUTO` option to brotli, zstd and enable if found

- make `curl_dependency_option()` more generic.

- extend `CURL_BROTLI` and `CURL_ZSTD` options to accept
  `AUTO` in addition to existing `ON` and `OFF`.

- change `CURL_BROTLI` and `CURL_ZSTD` option default
  to `AUTO`. Was: `OFF`.
  It brings cmake behavior closer to `./configure`.
  Still different:
  - `./configure` defaults to `off` which means to check default
    locations. cmake checks more locations by default.
    (Also tried `NO_CMAKE_PATH`, but then it checked less locations.)
  - cmake returns both `brotlicommon` and `brotlidec` libs,
    while `./configure` only returns the latter.

- ci: drop explicit cmake options, that are now unnecessary.

- GHA/configure-vs-cmake: make adjustments to make tests pass.

Closes #15431
.github/workflows/configure-vs-cmake.yml
.github/workflows/http3-linux.yml
.github/workflows/linux-old.yml
.github/workflows/linux.yml
.github/workflows/macos.yml
.github/workflows/non-native.yml
.github/workflows/windows.yml
CMake/Macros.cmake
CMakeLists.txt
docs/INSTALL-CMAKE.md