meson: Don't build intel shared components by default

It's a neat idea, and still useful in some cases, but the intel common
code is used by i965 and anvil only, this is a little clearer.

Signed-off-by: Dylan Baker <dylanx.c.baker@intel.com>
Reviewed-by: Eric Anholt <eric@anholt.net>

diff --git a/src/intel/blorp/meson.build b/src/intel/blorp/meson.build
index 9241535fd201e4d81d53b23aa0d6e94c855318a7..febdea97f3c7485e687d98413e25141ef52596c6 100644 (file)
--- a/src/intel/blorp/meson.build
+++ b/src/intel/blorp/meson.build
@@ -33,5 +33,4 @@ libblorp = static_library(
   [files_libblorp, nir_opcodes_h],
   include_directories : [inc_common, inc_intel],
   c_args : [c_vis_args, no_override_init_args],
-  build_by_default : false,
 )

diff --git a/src/intel/common/meson.build b/src/intel/common/meson.build
index db7d74a26d29a6ad7243566a2b6f8be3cc5ef454..cbcf6647531193142cd598a83780dbd269ad0869 100644 (file)
--- a/src/intel/common/meson.build
+++ b/src/intel/common/meson.build
@@ -41,5 +41,4 @@ libintel_common = static_library(
   include_directories : [inc_common, inc_intel],
   c_args : [c_vis_args, no_override_init_args],
   dependencies : [dep_expat, dep_libdrm],
-  build_by_default : false,
 )

diff --git a/src/intel/isl/meson.build b/src/intel/isl/meson.build
index 54024b4d11b45dbdd58cc4d6f5cbd8b77b043350..47fd8d97c32e9ae5d5cecebff743f7e485e3ca9f 100644 (file)
--- a/src/intel/isl/meson.build
+++ b/src/intel/isl/meson.build
@@ -60,7 +60,6 @@ foreach g : [['40', isl_gen4_files], ['50', []], ['60', isl_gen6_files],
     include_directories : [inc_common, inc_intel],
     c_args : [c_vis_args, no_override_init_args,
               '-DGEN_VERSIONx10=@0@'.format(_gen)],
-    build_by_default : false,
   )
   isl_gen_libs += _lib
 endforeach
@@ -88,7 +87,6 @@ libisl = static_library(
   include_directories : [inc_common, inc_intel, inc_drm_uapi],
   link_with : isl_gen_libs,
   c_args : [c_vis_args, no_override_init_args],
-  build_by_default : false,
 )
 
 if with_tests
@@ -98,7 +96,6 @@ if with_tests
     dependencies : dep_m,
     include_directories : [inc_common, inc_intel],
     link_with : [libisl, libintel_common],
-    build_by_default : false,
   )
 
   test('isl_surf_get_image_offset', isl_surf_get_image_offset_test)

diff --git a/src/meson.build b/src/meson.build
index 53c8269a99edb975b1c6428116553ead3ad402c1..c3b1ff00d001ac081bad1a18def830e1873d66a3 100644 (file)
--- a/src/meson.build
+++ b/src/meson.build
@@ -55,7 +55,9 @@ subdir('amd')
 if with_gallium_vc4
   subdir('broadcom')
 endif
-subdir('intel')
+if with_dri_i965 or with_intel_vk
+  subdir('intel')
+endif
 subdir('mesa')
 subdir('loader')
 subdir('glx')