Bug 135123

Summary: [CMake] Source/ThirdParty/ANGLE/include/ directory not listed in WebKit2_INCLUDE_DIRECTORIES
Product: WebKit Reporter: Zan Dobersek <zan>
Component: New BugsAssignee: Zan Dobersek <zan>
Status: RESOLVED INVALID    
Severity: Normal CC: bunhere, cdumez, commit-queue, gyuyoung.kim, mrobinson, rakuco, sergio
Priority: P2    
Version: 528+ (Nightly build)   
Hardware: Unspecified   
OS: Unspecified   
Attachments:
Description Flags
Patch mrobinson: review-

Description Zan Dobersek 2014-07-21 11:42:46 PDT 
[CMake] Source/ThirdParty/ANGLE/include/ directory not listed in WebKit2_INCLUDE_DIRECTORIES
Comment 1 Zan Dobersek 2014-07-21 11:45:16 PDT 
Created attachment 235233 [details]
Patch
Comment 2 Martin Robinson 2014-07-21 11:52:04 PDT 
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.
Comment 3 Darin Adler 2014-07-21 17:00:41 PDT 
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?
Comment 4 Martin Robinson 2014-07-21 17:05:59 PDT 
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.
Comment 5 Martin Robinson 2014-07-21 17:06:28 PDT 
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.
Comment 6 Zan Dobersek 2014-07-22 11:31:35 PDT 
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.