[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[freetype2] master cc17f85: [cmake] Don't fail if brotli is missing (#56
From: |
Werner LEMBERG |
Subject: |
[freetype2] master cc17f85: [cmake] Don't fail if brotli is missing (#56894). |
Date: |
Sun, 15 Sep 2019 12:53:11 -0400 (EDT) |
branch: master
commit cc17f852d575a8a66f9be51461af550d0f413891
Author: Avi Halachmi (:avih) <address@hidden>
Commit: Werner Lemberg <address@hidden>
[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 cb0335a..39ce8c0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2019-09-15 Avi Halachmi (:avih) <address@hidden>
+
+ [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 <address@hidden>
[cmake] Add brotli support.
diff --git a/include/freetype/config/ftoption.h
b/include/freetype/config/ftoption.h
index 721e2c9..2e3be3c 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 */
/**************************************************************************
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [freetype2] master cc17f85: [cmake] Don't fail if brotli is missing (#56894).,
Werner LEMBERG <=