diff options
| author | Avi Halachmi (:avih) <avihpit@yahoo.com> | 2019-09-15 04:30:18 +0300 |
|---|---|---|
| committer | Werner Lemberg <wl@gnu.org> | 2019-09-15 18:52:13 +0200 |
| commit | cc17f852d575a8a66f9be51461af550d0f413891 (patch) | |
| tree | d1889ba230b9780efff634d0a83b0fd46d43a590 | |
| parent | 3de1b8d0b0983cf49a187a4227e7950395a3b08f (diff) | |
| download | freetype2-cc17f852d575a8a66f9be51461af550d0f413891.tar.gz | |
[cmake] Don't fail if brotli is missing (#56894).
The libs which cmake controls are commented out at
include/freetype/config/ftoption.h
and cmake un-comment each enabled library, but the brotli option was
not commented out, therefore `FT_CONFIG_OPTION_USE_BROTLI' remained
defined even if brotli was missing/disabled/etc.
Comment it such that cmake can control it, which means leaving it
undefined if brotli is missing.
* include/freetype/config/ftoption.h: Fix typo.
| -rw-r--r-- | ChangeLog | 17 | ||||
| -rw-r--r-- | include/freetype/config/ftoption.h | 2 |
2 files changed, 18 insertions, 1 deletions
@@ -1,3 +1,20 @@ +2019-09-15 Avi Halachmi (:avih) <avihpit@yahoo.com> + + [cmake] Don't fail if brotli is missing (#56894). + + The libs which cmake controls are commented out at + + include/freetype/config/ftoption.h + + and cmake un-comment each enabled library, but the brotli option was + not commented out, therefore `FT_CONFIG_OPTION_USE_BROTLI' remained + defined even if brotli was missing/disabled/etc. + + Comment it such that cmake can control it, which means leaving it + undefined if brotli is missing. + + * include/freetype/config/ftoption.h: Fix typo. + 2019-09-05 Werner Lemberg <wl@gnu.org> [cmake] Add brotli support. diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h index 721e2c9b1..2e3be3cae 100644 --- a/include/freetype/config/ftoption.h +++ b/include/freetype/config/ftoption.h @@ -305,7 +305,7 @@ FT_BEGIN_HEADER * options set by those programs have precedence, overwriting the value * here with the configured one. */ -#define FT_CONFIG_OPTION_USE_BROTLI +/* #define FT_CONFIG_OPTION_USE_BROTLI */ /************************************************************************** |