fix link error

microsoft · Oct 17, 2024 · cb4e0a8 · cb4e0a8
1 parent 1c7fb02
commit cb4e0a8
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 16 deletions.
diff --git a/ports/netcdf-c/fix-dependency-libmath.patch b/ports/netcdf-c/fix-dependency-libmath.patch
@@ -16,5 +16,5 @@ index 701ecc3..ffe15a9 100644
 +    endif()
 +  endblock()
    FIND_LIBRARY(HAVE_LIBM NAMES math m libm)
-   MESSAGE(STATUS "Found Math library: ${HAVE_LIBM}")
-   IF(NOT HAVE_LIBM)
+   IF(NOT HAVE_LIBM)
+     CHECK_FUNCTION_EXISTS(exp HAVE_LIBM_FUNC)
diff --git a/ports/netcdf-c/fix-dependency-szip.patch b/ports/netcdf-c/fix-dependency-szip.patch
@@ -0,0 +1,15 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 039f907..00dbf5d 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1146,7 +1146,9 @@ ENDIF()
+ endmacro(set_std_filter)
+
+ # Locate some compressors
+-FIND_PACKAGE(Szip)
++FIND_PACKAGE(Szip NAMES szip CONFIG)
++set(Szip_INCLUDE_DIRS ${SZIP_PACKAGE_NAME}_INCLUDE_DIR)
++set(Szip_LIBRARIES ${${SZIP_PACKAGE_NAME}_EXPORT_LIBRARIES})
+ FIND_PACKAGE(Bz2)
+ FIND_PACKAGE(Blosc)
+ FIND_PACKAGE(Zstd)
diff --git a/ports/netcdf-c/fix-dependency-zlib.patch b/ports/netcdf-c/fix-dependency-zlib.patch
diff --git a/ports/netcdf-c/portfile.cmake b/ports/netcdf-c/portfile.cmake
@@ -6,14 +6,14 @@ vcpkg_from_github(
     HEAD_REF master
     PATCHES
         no-install-deps.patch
-        fix-dependency-zlib.patch
         use_targets.patch
         fix-dependency-libmath.patch
         fix-linkage-error.patch
         fix-manpage-msys.patch
         fix-dependency-libzip.patch
         fix-dependency-mpi.patch
         fix-pkgconfig.patch
+        fix-dependency-szip.patch
 )
 
 #Remove outdated find modules