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