Bug 134160

Summary: [CMake] Add necessary support for building for the Wayland target
Product: WebKit Reporter: Zan Dobersek <zan>
Component: New BugsAssignee: Zan Dobersek <zan>
Status: RESOLVED FIXED    
Severity: Normal CC: bunhere, commit-queue, gyuyoung.kim, mrobinson, rakuco, sergio
Priority: P2    
Version: 528+ (Nightly build)   
Hardware: Unspecified   
OS: Unspecified   
Bug Depends on:    
Bug Blocks: 115803    
Attachments:
Description Flags
Patch
none
Patch darin: review+

Zan Dobersek
Reported 2014-06-21 11:19:21 PDT
[CMake] Add necessary support for building for the Wayland target
Attachments
Patch (8.42 KB, patch)
2014-06-21 11:30 PDT, Zan Dobersek 		no flags
DetailsFormatted DiffDiff
Patch (8.44 KB, patch)
2014-06-23 12:17 PDT, Zan Dobersek 		darin: review+
DetailsFormatted DiffDiff
Show Obsolete (1) View All Add attachment proposed patch, testcase, etc.
Zan Dobersek
Comment 1 2014-06-21 11:30:40 PDT
Created attachment 233540 [details] Patch
Martin Robinson
Comment 2 2014-06-21 15:24:07 PDT
Comment on attachment 233540 [details] Patch View in context: https://bugs.webkit.org/attachment.cgi?id=233540&action=review > Source/cmake/OptionsGTK.cmake:74 > +if (NOT DEFINED ENABLE_X11_TARGET) > + set(ENABLE_X11_TARGET ON) > +endif () > + > +if (NOT DEFINED ENABLE_WAYLAND_TARGET) > + set(ENABLE_WAYLAND_TARGET OFF) > +endif () I think if you make these cached variables you can just give them default values. See: http://www.cmake.org/cmake/help/v3.0/command/set.html
Zan Dobersek
Comment 3 2014-06-23 12:17:14 PDT
Created attachment 233624 [details] Patch Makes ENABLE_X11_TARGET and ENABLE_WAYLAND_TARGET cached variables.
Martin Robinson
Comment 4 2014-07-01 12:29:45 PDT
Comment on attachment 233624 [details] Patch Looks good to me, other than the add_definitions(-DWTF_USE_EGL=1) and add_definitions(-DWTF_USE_GLX=1) that we discussed via Jabber.
Zan Dobersek
Comment 5 2014-07-01 13:33:22 PDT
Comment on attachment 233624 [details] Patch View in context: https://bugs.webkit.org/attachment.cgi?id=233624&action=review > Source/cmake/OptionsGTK.cmake:-241 > - > - if (EGL_FOUND) > - add_definitions(-DWTF_USE_EGL=1) > - endif () > - > - if (GLX_FOUND) > - add_definitions(-DWTF_USE_GLX=1) > - endif () I'll revert this change to preserve the current behavior where the two definitions rely on OpenGL dependency being present.
Zan Dobersek
Comment 6 2014-07-01 13:47:22 PDT
Committed r170663: <http://trac.webkit.org/changeset/170663>
Note You need to log in before you can comment on or make changes to this bug.