shithub: freetype+ttf2subf

Info  •  Files  •  Log  •  Branches

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

git/fs: mount .git/fs: mount/attach disallowed

--- a/ChangeLog

+++ b/ChangeLog

@@ -1,3 +1,20 @@

+2019-09-15  Avi Halachmi (:avih)  <[email protected]>

+

+	[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  <[email protected]>

 	[cmake] Add brotli support.

--- a/include/freetype/config/ftoption.h

+++ b/include/freetype/config/ftoption.h

@@ -305,7 +305,7 @@

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

   /**************************************************************************