ci2

mjreno · Sep 14, 2023 · 9d01484 · 9d01484
1 parent 1948401
commit 9d01484
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/.github/workflows/ci2.yml b/.github/workflows/ci2.yml
@@ -113,10 +113,8 @@ jobs:
           #echo "FIXED"
           #cat /D/a/_temp/msys64/mingw64/lib/pkgconfig/netcdf.pc
           #cat /D/a/_temp/msys64/mingw64/lib/pkgconfig/netcdf-fortran.pc
-          #echo "PWD:"
-          #pwd
-          #echo "PWD/..:"
-          #ls -l ..
+          echo "PWD:"
+          pwd
           echo "find libnetcdff:"
           find ../ncf | grep -i libnetcdff
           #echo "ls -l ../netcdf/lib/libnetcdff.a:"

diff --git a/meson.build b/meson.build
@@ -173,8 +173,8 @@ 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' / '.libs'
-  netcdf = fc.find_library('libnetcdff', dirs: [ nc_dir ], required : true, static : true)
   message('nc_dir:', nc_dir)
+  netcdf = fc.find_library('libnetcdff', dirs: [ nc_dir ], required : true, static : true)
 endif
 #netcdf = dependency('netcdf', language : 'fortran', required : false)
 if netcdf.found()