143304 2015-04-01 06:12:52 -0700 [CMake][GTK] Use the right variable to include the Wayland headers. 2015-04-01 07:31:11 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 clopez clopez achristensen cdumez cgarcia commit-queue mrobinson zan oldest_to_newest 1081979 0 clopez 2015-04-01 06:12:52 -0700 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 1081980 1 249916 clopez 2015-04-01 06:18:13 -0700 Created attachment 249916 Patch 1081989 2 249916 cgarcia 2015-04-01 06:43:17 -0700 Comment on attachment 249916 Patch Good catch! 1081997 3 249916 commit-queue 2015-04-01 07:31:07 -0700 Comment on attachment 249916 Patch Clearing flags on attachment: 249916 Committed r182232: <http://trac.webkit.org/changeset/182232> 1081998 4 commit-queue 2015-04-01 07:31:11 -0700 All reviewed patches have been landed. Closing bug. 249916 2015-04-01 06:18:13 -0700 2015-04-01 07:31:07 -0700 Patch bug-143304-20150401151729.patch text/plain 1273 clopez U3VidmVyc2lvbiBSZXZpc2lvbjogMTgyMjMwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDk2NmYxZDI3MmJhNWJi ZTdjMDBlNTQzODBkMDM5YjRlY2E4ZDJiOS4uYWQxYzM2MjExZTcwNzRhNTdjNTU0MzAzZGY1MGRh NzgzY2E2MDBkNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDE1LTA0LTAxICBDYXJs b3MgQWxiZXJ0byBMb3BleiBQZXJleiAgPGNsb3BlekBpZ2FsaWEuY29tPgorCisgICAgICAgIFtD TWFrZV1bR1RLXSBVc2UgdGhlIHJpZ2h0IHZhcmlhYmxlIHRvIGluY2x1ZGUgdGhlIFdheWxhbmQg aGVhZGVycy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTE0MzMwNAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IE5vIG5ldyB0ZXN0cywgbm8gYmVoYXZpb3IgY2hhbmdlcy4KKworICAgICAgICAqIFBsYXRmb3Jt R1RLLmNtYWtlOiBVc2UgdGhlIHJpZ2h0IHZhcmlhYmxlIFdBWUxBTkRfSU5DTFVERV9ESVJTLgor CiAyMDE1LTAzLTMwICBQaGlsaXBwZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlhLmNvbT4KIAog ICAgICAgICBbR1N0cmVhbWVyXSBNb3ZlIHN5bmNocm9ub3VzIG1lc3NhZ2UgaGFuZGxlciB0byBN ZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXJCYXNlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9QbGF0Zm9ybUdUSy5jbWFrZSBiL1NvdXJjZS9XZWJDb3JlL1BsYXRmb3JtR1RLLmNtYWtlCmlu ZGV4IDU2ZWJjNGFiMTA1ZTc5ZWQyNmE4OWFiMGVhZDRhZDJlZWU0MDU1NDAuLmJiMTlkYjYzNzQ0 NDIwNWM3NTA5NTBjZjc1YjU3ZGYxYjI5NzFmNWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L1BsYXRmb3JtR1RLLmNtYWtlCisrKyBiL1NvdXJjZS9XZWJDb3JlL1BsYXRmb3JtR1RLLmNtYWtl CkBAIC00ODQsNyArNDg0LDcgQEAgaWYgKEVOQUJMRV9XQVlMQU5EX1RBUkdFVCkKICAgICApCiAK ICAgICBsaXN0KEFQUEVORCBXZWJDb3JlX0lOQ0xVREVfRElSRUNUT1JJRVMKLSAgICAgICAgJHtX QVlMQU5EX0lOQ0xVREVfRElSRUNUT1JJRVN9CisgICAgICAgICR7V0FZTEFORF9JTkNMVURFX0RJ UlN9CiAgICAgKQogICAgIGxpc3QoQVBQRU5EIFdlYkNvcmVfTElCUkFSSUVTCiAgICAgICAgICR7 V0FZTEFORF9MSUJSQVJJRVN9Cg==