From 9d01484f885eb6dee222d1b77269096bf246a634 Mon Sep 17 00:00:00 2001 From: mjreno Date: Thu, 14 Sep 2023 12:41:55 -0400 Subject: [PATCH] ci2 --- .github/workflows/ci2.yml | 6 ++---- meson.build | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci2.yml b/.github/workflows/ci2.yml index b5ad1feae56..e20b4656c80 100644 --- 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 index bc6ac1afd89..c98ae22e9ff 100644 --- 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()