meson: update for tkr

Author: scivision

meson.build

@@ -3,6 +3,8 @@ project('nc4fortran', 'fortran',
   version: files('VERSION'),
   default_options : ['default_library=static', 'buildtype=release', 'warning_level=3'])
 
+fs = import('fs')
+
 # --- find netcdf
 fc = meson.get_compiler('fortran')
 os = host_machine.system()
@@ -14,18 +16,10 @@ quiet = fc.get_supported_arguments(['-w', '-Wno-compare-reals', '-Wno-maybe-unin
 
 #== find NetCDF
 
-# when using CMake, need to capitalize module name like in CMake
-netcdf = [dependency('netcdf', language: 'fortran', required : false, disabler: true, cmake_module_path : 'cmake/Modules')]
-if os == 'darwin'  # homebrew has broken PkgConfig for NetCDF, the test below is false OK without this
-  netcdf += fc.find_library('netcdff', dirs: '/usr/local/opt/netcdf/lib', required : false, disabler: true)
-endif
-
-if not fc.links('use netcdf, only : nf90_inq_varid; end', name: 'NetCDF', dependencies : netcdf)
-  netcdf = [disabler()]
-endif
+netcdf = dependency('netcdf', language: 'fortran', required : false, disabler: true, cmake_module_path : 'cmake/Modules')
 
 if not meson.is_subproject()
-  assert(netcdf[0].found(), 'NetCDF Fortran is required')
+  assert(netcdf.found(), 'NetCDF Fortran is required')
 endif
 
 # ---

src/meson.build

@@ -19,14 +19,15 @@ configure_file(
   configuration : reader_template
 )
 
-ret = run_command(python, '-c', 'print(open("' + meson.current_source_dir() / 'writer_template.in.f90' + '").read())')
-writer_template = configuration_data()
-writer_template.set('writer_template', ret.stdout())
 configure_file(
   input : 'writer.in.f90',
   output : 'writer.f90',
-  configuration : writer_template
-)
+  configuration : {
+    'writer_template_r32': fs.read('writer_template_r32.in.f90'),
+    'writer_template_r64': fs.read('writer_template_r64.in.f90'),
+    'writer_template_i32': fs.read('writer_template_i32.in.f90'),
+    'writer_template_i64': fs.read('writer_template_i64.in.f90')
+  })
 
 nc4_src = files('interface.f90', 'attributes.f90',
   'read.f90', meson.current_build_dir() / 'reader.f90',