Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 1 | From 3bf1beee1ddd19bc536ff2856e04ac269d43daa2 Mon Sep 17 00:00:00 2001 |
| 2 | From: Pascal Bach <pascal.bach@siemens.com> |
| 3 | Date: Thu, 4 Oct 2018 14:43:17 +0200 |
| 4 | Subject: [PATCH] cmake: use proper WAYLAND_INCLUDE_DIRS variable |
| 5 | |
| 6 | WAYLAND_wayland-client_INCLUDEDIR is an internal variable and is not correctly |
| 7 | set when cross compiling. WAYLAND_INCLUDE_DIRS includes the correct path even |
| 8 | when cross compiling. |
| 9 | |
| 10 | Signed-off-by: Pascal Bach <pascal.bach@siemens.com> |
| 11 | |
| 12 | Upstream-Status: Submitted [piglit@lists.freedesktop.org] |
| 13 | --- |
| 14 | tests/util/CMakeLists.txt | 2 +- |
| 15 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| 16 | |
| 17 | diff --git a/tests/util/CMakeLists.txt b/tests/util/CMakeLists.txt |
| 18 | index a5f080156..a303a9f58 100644 |
| 19 | --- a/tests/util/CMakeLists.txt |
| 20 | +++ b/tests/util/CMakeLists.txt |
| 21 | @@ -97,7 +97,7 @@ if(PIGLIT_USE_WAFFLE) |
| 22 | piglit-framework-gl/piglit_wl_framework.c |
| 23 | ) |
| 24 | list(APPEND UTIL_GL_INCLUDES |
| 25 | - ${WAYLAND_wayland-client_INCLUDEDIR} |
| 26 | + ${WAYLAND_INCLUDE_DIRS} |
| 27 | ) |
| 28 | endif() |
| 29 | if(PIGLIT_HAS_X11) |
| 30 | -- |
| 31 | 2.11.0 |
| 32 | |