1From 8b0ae49c8bea78df73c3ecae0059d54a95c561fa Mon Sep 17 00:00:00 2001 2From: Romain Naour <romain.naour@gmail.com> 3Date: Sun, 24 Dec 2017 00:11:45 +0100 4Subject: [PATCH] cmake: forward cflags from *.pc files to waffle cflags 5 6When building mesa egl without x11 and gles2 the headers need a 7EGL_NO_X11 define to avoid including X11 headers. 8 9This define EGL_NO_X11 is lost while building waffle 10since CFLAGS defined by pc files are not used. 11 12EGL_NO_X11 is defined in CFLAGS from egl.pc. 13 14Signed-off-by: Romain Naour <romain.naour@gmail.com> 15--- 16 src/waffle/CMakeLists.txt | 8 ++++++++ 17 1 file changed, 8 insertions(+) 18 19diff --git a/src/waffle/CMakeLists.txt b/src/waffle/CMakeLists.txt 20index d76e029..2ff72c8 100644 21--- a/src/waffle/CMakeLists.txt 22+++ b/src/waffle/CMakeLists.txt 23@@ -5,6 +5,14 @@ 24 add_definitions( 25 -DWAFFLE_API_VERSION=${waffle_api_version} 26 -DWAFFLE_API_EXPERIMENTAL 27+ ${egl_CFLAGS} 28+ ${gbm_CFLAGS} 29+ ${gl_CFLAGS} 30+ ${GLEXT_CFLAGS} 31+ ${libudev_CFLAGS} 32+ ${wayland-client_CFLAGS} 33+ ${wayland-egl_CFLAGS} 34+ ${x11-xcb_CFLAGS} 35 ) 36 37 include_directories( 38-- 392.14.3 40 41