rgraves
/
freetype2
forked from minhngoc25a/freetype2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[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.
This commit is contained in:
Avi Halachmi (:avih) 2019-09-15 04:30:18 +03:00 committed by Werner Lemberg
parent 3de1b8d0b0
commit cc17f852d5
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ChangeLog
View File

@ -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.

2
include/freetype/config/ftoption.h
View File

@ -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 */
/**************************************************************************