diff options
Diffstat (limited to 'meta-oe/recipes-graphics/vk-gl-cts/files/0001-cmake-Define-WAYLAND_SCANNER-and-WAYLAND_PROTOCOLS_D.patch')
-rw-r--r-- | meta-oe/recipes-graphics/vk-gl-cts/files/0001-cmake-Define-WAYLAND_SCANNER-and-WAYLAND_PROTOCOLS_D.patch | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/meta-oe/recipes-graphics/vk-gl-cts/files/0001-cmake-Define-WAYLAND_SCANNER-and-WAYLAND_PROTOCOLS_D.patch b/meta-oe/recipes-graphics/vk-gl-cts/files/0001-cmake-Define-WAYLAND_SCANNER-and-WAYLAND_PROTOCOLS_D.patch index f659e36066..9eef9a702e 100644 --- a/meta-oe/recipes-graphics/vk-gl-cts/files/0001-cmake-Define-WAYLAND_SCANNER-and-WAYLAND_PROTOCOLS_D.patch +++ b/meta-oe/recipes-graphics/vk-gl-cts/files/0001-cmake-Define-WAYLAND_SCANNER-and-WAYLAND_PROTOCOLS_D.patch | |||
@@ -15,15 +15,15 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
15 | 15 | ||
16 | --- a/framework/platform/CMakeLists.txt | 16 | --- a/framework/platform/CMakeLists.txt |
17 | +++ b/framework/platform/CMakeLists.txt | 17 | +++ b/framework/platform/CMakeLists.txt |
18 | @@ -73,8 +73,9 @@ if (NOT DEFINED TCUTIL_PLATFORM_SRCS) | 18 | @@ -83,8 +83,9 @@ if (NOT DEFINED TCUTIL_PLATFORM_SRCS) |
19 | add_definitions(-DDEQP_SUPPORT_WAYLAND=1) | 19 | configure_file(${WAYLAND_XDG_SHELL_SRC_DIR}/xdg-shell.c ${DEQP_XDG_SHELL_GEN_OUTPUTS_DIR}/xdg-shell.c COPYONLY) |
20 | include_directories(lnx/wayland) | 20 | configure_file(${WAYLAND_XDG_SHELL_SRC_DIR}/xdg-shell.h ${DEQP_XDG_SHELL_GEN_OUTPUTS_DIR}/xdg-shell.h COPYONLY) |
21 | 21 | else () | |
22 | - pkg_get_variable(WAYLAND_PROTOCOLS_DIR wayland-protocols pkgdatadir) | 22 | - pkg_get_variable(WAYLAND_PROTOCOLS_DIR wayland-protocols pkgdatadir) |
23 | - | 23 | - |
24 | + if (NOT WAYLAND_PROTOCOLS_DIR) | 24 | + if (NOT WAYLAND_PROTOCOL_DIR) |
25 | + pkg_get_variable(WAYLAND_PROTOCOLS_DIR wayland-protocols pkgdatadir) | 25 | + pkg_get_variable(WAYLAND_PROTOCOLS_DIR wayland-protocols pkgdatadir) |
26 | + endif() | 26 | + endif() |
27 | if (NOT WAYLAND_SCANNER) | 27 | if (NOT WAYLAND_SCANNER) |
28 | pkg_get_variable(WAYLAND_SCANNER wayland-scanner wayland_scanner) | 28 | pkg_get_variable(WAYLAND_SCANNER wayland-scanner wayland_scanner) |
29 | endif() | 29 | endif() |