Title: [288284] trunk
- Revision
- 288284
- Author
- don.olmst...@sony.com
- Date
- 2022-01-20 06:55:34 -0800 (Thu, 20 Jan 2022)
Log Message
[WinCairo] Make USE_CF conditional on ENABLE_WEBKIT_LEGACY
https://bugs.webkit.org/show_bug.cgi?id=235393
Reviewed by Fujii Hironori.
CoreFoundation is used heavily in WebKitLegacy on Windows and won't compile without it.
Modern WebKit doesn't have this requirement so tie CoreFoundation usage to whether
WebKitLegacy is being used.
* Source/cmake/OptionsWinCairo.cmake:
Modified Paths
Diff
Modified: trunk/ChangeLog (288283 => 288284)
--- trunk/ChangeLog 2022-01-20 14:13:02 UTC (rev 288283)
+++ trunk/ChangeLog 2022-01-20 14:55:34 UTC (rev 288284)
@@ -1,3 +1,16 @@
+2022-01-20 Don Olmstead <don.olmst...@sony.com>
+
+ [WinCairo] Make USE_CF conditional on ENABLE_WEBKIT_LEGACY
+ https://bugs.webkit.org/show_bug.cgi?id=235393
+
+ Reviewed by Fujii Hironori.
+
+ CoreFoundation is used heavily in WebKitLegacy on Windows and won't compile without it.
+ Modern WebKit doesn't have this requirement so tie CoreFoundation usage to whether
+ WebKitLegacy is being used.
+
+ * Source/cmake/OptionsWinCairo.cmake:
+
2022-01-19 Michael Catanzaro <mcatanz...@gnome.org>
[WPE][GTK] ENABLE_JOURNALD_LOG has weird value
Modified: trunk/Source/cmake/OptionsWinCairo.cmake (288283 => 288284)
--- trunk/Source/cmake/OptionsWinCairo.cmake 2022-01-20 14:13:02 UTC (rev 288283)
+++ trunk/Source/cmake/OptionsWinCairo.cmake 2022-01-20 14:55:34 UTC (rev 288284)
@@ -51,7 +51,6 @@
SET_AND_EXPOSE_TO_BUILD(USE_ANGLE ON)
SET_AND_EXPOSE_TO_BUILD(USE_CAIRO ON)
-SET_AND_EXPOSE_TO_BUILD(USE_CF ON)
SET_AND_EXPOSE_TO_BUILD(USE_CURL ON)
SET_AND_EXPOSE_TO_BUILD(USE_GRAPHICS_LAYER_TEXTURE_MAPPER ON)
SET_AND_EXPOSE_TO_BUILD(USE_GRAPHICS_LAYER_WC ON)
@@ -68,7 +67,11 @@
SET_AND_EXPOSE_TO_BUILD(HAVE_OS_DARK_MODE_SUPPORT 1)
-set(COREFOUNDATION_LIBRARY CFlite)
+# CoreFoundation is required when building WebKitLegacy
+if (ENABLE_WEBKIT_LEGACY)
+ SET_AND_EXPOSE_TO_BUILD(USE_CF ON)
+ set(COREFOUNDATION_LIBRARY CFlite)
+endif ()
add_definitions(-DWTF_PLATFORM_WIN_CAIRO=1)
add_definitions(-DNOCRYPT)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
