Title: [294989] releases/WebKitGTK/webkit-2.36/Source
- Revision
- 294989
- Author
- ape...@igalia.com
- Date
- 2022-05-28 02:10:00 -0700 (Sat, 28 May 2022)
Log Message
Merge r294881 - Cannot link WebKitTestRunner in non-unified builds
https://bugs.webkit.org/show_bug.cgi?id=240755
Reviewed by Adrian Perez de Castro.
In GTK non-unified build, WebKit shared library didn't export all
WEBCORE_EXPORT marked WebCore symbols because WebCore was a static
library.
WebCore should be an SHARED or OBJECT library to work WEBCORE_EXPORT
macro as expected.
* Source/WebCore/PlatformGTK.cmake:
* Source/WebCore/page/gtk/DragControllerGtk.cpp:
* Source/WebKit/WebProcess/WebPage/gtk/WebPrintOperationGtk.cpp:
* Source/cmake/OptionsGTK.cmake:
* Source/cmake/OptionsWPE.cmake:
Canonical link: https://commits.webkit.org/251011@main
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.36/Source/WebCore/PlatformGTK.cmake (294988 => 294989)
--- releases/WebKitGTK/webkit-2.36/Source/WebCore/PlatformGTK.cmake 2022-05-28 08:07:10 UTC (rev 294988)
+++ releases/WebKitGTK/webkit-2.36/Source/WebCore/PlatformGTK.cmake 2022-05-28 09:10:00 UTC (rev 294989)
@@ -6,8 +6,6 @@
include(platform/Soup.cmake)
include(platform/TextureMapper.cmake)
-set(WebCore_OUTPUT_NAME WebCoreGTK)
-
list(APPEND WebCore_UNIFIED_SOURCE_LIST_FILES
"SourcesGTK.txt"
Modified: releases/WebKitGTK/webkit-2.36/Source/cmake/OptionsGTK.cmake (294988 => 294989)
--- releases/WebKitGTK/webkit-2.36/Source/cmake/OptionsGTK.cmake 2022-05-28 08:07:10 UTC (rev 294988)
+++ releases/WebKitGTK/webkit-2.36/Source/cmake/OptionsGTK.cmake 2022-05-28 09:10:00 UTC (rev 294989)
@@ -241,6 +241,7 @@
set(CMAKE_CXX_VISIBILITY_PRESET hidden)
set(bmalloc_LIBRARY_TYPE OBJECT)
set(WTF_LIBRARY_TYPE OBJECT)
+set(WebCore_LIBRARY_TYPE OBJECT)
# These are shared variables, but we special case their definition so that we can use the
# CMAKE_INSTALL_* variables that are populated by the GNUInstallDirs macro.
Modified: releases/WebKitGTK/webkit-2.36/Source/cmake/OptionsWPE.cmake (294988 => 294989)
--- releases/WebKitGTK/webkit-2.36/Source/cmake/OptionsWPE.cmake 2022-05-28 08:07:10 UTC (rev 294988)
+++ releases/WebKitGTK/webkit-2.36/Source/cmake/OptionsWPE.cmake 2022-05-28 09:10:00 UTC (rev 294989)
@@ -156,6 +156,7 @@
set(bmalloc_LIBRARY_TYPE OBJECT)
set(WTF_LIBRARY_TYPE OBJECT)
set(_javascript_Core_LIBRARY_TYPE OBJECT)
+set(WebCore_LIBRARY_TYPE OBJECT)
# These are shared variables, but we special case their definition so that we can use the
# CMAKE_INSTALL_* variables that are populated by the GNUInstallDirs macro.
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
