| Summary: | [CMake] Add necessary support for building for the Wayland target | ||||||||
|---|---|---|---|---|---|---|---|---|---|
| Product: | WebKit | Reporter: | Zan Dobersek <zan> | ||||||
| Component: | New Bugs | Assignee: | 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
Zan Dobersek
2014-06-21 11:19:21 PDT
Created attachment 233540 [details]
Patch
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 Created attachment 233624 [details]
Patch
Makes ENABLE_X11_TARGET and ENABLE_WAYLAND_TARGET cached variables.
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.
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. Committed r170663: <http://trac.webkit.org/changeset/170663> |