diff options
| author | Kai Pastor <dg0yt@darc.de> | 2021-06-10 00:17:07 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-09 15:17:07 -0700 |
| commit | c867e68ca880feb5fd01f65c39657b64084b2c2a (patch) | |
| tree | ae2d4ce2d04207b883c92bc82a24f8837e9cf308 /ports/hdf5/szip.patch | |
| parent | 58ce192f0fdd6721d89e248713d44fade6d38768 (diff) | |
| download | vcpkg-c867e68ca880feb5fd01f65c39657b64084b2c2a.tar.gz vcpkg-c867e68ca880feb5fd01f65c39657b64084b2c2a.zip | |
[szip, hdf5] Fix mingw import lib names, control linkage (#17941)
* Format manifest, make port version explicit
* Use standard mingw import lib names
* Choose either static or shared binaries
* Insert macro for dynamic linkage
* Add szip pc file
* Quote path expressions
* Port away from deprecated cmake functions
* x-add-version
* Begin of hdf5 changes
* Remove obsolete variables (complements 23eadeae)
* Fix indentation and quoting expressions
* Handle single-linkage szip configuration
* Use mingw import lib names for hdf5
* Move dependencies to Requires in pc file
* Port away from deprecated cmake functions
* x-add-version hdf5
* Apply szip review comments
* Update version
* Improve pkgconfig patch to handle lists
* Update git-tree
Diffstat (limited to 'ports/hdf5/szip.patch')
| -rw-r--r-- | ports/hdf5/szip.patch | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/ports/hdf5/szip.patch b/ports/hdf5/szip.patch index df0618098..9dede4247 100644 --- a/ports/hdf5/szip.patch +++ b/ports/hdf5/szip.patch @@ -1,13 +1,16 @@ -diff --git a/CMakeFilters.cmake b/CMakeFilters.cmake -index 5a8956456..997bb8e81 100644 ---- a/CMakeFilters.cmake -+++ b/CMakeFilters.cmake -@@ -100,7 +100,7 @@ option (HDF5_ENABLE_SZIP_SUPPORT "Use SZip Filter" OFF) - if (HDF5_ENABLE_SZIP_SUPPORT) - option (HDF5_ENABLE_SZIP_ENCODING "Use SZip Encoding" OFF) - if (NOT SZIP_USE_EXTERNAL) -- find_package (SZIP NAMES ${SZIP_PACKAGE_NAME}${HDF_PACKAGE_EXT} COMPONENTS static shared) -+ find_package (SZIP NAMES ${SZIP_PACKAGE_NAME}${HDF_PACKAGE_EXT}) +diff -urN a/CMakeFilters.cmake b/CMakeFilters.cmake +--- a/CMakeFilters.cmake 2021-05-15 19:07:48.160044927 +0200 ++++ b/CMakeFilters.cmake 2021-05-15 19:22:56.993970332 +0200 +@@ -104,7 +104,11 @@ + find_package (SZIP NAMES ${SZIP_PACKAGE_NAME}${HDF_PACKAGE_EXT} COMPONENTS static shared) if (NOT SZIP_FOUND) find_package (SZIP) # Legacy find - if (SZIP_FOUND) +- if (SZIP_FOUND) ++ if (DEFINED SZIP_SHARED_LIBRARY AND NOT DEFINED SZIP_STATIC_LIBRARY) ++ set (SZIP_STATIC_LIBRARY "${SZIP_SHARED_LIBRARY}") ++ elseif (DEFINED SZIP_STATIC_LIBRARY AND NOT DEFINED SZIP_SHARED_LIBRARY) ++ set (SZIP_SHARED_LIBRARY "${SZIP_STATIC_LIBRARY}") ++ elseif (SZIP_FOUND) + set (LINK_COMP_LIBS ${LINK_COMP_LIBS} ${SZIP_LIBRARIES}) + set (LINK_COMP_SHARED_LIBS ${LINK_COMP_SHARED_LIBS} ${SZIP_LIBRARIES}) + endif () |