Title: [220326] trunk/Source/WebKit
- Revision
- 220326
- Author
- clo...@igalia.com
- Date
- 2017-08-06 16:34:58 -0700 (Sun, 06 Aug 2017)
Log Message
[GTK][WPE] CFLAGS from pkg-config for (E)GL are not passed to WebKit
https://bugs.webkit.org/show_bug.cgi?id=175125
Reviewed by Michael Catanzaro.
Some platforms define cflags on the (E)GL pkg-config files that we
need to pass to the build system when including the (E)GL headers.
And we are already doing this when building WebCore (after r184954).
But now we need to do this also on WebKit (former WebKit2) because
we include (E)GL headers (and make use of them) on the UIProcess.
* CMakeLists.txt:
Modified Paths
Diff
Modified: trunk/Source/WebKit/CMakeLists.txt (220325 => 220326)
--- trunk/Source/WebKit/CMakeLists.txt 2017-08-06 23:24:17 UTC (rev 220325)
+++ trunk/Source/WebKit/CMakeLists.txt 2017-08-06 23:34:58 UTC (rev 220326)
@@ -91,6 +91,37 @@
)
if (ENABLE_GRAPHICS_CONTEXT_3D)
+ # For platforms that want to use system-provided OpenGL (ES) / EGL headers,
+ # these include directories, libraries or definitions need to be
+ # added before the ANGLE directories.
+ if (USE_OPENGL)
+ list(APPEND WebKit2_SYSTEM_INCLUDE_DIRECTORIES
+ ${OPENGL_INCLUDE_DIRS}
+ )
+ list(APPEND WebKit2_LIBRARIES
+ ${OPENGL_LIBRARIES}
+ )
+ add_definitions(${OPENGL_DEFINITIONS})
+ elseif (USE_OPENGL_ES_2)
+ list(APPEND WebKit2_SYSTEM_INCLUDE_DIRECTORIES
+ ${OPENGLES2_INCLUDE_DIRS}
+ )
+ list(APPEND WebKit2_LIBRARIES
+ ${OPENGLES2_LIBRARIES}
+ )
+ add_definitions(${OPENGLES2_DEFINITIONS})
+ endif ()
+
+ if (USE_EGL)
+ list(APPEND WebKit2_SYSTEM_INCLUDE_DIRECTORIES
+ ${EGL_INCLUDE_DIRS}
+ )
+ list(APPEND WebKit2_LIBRARIES
+ ${EGL_LIBRARIES}
+ )
+ add_definitions(${EGL_DEFINITIONS})
+ endif ()
+
list(APPEND WebKit2_INCLUDE_DIRECTORIES
"${THIRDPARTY_DIR}/ANGLE"
"${THIRDPARTY_DIR}/ANGLE/include/KHR"
Modified: trunk/Source/WebKit/ChangeLog (220325 => 220326)
--- trunk/Source/WebKit/ChangeLog 2017-08-06 23:24:17 UTC (rev 220325)
+++ trunk/Source/WebKit/ChangeLog 2017-08-06 23:34:58 UTC (rev 220326)
@@ -1,3 +1,19 @@
+2017-08-06 Carlos Alberto Lopez Perez <clo...@igalia.com>
+
+ [GTK][WPE] CFLAGS from pkg-config for (E)GL are not passed to WebKit
+ https://bugs.webkit.org/show_bug.cgi?id=175125
+
+ Reviewed by Michael Catanzaro.
+
+ Some platforms define cflags on the (E)GL pkg-config files that we
+ need to pass to the build system when including the (E)GL headers.
+ And we are already doing this when building WebCore (after r184954).
+
+ But now we need to do this also on WebKit (former WebKit2) because
+ we include (E)GL headers (and make use of them) on the UIProcess.
+
+ * CMakeLists.txt:
+
2017-08-05 Carlos Garcia Campos <cgar...@igalia.com>
WebDriver: Implement page load strategy
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
