Title: [220331] trunk/Source/WebKit
- Revision
- 220331
- Author
- clo...@igalia.com
- Date
- 2017-08-07 02:53:52 -0700 (Mon, 07 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
Unreviewed follow-up fix after r220326.
* CMakeLists.txt: Move the block appending to WebKit2_LIBRARIES
below where the list itself is created.
Modified Paths
Diff
Modified: trunk/Source/WebKit/CMakeLists.txt (220330 => 220331)
--- trunk/Source/WebKit/CMakeLists.txt 2017-08-07 07:03:06 UTC (rev 220330)
+++ trunk/Source/WebKit/CMakeLists.txt 2017-08-07 09:53:52 UTC (rev 220331)
@@ -90,44 +90,6 @@
${ICU_INCLUDE_DIRS}
)
-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"
- )
-endif ()
-
set(WebKit2_SOURCES
NetworkProcess/CustomProtocols/LegacyCustomProtocolManager.cpp
@@ -736,6 +698,44 @@
WebKit2
)
+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"
+ )
+endif ()
+
if (WIN32 AND INTERNAL_BUILD)
set(_javascript_Core_SCRIPTS_DIR "${CMAKE_BINARY_DIR}/../include/private/_javascript_Core/Scripts")
else ()
Modified: trunk/Source/WebKit/ChangeLog (220330 => 220331)
--- trunk/Source/WebKit/ChangeLog 2017-08-07 07:03:06 UTC (rev 220330)
+++ trunk/Source/WebKit/ChangeLog 2017-08-07 09:53:52 UTC (rev 220331)
@@ -1,3 +1,13 @@
+2017-08-07 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
+
+ Unreviewed follow-up fix after r220326.
+
+ * CMakeLists.txt: Move the block appending to WebKit2_LIBRARIES
+ below where the list itself is created.
+
2017-08-05 Carlos Garcia Campos <cgar...@igalia.com>
[GTK][WPE] Add API to provide browser information required by automation
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
