Merge pull request #16 from hiddenSymmetries/lib64_fix

Account for lib64 in NETCDF library path
hiddenSymmetries · Apr 30, 2024 · 97f1d6b · 97f1d6b
2 parents 8819070 + 69d0301
commit 97f1d6b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -10,7 +10,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [3.7, 3.8, 3.9]
+        python-version: [3.8, 3.9, "3.10"]
         os: [ubuntu-latest, macos-latest]
 
     runs-on: ${{ matrix.os }}

diff --git a/.github/workflows/pypi.yml b/.github/workflows/pypi.yml
@@ -18,10 +18,10 @@ jobs:
     steps:
     - uses: actions/checkout@master
 
-    - name: Set up Python 3.7
+    - name: Set up Python 3.8
       uses: actions/setup-python@v4
       with:
-        python-version: 3.7
+        python-version: 3.8
 
     # At some point we may want to distribute wheels, but for now just distribute the source and build separately on each machine.
     #- name: Install wheel

diff --git a/cmake/FindNetCDF.cmake b/cmake/FindNetCDF.cmake
@@ -42,7 +42,7 @@ find_path (NETCDF_INCLUDES netcdf.h
 
 #find_library (NETCDF_LIBRARIES_C       NAMES netcdf)
 find_library (NETCDF_LIBRARIES_C       NAMES netcdf
-              HINTS NETCDF_DIR ENV NETCDF_DIR ENV NETCDF_HOME ENV NETCDFDIR PATH_SUFFIXES lib)
+              HINTS NETCDF_DIR ENV NETCDF_DIR ENV NETCDF_HOME ENV NETCDFDIR PATH_SUFFIXES lib lib64)
 mark_as_advanced(NETCDF_LIBRARIES_C)
 
 set (NetCDF_has_interfaces "YES") # will be set to NO if we're missing any interfaces