Bug 134160 – [CMake] Add necessary support for building for the Wayland target

• Status: RESOLVED
• Resolution: FIXED
• Component: New Bugs

[Zan Dobersek]

[CMake] Add necessary support for building for the Wayland target

[Zan Dobersek]

Created attachment 233540 [details]
Patch

[Martin Robinson]

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]

Created attachment 233624 [details]
Patch

Makes ENABLE_X11_TARGET and ENABLE_WAYLAND_TARGET cached variables.

[Martin Robinson]

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 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]

Committed r170663: <http://trac.webkit.org/changeset/170663>