Update NetCDF license and build shared libs

conda-forge · May 12, 2024 · 4a88fdc · 4a88fdc
1 parent 7c757ac
commit 4a88fdc
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/recipes/squadgen/CMakeLists.txt b/recipes/squadgen/CMakeLists.txt
@@ -39,6 +39,6 @@ include_directories(${netcdf_c_incdir})
 
 include_directories(${SRC})
 add_executable(SQuadGen ${SQUADGEN_SRC})
-target_link_libraries(SQuadGen ${netcdf_c_libs} ${PNG_LIBRARIES})
+target_link_libraries(SQuadGen PUBLIC ${netcdf_c_libs} ${PNG_LIBRARIES})
 
 install(TARGETS SQuadGen DESTINATION bin)
diff --git a/recipes/squadgen/build.sh b/recipes/squadgen/build.sh
@@ -12,6 +12,7 @@ cmake \
   -D CMAKE_INSTALL_PREFIX="${PREFIX}" \
   -D NETCDF_PATH="${PREFIX}" \
   -D CMAKE_BUILD_TYPE=Release \
+  -D BUILD_SHARED_LIBS=ON \
   ..
 cmake --build .
 cmake --install .
diff --git a/recipes/squadgen/meta.yaml b/recipes/squadgen/meta.yaml
@@ -13,9 +13,7 @@ build:
   skip: true  # [not linux]
   number: 0
   ignore_run_exports:
-    # I don't really understand why these dynamic libraries aren't being linked in...
     - libpng
-    - zlib
 
 requirements:
   build:
@@ -28,7 +26,6 @@ requirements:
     - libnetcdf
     - libnetcdf * nompi_*
     - libpng
-    - zlib
 
 test:
   files:
@@ -42,7 +39,7 @@ test:
 
 about:
   home: https://github.com/ClimateGlobalChange/squadgen
-  license: GPL-2.0-or-later and CUSTOM
+  license: GPL-2.0-or-later and NetCDF
   license_family: GPL
   license_file:
     - LICENSE.md