1From 736f489743b4a761afc928cbac197b28b3209bf1 Mon Sep 17 00:00:00 2001 2From: Khem Raj <raj.khem@gmail.com> 3Date: Sat, 6 Feb 2016 13:12:47 -0800 4Subject: [PATCH 09/21] fix cmake dependency race 5 6Fixes errors like 7 8/a/builder/mnt/build-oe/tmp-glibc/work/raspberrypi2-oe-linux-gnueabi/userland/git-r5/git/interface/vmcs_host/vc_vchi_dispmanx.h:72:66: 9fatal error: interface/vmcs_host/wayland-dispmanx-server-protocol.h: No 10such file or directory 11compilation terminated. 12interface/khronos/CMakeFiles/EGL_static.dir/build.make:773: recipe for 13target 'interface/khronos/CMakeFiles/EGL_static.dir/ext/egl_wayland.c.o' 14failed 15make[2]: *** 16[interface/khronos/CMakeFiles/EGL_static.dir/ext/egl_wayland.c.o] Error 1 17 18Signed-off-by: Khem Raj <raj.khem@gmail.com> 19--- 20 interface/vcos/pthreads/CMakeLists.txt | 8 ++++++++ 21 interface/vmcs_host/CMakeLists.txt | 8 -------- 22 interface/vmcs_host/vc_vchi_dispmanx.h | 2 +- 23 3 files changed, 9 insertions(+), 9 deletions(-) 24 25diff --git a/interface/vcos/pthreads/CMakeLists.txt b/interface/vcos/pthreads/CMakeLists.txt 26index 1d81ca3..d6cd415 100644 27--- a/interface/vcos/pthreads/CMakeLists.txt 28+++ b/interface/vcos/pthreads/CMakeLists.txt 29@@ -33,6 +33,14 @@ set (SOURCES 30 ../generic/vcos_generic_blockpool.c 31 ) 32 33+if (BUILD_WAYLAND) 34+wayland_add_protocol_server( 35+ SOURCES 36+ ../../../interface/wayland/dispmanx.xml 37+ dispmanx 38+) 39+endif () 40+ 41 if (VCOS_PTHREADS_BUILD_SHARED) 42 add_library (vcos SHARED ${SOURCES}) 43 target_link_libraries (vcos pthread dl rt) 44diff --git a/interface/vmcs_host/CMakeLists.txt b/interface/vmcs_host/CMakeLists.txt 45index c202204..16d3184 100755 46--- a/interface/vmcs_host/CMakeLists.txt 47+++ b/interface/vmcs_host/CMakeLists.txt 48@@ -15,14 +15,6 @@ set(VCHOSTIF_SOURCE 49 # ${VMCS_TARGET}/vmcs_main.c 50 # vc_vchi_haud.c 51 52-if (BUILD_WAYLAND) 53-wayland_add_protocol_server( 54- VCHOSTIF_SOURCE 55- ../../interface/wayland/dispmanx.xml 56- dispmanx 57-) 58-endif () 59- 60 add_library(vchostif ${VCHOSTIF_SOURCE}) 61 62 #add_library(bufman vc_vchi_bufman.c ) 63diff --git a/interface/vmcs_host/vc_vchi_dispmanx.h b/interface/vmcs_host/vc_vchi_dispmanx.h 64index f0bae30..8c44c58 100644 65--- a/interface/vmcs_host/vc_vchi_dispmanx.h 66+++ b/interface/vmcs_host/vc_vchi_dispmanx.h 67@@ -69,7 +69,7 @@ typedef struct { 68 #ifdef BUILD_WAYLAND 69 /* XXX: This should be in a private header that can be included from EGL and vc_* */ 70 #include <wayland-server.h> 71-#include "interface/vmcs_host/wayland-dispmanx-server-protocol.h" 72+#include "interface/vcos/pthreads/wayland-dispmanx-server-protocol.h" 73 struct wl_dispmanx_server_buffer { 74 struct wl_resource *resource; 75 struct wl_dispmanx *dispmanx; 76-- 772.27.0 78 79