meson.build

@@ -1,11 +1,15 @@
-project('evk', ['c','cpp'],
+project(
+  'evk',
+  ['c', 'cpp'],
   version: '0.1',
-  default_options : [
+  default_options: {
-    'c_std=c23',
+    'c_std': 'c23',
-    'default_library=static',
+    'default_library': 'static',
-    'c_args=-fcolor-diagnostics -fansi-escape-codes',
+    'c_args': '-fcolor-diagnostics -fansi-escape-codes',
-    'cpp_args=-fcolor-diagnostics -fansi-escape-codes',
+    'cpp_args': '-fcolor-diagnostics -fansi-escape-codes',
-  ])
+  },
+  meson_version: '>=1.2',
+)
 
 build_config = configuration_data()
 
@@ -26,7 +30,7 @@ disabled_warnings = {
   ],
 }
 
-subproject('evol-headers')
+subproject('evol-headers', default_options: {'build_tests': false})
 subproject('volk')
 
 evk_c_args = []
@@ -43,9 +47,11 @@ foreach w : disabled_warnings[cc.get_id()]
   evk_c_args += '-Wno-' + w
 endforeach
 
-evk_incdir = include_directories([
+evk_incdir = include_directories(
+  [
     '.',
-])
+  ],
+)
 
 evk_src = [
   'evk/evkInstance.c',
@@ -71,11 +77,8 @@ evk_lib = library(
   include_directories: evk_incdir,
   dependencies: [
     dependency('evol-headers'),
-
     dependency('vma'),
-
     dependency('volk'),
-
     dependency('shaderc'),
     dependency('spvref'),
   ],
@@ -89,9 +92,10 @@ evk_dep = declare_dependency(
     dependency('volk').partial_dependency(includes: true, compile_args: true),
     dependency('vma').partial_dependency(includes: true),
     dependency('evol-headers').partial_dependency(includes: true),
-  ])
+  ],
+)
 meson.override_dependency('evk', evk_dep)
 
-# if build_samples
+if get_option('build_samples')
   subdir('samples')
-# endif
+endif

meson.options

@@ -1 +1 @@
-option('build_evh_tests', type: 'boolean', value: false, description: 'Build the evol-headers tests')
+option('build_samples', type: 'boolean', value: true, description: 'Build the evk samples')