From cc17f852d575a8a66f9be51461af550d0f413891 Mon Sep 17 00:00:00 2001 From: "Avi Halachmi (:avih)" Date: Sun, 15 Sep 2019 04:30:18 +0300 Subject: [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. --- ChangeLog | 17 +++++++++++++++++ include/freetype/config/ftoption.h | 2 +- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index cb0335a9e..39ce8c0ae 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,20 @@ +2019-09-15 Avi Halachmi (:avih) + + [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 [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 */ /************************************************************************** -- cgit v1.2.1