[Mesa-dev] [PATCH 1/3] meson: only build clapi tests when OpenGL is being built

[Dylan Baker]

Otherwise building just vulkan (among other things) will build these
tests, pull in a bunch of stuff they shouldn't, and potentially fail to
compile.
---
 src/mapi/glapi/meson.build        | 2 +-
 src/mapi/shared-glapi/meson.build | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/mapi/glapi/meson.build b/src/mapi/glapi/meson.build
index 2509e19eaa3..048bee8a1ad 100644
--- a/src/mapi/glapi/meson.build
+++ b/src/mapi/glapi/meson.build
@@ -78,7 +78,7 @@ libglapi_static = static_library(
   build_by_default : false,
 )
 
-if not with_shared_glapi and with_tests
+if with_any_opengl and not with_shared_glapi and with_tests
   test(
     'glapi_static_check_table',
     executable(
diff --git a/src/mapi/shared-glapi/meson.build b/src/mapi/shared-glapi/meson.build
index 44e86f845f6..dcc6079af3d 100644
--- a/src/mapi/shared-glapi/meson.build
+++ b/src/mapi/shared-glapi/meson.build
@@ -50,7 +50,7 @@ libglapi = shared_library(
   install : true,
 )
 
-if with_tests
+if with_any_opengl and with_tests
   test(
     'shared-glapi-test',
     executable(
-- 
2.19.0