summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDylan Baker <[email protected]>2018-10-05 09:33:59 -0700
committerDylan Baker <[email protected]>2018-10-09 08:55:48 -0700
commit0fa6a8271a3e63e1f37a95ca598172f7ef1e2340 (patch)
treec78d25dba8342fb7135d96ccf1db1601c968ad3b /src
parent92f56fbd8969801fc88de606e1051dc397331e7d (diff)
meson: only build clapi tests when OpenGL is being built
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. Reviewed-by: Eric Engestrom <[email protected]>
Diffstat (limited to 'src')
-rw-r--r--src/mapi/glapi/meson.build2
-rw-r--r--src/mapi/shared-glapi/meson.build2
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(