Use system nf-config instead of conda env

angehung5 · Jun 6, 2024 · ae49ac1 · ae49ac1
1 parent be0b404
commit ae49ac1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -59,6 +59,7 @@ jobs:
         env:
           DEBUG: 1
           FC: ${{ matrix.compiler }}
+          NF_CONFIG: /usr/bin/nf-config
 
       - name: Run Python module as script
         run: |
@@ -82,6 +83,7 @@ jobs:
         env:
           DEBUG: 0
           FC: ${{ matrix.compiler }}
+          NF_CONFIG: /usr/bin/nf-config
 
       - name: Non-NetCDF compile and run
         run: |

diff --git a/src/Makefile b/src/Makefile
@@ -16,6 +16,9 @@ DEBUG ?= 0
 # Default to NetCDF build
 NC ?= 1
 
+# Default to first `nf-config` on PATH
+NF_CONFIG ?= nf-config
+
 # Compile flags
 $(info DEBUG setting: '$(DEBUG)')
 ifeq ($(DEBUG), 0)
@@ -47,9 +50,10 @@ $(info FCFLAGS: '$(FCFLAGS)')
 LIBS :=
 INC :=
 $(info NC setting: '$(NC)')
+$(info NF_CONFIG setting: '$(NF_CONFIG)')
 ifeq ($(NC), 1)
-  NETCDF_FLIBS := $(shell nf-config --flibs)
-  NETCDF_INC := -I$(shell nf-config --includedir)
+  NETCDF_FLIBS := $(shell $(NF_CONFIG) --flibs)
+  NETCDF_INC := -I$(shell $(NF_CONFIG) --includedir)
   #
   LIBS += $(NETCDF_FLIBS)
   INC += $(NETCDF_INC)