Title: [224490] trunk
- Revision
- 224490
- Author
- mcatanz...@igalia.com
- Date
- 2017-11-06 06:43:36 -0800 (Mon, 06 Nov 2017)
Log Message
[WPE][GTK] Always use SET_AND_EXPOSE_TO_BUILD to set build variables
https://bugs.webkit.org/show_bug.cgi?id=179038
Reviewed by Žan Doberšek.
.:
* Source/cmake/OptionsGTK.cmake:
* Source/cmake/OptionsWPE.cmake:
Source/WTF:
* wtf/Platform.h:
Modified Paths
Diff
Modified: trunk/ChangeLog (224489 => 224490)
--- trunk/ChangeLog 2017-11-06 14:43:32 UTC (rev 224489)
+++ trunk/ChangeLog 2017-11-06 14:43:36 UTC (rev 224490)
@@ -1,3 +1,13 @@
+2017-11-06 Michael Catanzaro <mcatanz...@igalia.com>
+
+ [WPE][GTK] Always use SET_AND_EXPOSE_TO_BUILD to set build variables
+ https://bugs.webkit.org/show_bug.cgi?id=179038
+
+ Reviewed by Žan Doberšek.
+
+ * Source/cmake/OptionsGTK.cmake:
+ * Source/cmake/OptionsWPE.cmake:
+
2017-11-03 Michael Catanzaro <mcatanz...@igalia.com>
[WPE][GTK] Avoid duplicating code for dist and distcheck targets
Modified: trunk/Source/WTF/ChangeLog (224489 => 224490)
--- trunk/Source/WTF/ChangeLog 2017-11-06 14:43:32 UTC (rev 224489)
+++ trunk/Source/WTF/ChangeLog 2017-11-06 14:43:36 UTC (rev 224490)
@@ -1,3 +1,12 @@
+2017-11-06 Michael Catanzaro <mcatanz...@igalia.com>
+
+ [WPE][GTK] Always use SET_AND_EXPOSE_TO_BUILD to set build variables
+ https://bugs.webkit.org/show_bug.cgi?id=179038
+
+ Reviewed by Žan Doberšek.
+
+ * wtf/Platform.h:
+
2017-11-03 Chris Dumez <cdu...@apple.com>
Use a single identifier type to identify Service Workers
Modified: trunk/Source/WTF/wtf/Platform.h (224489 => 224490)
--- trunk/Source/WTF/wtf/Platform.h 2017-11-06 14:43:32 UTC (rev 224489)
+++ trunk/Source/WTF/wtf/Platform.h 2017-11-06 14:43:36 UTC (rev 224490)
@@ -520,7 +520,6 @@
#endif
#if PLATFORM(GTK) || PLATFORM(WPE)
-#define USE_CAIRO 1
#define USE_GLIB 1
#define USE_FREETYPE 1
#define USE_HARFBUZZ 1
Modified: trunk/Source/cmake/OptionsGTK.cmake (224489 => 224490)
--- trunk/Source/cmake/OptionsGTK.cmake 2017-11-06 14:43:32 UTC (rev 224489)
+++ trunk/Source/cmake/OptionsGTK.cmake 2017-11-06 14:43:36 UTC (rev 224490)
@@ -46,8 +46,8 @@
include(GStreamerDefinitions)
-set(USE_CAIRO ON)
-set(USE_XDGMIME ON)
+SET_AND_EXPOSE_TO_BUILD(USE_CAIRO TRUE)
+SET_AND_EXPOSE_TO_BUILD(USE_XDGMIME TRUE)
SET_AND_EXPOSE_TO_BUILD(USE_GCRYPT TRUE)
# For old versions of HarfBuzz that do not expose an API for the OpenType MATH
Modified: trunk/Source/cmake/OptionsWPE.cmake (224489 => 224490)
--- trunk/Source/cmake/OptionsWPE.cmake 2017-11-06 14:43:32 UTC (rev 224489)
+++ trunk/Source/cmake/OptionsWPE.cmake 2017-11-06 14:43:36 UTC (rev 224490)
@@ -75,8 +75,8 @@
find_package(LibXslt 1.1.7 REQUIRED)
endif ()
-set(USE_CAIRO ON)
-set(USE_XDGMIME ON)
+SET_AND_EXPOSE_TO_BUILD(USE_CAIRO TRUE)
+SET_AND_EXPOSE_TO_BUILD(USE_XDGMIME TRUE)
SET_AND_EXPOSE_TO_BUILD(USE_GCRYPT TRUE)
if (ENABLE_ACCELERATED_2D_CANVAS)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
