[hdf5] Fix linking order in pc file (#18825)

* Fix link order in pc file

* x-add-version
This commit is contained in:
Kai Pastor 2021-07-06 22:34:41 +02:00 committed by GitHub
parent a6cefc0e22
commit 1d39c6f246
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 19 additions and 2 deletions

View File

@ -0,0 +1,11 @@
diff --git a/config/cmake/libhdf5.pc.in b/config/cmake/libhdf5.pc.in
index 4a2ebaa..3cb42d2 100644
--- a/config/cmake/libhdf5.pc.in
+++ b/config/cmake/libhdf5.pc.in
@@ -10,5 +10,5 @@ Version: @_PKG_CONFIG_VERSION@
Cflags: -I${includedir}
Libs: -L${libdir} @_PKG_CONFIG_SH_LIBS@
Requires: @_PKG_CONFIG_REQUIRES@
-Libs.private: @_PKG_CONFIG_LIBS_PRIVATE@ @_PKG_CONFIG_LIBS@
+Libs.private: @_PKG_CONFIG_LIBS@ @_PKG_CONFIG_LIBS_PRIVATE@
Requires.private: @_PKG_CONFIG_REQUIRES_PRIVATE@

View File

@ -13,6 +13,7 @@ vcpkg_from_github(
szip.patch
mingw-import-libs.patch
pkgconfig-requires.patch
pkgconfig-link-order.patch
)
if ("parallel" IN_LIST FEATURES AND "cpp" IN_LIST FEATURES)

View File

@ -1,7 +1,7 @@
{
"name": "hdf5",
"version": "1.12.0",
"port-version": 3,
"port-version": 4,
"description": "HDF5 is a data model, library, and file format for storing and managing data",
"homepage": "https://www.hdfgroup.org/downloads/hdf5/",
"supports": "!uwp",

View File

@ -2478,7 +2478,7 @@
},
"hdf5": {
"baseline": "1.12.0",
"port-version": 3
"port-version": 4
},
"healpix": {
"baseline": "1.12.10",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "77eb81be380363280c67a3b15043696f6cee2001",
"version": "1.12.0",
"port-version": 4
},
{
"git-tree": "0a7e8bbf885fa0b111c3041102cb2c9adb45f5c3",
"version": "1.12.0",