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/szip/mingw-lib-names.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/szip/mingw-lib-names.patch')
| -rw-r--r-- | ports/szip/mingw-lib-names.patch | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/ports/szip/mingw-lib-names.patch b/ports/szip/mingw-lib-names.patch new file mode 100644 index 000000000..c9d2c249f --- /dev/null +++ b/ports/szip/mingw-lib-names.patch @@ -0,0 +1,30 @@ +diff -urN a/config/cmake/SZIPMacros.cmake b/config/cmake/SZIPMacros.cmake +--- a/config/cmake/SZIPMacros.cmake 2021-05-15 09:06:50.546455249 +0200 ++++ b/config/cmake/SZIPMacros.cmake 2021-05-15 09:01:24.933765423 +0200 +@@ -126,7 +126,7 @@ + macro (SZIP_SET_BASE_OPTIONS libtarget libname libtype) + # message (STATUS "${libname} libtype: ${libtype}") + if (${libtype} MATCHES "SHARED") +- if (WIN32) ++ if (WIN32 AND NOT MINGW) + set (LIB_RELEASE_NAME "${libname}") + set (LIB_DEBUG_NAME "${libname}_D") + else () +@@ -134,7 +134,7 @@ + set (LIB_DEBUG_NAME "${libname}_debug") + endif () + else () +- if (WIN32) ++ if (WIN32 AND NOT MINGW) + set (LIB_RELEASE_NAME "lib${libname}") + set (LIB_DEBUG_NAME "lib${libname}_D") + else () +@@ -164,7 +164,7 @@ + endif () + + #----- Use MSVC Naming conventions for Shared Libraries +- if (MINGW AND ${libtype} MATCHES "SHARED") ++ if (FALSE AND MINGW AND ${libtype} MATCHES "SHARED") + set_target_properties (${libtarget} + PROPERTIES + IMPORT_SUFFIX ".lib" |