Title: [171475] trunk/Source/WebCore
- Revision
- 171475
- Author
- [email protected]
- Date
- 2014-07-23 04:30:28 -0700 (Wed, 23 Jul 2014)
Log Message
[CMake] Avoid building WebCore with ANGLE's OpenGL/EGL headers
https://bugs.webkit.org/show_bug.cgi?id=135167
Reviewed by Martin Robinson.
* CMakeLists.txt: Don't add ANGLE/include to the WebCore_INCLUDE_DIRECTORIES list
as this results in ANGLE's OpenGL and EGL headers being included, instead of the
headers that are provided by the system. Only the ANGLESupport library should be built
with that specific header inclusion path.
Modified Paths
Diff
Modified: trunk/Source/WebCore/CMakeLists.txt (171474 => 171475)
--- trunk/Source/WebCore/CMakeLists.txt 2014-07-23 10:31:37 UTC (rev 171474)
+++ trunk/Source/WebCore/CMakeLists.txt 2014-07-23 11:30:28 UTC (rev 171475)
@@ -3034,7 +3034,6 @@
if (WTF_USE_3D_GRAPHICS)
list(APPEND WebCore_INCLUDE_DIRECTORIES
"${THIRDPARTY_DIR}/ANGLE/src"
- "${THIRDPARTY_DIR}/ANGLE/include"
"${THIRDPARTY_DIR}/ANGLE/include/KHR"
"${THIRDPARTY_DIR}/ANGLE/include/GLSLANG"
"${WEBCORE_DIR}/platform/graphics/gpu"
@@ -3605,6 +3604,7 @@
if (WTF_USE_3D_GRAPHICS)
add_library(ANGLESupport STATIC ${ANGLESupport_SOURCES})
set_target_properties(ANGLESupport PROPERTIES FOLDER "WebCore")
+ target_include_directories(ANGLESupport PRIVATE "${THIRDPARTY_DIR}/ANGLE/include")
list(APPEND WebCore_LIBRARIES ANGLESupport)
WEBKIT_SET_EXTRA_COMPILER_FLAGS(ANGLESupport IGNORECXX_WARNINGS)
endif ()
Modified: trunk/Source/WebCore/ChangeLog (171474 => 171475)
--- trunk/Source/WebCore/ChangeLog 2014-07-23 10:31:37 UTC (rev 171474)
+++ trunk/Source/WebCore/ChangeLog 2014-07-23 11:30:28 UTC (rev 171475)
@@ -1,3 +1,15 @@
+2014-07-23 Zan Dobersek <[email protected]>
+
+ [CMake] Avoid building WebCore with ANGLE's OpenGL/EGL headers
+ https://bugs.webkit.org/show_bug.cgi?id=135167
+
+ Reviewed by Martin Robinson.
+
+ * CMakeLists.txt: Don't add ANGLE/include to the WebCore_INCLUDE_DIRECTORIES list
+ as this results in ANGLE's OpenGL and EGL headers being included, instead of the
+ headers that are provided by the system. Only the ANGLESupport library should be built
+ with that specific header inclusion path.
+
2014-07-10 Radu Stavila <[email protected]>
REGRESSION (r169105): Crash in selection
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
