Bug 135167 - [CMake] Avoid building WebCore with ANGLE's OpenGL/EGL headers
Summary: [CMake] Avoid building WebCore with ANGLE's OpenGL/EGL headers
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: New Bugs (show other bugs)
Version: 528+ (Nightly build)
Hardware: Unspecified Unspecified
: P2 Normal
Assignee: Zan Dobersek
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2014-07-22 11:53 PDT by Zan Dobersek
Modified: 2014-07-29 06:36 PDT (History)
9 users (show)

See Also:


Attachments
Patch (2.09 KB, patch)
2014-07-22 12:05 PDT, Zan Dobersek
no flags Details | Formatted Diff | Diff
Patch for landing (1.76 KB, patch)
2014-07-23 01:18 PDT, Zan Dobersek
no flags Details | Formatted Diff | Diff
Archive of layout-test-results from webkit-ews-15 for mac-mountainlion-wk2 (486.99 KB, application/zip)
2014-07-23 02:22 PDT, Build Bot
no flags Details
Archive of layout-test-results from webkit-ews-13 for mac-mountainlion-wk2 (486.42 KB, application/zip)
2014-07-23 03:24 PDT, Build Bot
no flags Details

Note You need to log in before you can comment on or make changes to this bug.
Description Zan Dobersek 2014-07-22 11:53:25 PDT
[CMake] Avoid building WebCore with ANGLE's OpenGL/EGL headers
Comment 1 Zan Dobersek 2014-07-22 12:05:47 PDT
Created attachment 235304 [details]
Patch
Comment 2 Martin Robinson 2014-07-22 12:07:38 PDT
Comment on attachment 235304 [details]
Patch

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

> Source/WebCore/CMakeLists.txt:3608
> -    list(APPEND WebCore_LIBRARIES ANGLESupport)
> +    target_include_directories(ANGLESupport PRIVATE "${THIRDPARTY_DIR}/ANGLE/include")
> +    target_link_libraries(WebCore ANGLESupport)

Why use target_link_libraries directly here instead of WebCore_LIBRARIES?
Comment 3 Zan Dobersek 2014-07-22 12:16:26 PDT
Comment on attachment 235304 [details]
Patch

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

>> Source/WebCore/CMakeLists.txt:3608
>> +    target_link_libraries(WebCore ANGLESupport)
> 
> Why use target_link_libraries directly here instead of WebCore_LIBRARIES?

In ChangeLog I mentioned this readds the ANGLESupport's include directories to WebCore. I retested it now and that might not be true. I'll re-check it and adjust accordingly before landing.
Comment 4 Zan Dobersek 2014-07-23 01:18:50 PDT
Created attachment 235347 [details]
Patch for landing

Testing through the EWS.
Comment 5 Build Bot 2014-07-23 02:22:51 PDT
Comment on attachment 235347 [details]
Patch for landing

Attachment 235347 [details] did not pass mac-wk2-ews (mac-wk2):
Output: http://webkit-queues.appspot.com/results/6539658175447040

New failing tests:
media/W3C/video/networkState/networkState_during_loadstart.html
Comment 6 Build Bot 2014-07-23 02:22:55 PDT
Created attachment 235349 [details]
Archive of layout-test-results from webkit-ews-15 for mac-mountainlion-wk2

The attached test failures were seen while running run-webkit-tests on the mac-wk2-ews.
Bot: webkit-ews-15  Port: mac-mountainlion-wk2  Platform: Mac OS X 10.8.5
Comment 7 Build Bot 2014-07-23 03:24:27 PDT
Comment on attachment 235347 [details]
Patch for landing

Attachment 235347 [details] did not pass mac-wk2-ews (mac-wk2):
Output: http://webkit-queues.appspot.com/results/6734099934871552

New failing tests:
media/W3C/video/networkState/networkState_during_loadstart.html
Comment 8 Build Bot 2014-07-23 03:24:31 PDT
Created attachment 235350 [details]
Archive of layout-test-results from webkit-ews-13 for mac-mountainlion-wk2

The attached test failures were seen while running run-webkit-tests on the mac-wk2-ews.
Bot: webkit-ews-13  Port: mac-mountainlion-wk2  Platform: Mac OS X 10.8.5
Comment 9 Zan Dobersek 2014-07-23 04:29:16 PDT
(In reply to comment #7)
> (From update of attachment 235347 [details])
> Attachment 235347 [details] did not pass mac-wk2-ews (mac-wk2):
> Output: http://webkit-queues.appspot.com/results/6734099934871552
> 
> New failing tests:
> media/W3C/video/networkState/networkState_during_loadstart.html

The patch doesn't affect this.
Comment 10 Zan Dobersek 2014-07-23 04:30:54 PDT
Comment on attachment 235347 [details]
Patch for landing

Clearing flags on attachment: 235347

Committed r171475: <http://trac.webkit.org/changeset/171475>
Comment 11 Zan Dobersek 2014-07-23 04:31:04 PDT
All reviewed patches have been landed.  Closing bug.
Comment 12 Ryuan Choi 2014-07-24 16:48:48 PDT
Comment on attachment 235347 [details]
Patch for landing

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

> Source/WebCore/CMakeLists.txt:3607
> +    target_include_directories(ANGLESupport PRIVATE "${THIRDPARTY_DIR}/ANGLE/include")

target_include_directories is introduced at cmake 2.8.11 ( http://www.kitware.com/blog/home/post/492 )
And minimum required version is 2.8.3.

Should we bump the cmake version for this?
Comment 13 Zan Dobersek 2014-07-29 06:36:00 PDT
(In reply to comment #12)
> (From update of attachment 235347 [details])
> View in context: https://bugs.webkit.org/attachment.cgi?id=235347&action=review
> 
> > Source/WebCore/CMakeLists.txt:3607
> > +    target_include_directories(ANGLESupport PRIVATE "${THIRDPARTY_DIR}/ANGLE/include")
> 
> target_include_directories is introduced at cmake 2.8.11 ( http://www.kitware.com/blog/home/post/492 )
> And minimum required version is 2.8.3.
> 
> Should we bump the cmake version for this?

Thanks for the reminder. Bumping the required version in bug #135382.