From d2a0c4d5183ef8a1c7b155f51361d429ccc94db6 Mon Sep 17 00:00:00 2001 From: mjreno Date: Mon, 18 Sep 2023 17:44:15 -0400 Subject: [PATCH] ci3 --- meson.build | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/meson.build b/meson.build index 15f1196fa2b..3d8d8b028a0 100644 --- a/meson.build +++ b/meson.build @@ -172,17 +172,21 @@ endif if build_machine.system() != 'windows' netcdf = dependency('netcdf', language : 'fortran', required : false) else - nc_dir = meson.project_source_root() / '..' / 'ncf' / 'netcdf-fortran-4.6.0' / 'fortran' + #nc_dir = meson.project_source_root() / '..' / 'ncf' / 'netcdf-fortran-4.6.0' / 'fortran' + nc_dir = / 'c' / 'Users' / 'runneradmin' / 'micromamba' / 'envs' / 'modflow6' / 'Library' / 'bin' + nc_incdir = / 'c' / 'Users' / 'runneradmin' / 'micromamba' / 'envs' / 'modflow6' / 'Library' / 'include' #ncc_incdir = meson.project_source_root() / '..' / '..' / '..' / '_temp' / 'msys64' / 'mingw64' / 'include' ncc_libdir = meson.project_source_root() / '..' / '..' / '..' / '_temp' / 'msys64' / 'mingw64' / 'lib' message('nc_dir:', nc_dir) #message('ncc_incdir:', ncc_incdir) message('ncc_libdir:', ncc_libdir) - netcdf = fc.find_library('netcdff', dirs: [ nc_dir / '.libs' ], required : true, static : false) + #netcdf = fc.find_library('netcdff', dirs: [ nc_dir / '.libs' ], required : true, static : false) + netcdf = fc.find_library('netcdff', dirs: [ nc_dir ], required : true, static : false) # lnetcdf? #ncclib = fc.find_library('netcdf', dirs: [ ncc_libdir ], required : true, static : false) #nc_incdir = include_directories([ nc_dir, ncc_incdir ]) - nc_incdir = include_directories([ nc_dir ]) + #nc_incdir = include_directories([ nc_dir ]) + nc_incdir = include_directories([ nc_incdir ]) #dependencies += [ ncclib ] endif #netcdf = dependency('netcdf', language : 'fortran', required : false)