diff options
| author | Joel Rosdahl <joel@rosdahl.net> | 2023-01-27 13:09:25 +0100 |
|---|---|---|
| committer | Joel Rosdahl <joel@rosdahl.net> | 2023-01-29 10:28:41 +0100 |
| commit | fe5ddc9e79c39ba1b98f124561ce1b3f2cec3c19 (patch) | |
| tree | 6eb04fc83dad23bb1fa4f7993887413cdf3430cd /doc | |
| parent | 6534bb3e58cc613bf81672729e42ba19db88fa7b (diff) | |
| download | ccache-fe5ddc9e79c39ba1b98f124561ce1b3f2cec3c19.tar.gz | |
feat: Allow forcing download of zstd and hiredis again
Before it was possible to force downloading of the Zstandard library
using "-D ZSTD_FROM_INTERNET=ON" and similar for Hiredis. That ability
was lost in 2c742c2c7ca9, so if you for some reason want to not use a
locally installed library you're out of luck.
Improve this by letting ZSTD_FROM_INTERNET and HIREDIS_FROM_INTERNET be
tristate variables:
ON: Always download
AUTO (default): Download if local installation not found
OFF: Never download
As mentioned in #1240.
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/INSTALL.md | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/doc/INSTALL.md b/doc/INSTALL.md index e0763874..920cb4de 100644 --- a/doc/INSTALL.md +++ b/doc/INSTALL.md @@ -14,9 +14,9 @@ To build ccache you need: - [libzstd](http://www.zstd.net). If you don't have libzstd installed and can't or don't want to install it in a standard system location, it will be automatically downloaded, built and linked statically as part of the build - process. To disable this, pass `-DZSTD_FROM_INTERNET=OFF` to `cmake`. You can - also install zstd in a custom path and pass - `-DCMAKE_PREFIX_PATH=/some/custom/path` to `cmake`. + process. To disable this, pass `-DZSTD_FROM_INTERNET=OFF` to `cmake`, or pass + `-DZSTD_FROM_INTERNET=ON` to force downloading. You can also install zstd in a + custom path and pass `-DCMAKE_PREFIX_PATH=/some/custom/path` to `cmake`. To link libzstd statically (and you have a static libzstd available), pass `-DSTATIC_LINK=ON` to `cmake`. This is the default on Windows. Alternatively, @@ -28,8 +28,9 @@ Optional: you don't have libhiredis installed and can't or don't want to install it in a standard system location, it will be automatically downloaded, built and linked statically as part of the build process. To disable this, pass - `-DHIREDIS_FROM_INTERNET=OFF` to cmake. You can also install hiredis in a - custom path and pass `-DCMAKE_PREFIX_PATH=/some/custom/path` to `cmake`. + `-DHIREDIS_FROM_INTERNET=OFF` to `cmake`, or pass `-DHIREDIS_FROM_INTERNET=ON` + to force downloading.. You can also install hiredis in a custom path and pass + `-DCMAKE_PREFIX_PATH=/some/custom/path` to `cmake`. To link libhiredis statically (and you have a static libhiredis available), pass `-DSTATIC_LINK=ON` to `cmake`. This is the default on Windows. |