Mesa (master): meson: ensure xmlpool/options.h is generated for libgallium

Jon TURNEY jturney at kemper.freedesktop.org
Tue Feb 6 16:18:47 UTC 2018


Module: Mesa
Branch: master
Commit: 9440599c8e030bddd7e04620bed22df5a8a097fd
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=9440599c8e030bddd7e04620bed22df5a8a097fd

Author: Jon Turney <jon.turney at dronecode.org.uk>
Date:   Mon Feb  5 21:11:12 2018 +0000

meson: ensure xmlpool/options.h is generated for libgallium

In file included from ../src/gallium/targets/dri/target.c:1:
In file included from ../src/gallium/auxiliary/target-helpers/drm_helper.h:8:
../src/util/xmlpool.h:103:10: fatal error: 'xmlpool/options.h' file not found

See also 26bde1e3.

Signed-off-by: Jon Turney <jon.turney at dronecode.org.uk>
Reviewed-by: Eric Engestrom <eric.engestrom at imgtec.com>

---

 src/gallium/targets/dri/meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gallium/targets/dri/meson.build b/src/gallium/targets/dri/meson.build
index 30368c2152..75ce94ab2c 100644
--- a/src/gallium/targets/dri/meson.build
+++ b/src/gallium/targets/dri/meson.build
@@ -51,7 +51,7 @@ endif
 
 libgallium_dri = shared_library(
   'gallium_dri',
-  files('target.c'),
+  [files('target.c'), xmlpool_options_h],
   include_directories : [
     inc_common, inc_util, inc_dri_common, inc_gallium_drivers,
     inc_gallium_winsys, include_directories('../../state_trackers/dri'),




More information about the mesa-commit mailing list