ci4

mjreno · Sep 19, 2023 · b67210f · b67210f
1 parent 5355709
commit b67210f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 152 deletions.
diff --git a/.github/workflows/ci3.yml b/.github/workflows/ci3.yml
diff --git a/meson.build b/meson.build
@@ -172,11 +172,11 @@ 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'
-  t_dir = meson.project_source_root()
-  message('t_dir:', t_dir)
-  nc_dir = 'C:/Users' / 'runneradmin' / 'micromamba' / 'envs' / 'modflow6' / 'Library' / 'bin'
-  nc_incdir = 'C:/Users' / 'runneradmin' / 'micromamba' / 'envs' / 'modflow6' / 'Library' / 'include'
+  nc_dir = meson.project_source_root() / '..' / 'ncf' / 'netcdf-fortran-4.6.0' / 'fortran'
+  #t_dir = meson.project_source_root()
+  #message('t_dir:', t_dir)
+  #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)
@@ -187,8 +187,8 @@ else
   # 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_incdir ])
+  nc_incdir = include_directories([ nc_dir ])
+  #nc_incdir = include_directories([ nc_incdir ])
   #dependencies += [ ncclib ]
 endif
 #netcdf = dependency('netcdf', language : 'fortran', required : false)