Bug 135123 – [CMake] Source/ThirdParty/ANGLE/include/ directory not listed in WebKit2_INCLUDE_DIRECTORIES

• Component: New Bugs
• Status: RESOLVED INVALID

[Zan Dobersek]

[CMake] Source/ThirdParty/ANGLE/include/ directory not listed in WebKit2_INCLUDE_DIRECTORIES

[Zan Dobersek]

Created attachment 235233 [details]
Patch

[Martin Robinson]

Comment on attachment 235233 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=235233&action=review

> Source/WebKit2/ChangeLog:9
> +        * CMakeLists.txt: List the ANGLE/include/ directory in WebKit2_INCLUDE_DIRECTORIES. Spotted
> +        missing when LayerTreeHostGtk was caught including system-provided OpenGLES2 and EGL headers.

I think this is correct actually. We don't use the ANGLE implementation of OpenGL or EGL.

[Darin Adler]

Comment on attachment 235233 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=235233&action=review

>> Source/WebKit2/ChangeLog:9
>> +        missing when LayerTreeHostGtk was caught including system-provided OpenGLES2 and EGL headers.
> 
> I think this is correct actually. We don't use the ANGLE implementation of OpenGL or EGL.

Martin, is there a reason you didn’t do a review- when you added this comment?

[Martin Robinson]

Yes. I'm fairly certain that we do not want the ANGLE headers to override the system ones, but Zan has been working closer with this issue than me. I didn't want to flip the flag outright since he might have some reason I had not thought of for this behavior.

[Martin Robinson]

Comment on attachment 235233 [details]
Patch

That said, I'm almost certain if we use the system OpenGL at runtime we want to compile against the system OpenGL headers.

[Zan Dobersek]

The WebCore_INCLUDE_DIRECTORIES list includes this directory, so this patch tried to do the same for WebKit2_INCLUDE_DIRECTORIES. But I agree with Martin that we should be using the system's headers.