meson: inline `inc_common`

[mesa.git] / src / intel / common / meson.build

diff --git a/src/intel/common/meson.build b/src/intel/common/meson.build
index 540d78f90b5023dec9bcba1c9d3aa420521f672d..9fee325a934f001271ae7a3970bce31d723a6034 100644 (file)
--- a/src/intel/common/meson.build
+++ b/src/intel/common/meson.build
@@ -21,6 +21,9 @@
 # TODO: android?
 
 files_libintel_common = files(
+  'gen_aux_map.c',
+  'gen_aux_map.h',
+  'gen_buffer_alloc.h',
   'gen_clflush.h',
   'gen_batch_decoder.c',
   'gen_decoder.c',
@@ -39,17 +42,27 @@ files_libintel_common = files(
 libintel_common = static_library(
   ['intel_common', genX_xml_h],
   files_libintel_common,
-  include_directories : [inc_common, inc_intel],
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_intel],
   c_args : [c_vis_args, no_override_init_args],
   link_with : [libisl],
   dependencies : [dep_expat, dep_libdrm, dep_thread, idep_genxml],
 )
 
+libintel_extra_dependencies = []
+if with_platform_android
+  libintel_extra_dependencies += dep_android
+endif
+
+idep_libintel_common = declare_dependency(
+  link_with: [libintel_common],
+  dependencies: [libintel_extra_dependencies],
+)
+
 install_intel_gpu_tests = get_option('install-intel-gpu-tests')
 
 if install_intel_gpu_tests
   foreach g : [['70', 'gen7'], ['75', 'hsw'], ['80', 'gen8'],
-               ['90', 'gen9'], ['110', 'gen11']]
+               ['90', 'gen9'], ['110', 'gen11'], ['120', 'gen12']]
     executable(
       'intel_@0@_mi_builder_test'.format(g[1]),
       files('tests/gen_mi_builder_test.cpp'),
@@ -57,10 +70,41 @@ if install_intel_gpu_tests
         cpp_vis_args, cpp_msvc_compat_args,
         '-DGEN_VERSIONx10=@0@'.format(g[0])
       ],
-      include_directories : [inc_common, inc_intel],
-      link_with : [libintel_dev, libmesa_util],
-      dependencies : [dep_libdrm, dep_thread, idep_gtest, idep_genxml],
+      include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_intel],
+      link_with : [libintel_dev],
+      dependencies : [dep_libdrm, idep_gtest, idep_genxml, idep_mesautil],
       install : install_intel_gpu_tests,
     )
   endforeach
 endif
+
+if with_tests
+  gentest_xml = files('tests/gentest.xml')
+  _name = 'gentest_pack.h'
+  gentest_pack = custom_target(
+    _name,
+    input : [gen_pack_header_py, gentest_xml],
+    output : _name,
+    command : [prog_python, '@INPUT@'],
+    capture : true,
+  )
+
+  genxml_path = join_paths(meson.source_root(),
+                           '@0@'.format(gentest_xml[0]))
+
+  test(
+    'genxml_test',
+    executable(
+      'genxml_test',
+      ['tests/genxml_test.c', gentest_pack],
+      include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_intel],
+      dependencies : idep_mesautil,
+      link_with : libintel_common,
+      c_args : [
+        '-DGENXML_PATH="@0@"'.format(genxml_path)
+      ],
+    ),
+    args : ['-quiet'],
+    suite : ['intel'],
+  )
+endif