Bug 143304 – [CMake][GTK] Use the right variable to include the Wayland headers.

• Component: WebKitGTK
• Status: RESOLVED FIXED

[Carlos Alberto Lopez Perez]

The find_package command (as used in FindWayland.cmake) will define a number of variables if the package has been found:

    <NAME>_FOUND
    <NAME>_INCLUDE_DIRS or <NAME>_INCLUDES
    <NAME>_LIBRARIES or <NAME>_LIBRARIES or <NAME>_LIBS
    <NAME>_DEFINITIONS

All this takes place in the Find<name>.cmake file. http://www.cmake.org/Wiki/CMake:How_To_Find_Libraries


However, when adding the path for the include directory for the wayland library, we are using WAYLAND_INCLUDE_DIRECTORIES which is undefined (empty) instead of WAYLAND_INCLUDE_DIRS.

Usually the wayland include directory is the standard system one (/usr/lib), that explains why this has been unnoticed so far. There is no need to include the system default include path.
Only when using a different include directory for the wayland headers this could break.

PS: Note how all the other includes for libraries are using the <NAME>_INCLUDE_DIRS variable

$ grep INCLUDE_DIRS Source/WebCore/PlatformGTK.cmake

[Carlos Alberto Lopez Perez]

Created attachment 249916 [details]
Patch

[Carlos Garcia Campos]

Comment on attachment 249916 [details]
Patch

Good catch!

[WebKit Commit Bot]

Comment on attachment 249916 [details]
Patch

Clearing flags on attachment: 249916

Committed r182232: <http://trac.webkit.org/changeset/182232>

[WebKit Commit Bot]

All reviewed patches have been landed.  Closing bug.