ci test 12

mjreno · Nov 13, 2023 · 9f68fb1 · 9f68fb1
1 parent f23caae
commit 9f68fb1
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 6 deletions.
diff --git a/.github/workflows/ci-nc.yml b/.github/workflows/ci-nc.yml
@@ -98,8 +98,8 @@ jobs:
           #cat /home/runner/micromamba/envs/modflow6/lib/pkgconfig/netcdf-fortran.pc
           sed -i "s|libdir=/home/runner/micromamba/envs/modflow6//home/runner/micromamba/envs/modflow6/lib|libdir=/home/runner/micromamba/envs/modflow6/lib|g" /home/runner/micromamba/envs/modflow6/lib/pkgconfig/netcdf-fortran.pc
           #cat /home/runner/micromamba/envs/modflow6/lib/pkgconfig/netcdf-fortran.pc
-          pkg-config --cflags netcdf-fortran
-          pkg-config --libs netcdf-fortran
+          /home/runner/micromamba/envs/modflow6/bin/pkg-config --cflags netcdf-fortran
+          /home/runner/micromamba/envs/modflow6/bin/pkg-config --libs netcdf-fortran
 
       - name: Edit netcdf-fortran.pc
         if: runner.os == 'macOS'
@@ -111,16 +111,16 @@ jobs:
           #cat /home/runner/micromamba/envs/modflow6/lib/pkgconfig/netcdf-fortran.pc
           sed -i '' -e "s|libdir=/Users/runner/micromamba/envs/modflow6//Users/runner/micromamba/envs/modflow6/lib|libdir=/Users/runner/micromamba/envs/modflow6/lib|g" /Users/runner/micromamba/envs/modflow6/lib/pkgconfig/netcdf-fortran.pc
           #cat /home/runner/micromamba/envs/modflow6/lib/pkgconfig/netcdf-fortran.pc
-          pkg-config --cflags netcdf-fortran
-          pkg-config --libs netcdf-fortran
+          /home/runner/micromamba/envs/modflow6/bin/pkg-config --cflags netcdf-fortran
+          /home/runner/micromamba/envs/modflow6/bin/pkg-config --libs netcdf-fortran
 
       - name: Build modflow6
         working-directory: modflow6
         run: |
           nc-config --all
           nf-config
-          pkg-config --cflags netcdf-fortran
-          pkg-config --libs netcdf-fortran
+          /home/runner/micromamba/envs/modflow6/bin/pkg-config --cflags netcdf-fortran
+          /home/runner/micromamba/envs/modflow6/bin/pkg-config --libs netcdf-fortran
           meson setup builddir -Ddebug=false --prefix=$(pwd) --libdir=bin
           meson install -C builddir
 

diff --git a/meson.build b/meson.build
@@ -196,6 +196,16 @@ if netcdf.found()
   extra_cmp_args += [ '-D__WITH_NETCDF__' ]
   dependencies += [ netcdf ]
   #add_project_dependencies(netcdf, language: 'fortran')
+  code = '''
+  program meson_netcdf_link_test
+    use netcdf
+    print *, trim(nf90_inq_libvers())
+  end program meson_netcdf_link_test
+  '''
+  result = fc.links(code, dependencies : netcdf, name : 'NetCDF link check')
+  if result == false
+    message('Linking against NetCDF failed!')
+  endif
 else
   with_netcdf = false
 endif