mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-28 05:27:51 +08:00
297ff7ba3e
* Consolidate netcdf-c ZLIB patching
* Update to 4.8.1, refresh patches
* Resolve parameter warning
* Decouple netcdf-4 feature from hdf5
* Expose NCZarr features
* Break vcpkg CI cascade
* Fix hdf5 szip support detection for static linkage
* Allow curl, hdf5, libzip with minimal dependencies
* Disable fatal warnings on uwp
* Update versions
* Fix libzip dependency
* Fix and simplify szip config patch
* Revert nczarr-s3 feature for now
* Update versions
* [skip actions] CI
* [skip actions] Debug ci failure
* Revert "[skip actions] Debug ci failure"
This reverts commit 03f3d52623.
22 lines
883 B
Diff
22 lines
883 B
Diff
diff --git a/CMakeFilters.cmake b/CMakeFilters.cmake
|
|
index d5f801e..141ab44 100644
|
|
--- a/CMakeFilters.cmake
|
|
+++ b/CMakeFilters.cmake
|
|
@@ -124,6 +124,16 @@ if (HDF5_ENABLE_SZIP_SUPPORT)
|
|
set (H5_HAVE_LIBSZ 1)
|
|
set (SZIP_INCLUDE_DIR_GEN ${SZIP_INCLUDE_DIR})
|
|
set (SZIP_INCLUDE_DIRS ${SZIP_INCLUDE_DIRS} ${SZIP_INCLUDE_DIR})
|
|
+ elseif(1)
|
|
+ find_package(szip CONFIG REQUIRED)
|
|
+ set(SZIP_INCLUDE_DIRS "")
|
|
+ # SZIP_STATIC_LIBRARY will be used in linking, in cmake and in pkgconfig,
|
|
+ # but the actual linkage doesn't matter.
|
|
+ if (TARGET szip-shared)
|
|
+ set(SZIP_STATIC_LIBRARY szip-shared)
|
|
+ else()
|
|
+ set(SZIP_STATIC_LIBRARY szip-static)
|
|
+ endif()
|
|
else ()
|
|
if (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "GIT" OR HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "TGZ")
|
|
EXTERNAL_SZIP_LIBRARY (${HDF5_ALLOW_EXTERNAL_SUPPORT} ${HDF5_ENABLE_SZIP_ENCODING})
|