Global
/
vcpkg
mirror of https://github.com/microsoft/vcpkg.git
1
0
Fork 0
Code Activity

[hdf5] Refix msmpi library path in pkgconfig (#25089) 

* [hdf5] Refix msmpi library path in pkgconfig

* version

* version

* Apply suggestion

* version

* [hdf5] Use post-hoc string replacement

* version

Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
This commit is contained in:
Jack·Boos·Yu 2022-06-15 21:09:36 +00:00 committed by GitHub
parent ac6ef2f665
commit 3d8f78171a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ports/hdf5/portfile.cmake
View File

@ -84,12 +84,16 @@ if(VCPKG_TARGET_IS_WINDOWS)
endif()
vcpkg_fixup_pkgconfig()
if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW AND VCPKG_LIBRARY_LINKAGE STREQUAL "static")
file(GLOB pc_files "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/*.pc" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/*.pc")
foreach(file IN LISTS pc_files)
file(GLOB pc_files "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/*.pc" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/*.pc")
foreach(file IN LISTS pc_files)
if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW AND VCPKG_LIBRARY_LINKAGE STREQUAL "static")
vcpkg_replace_string("${file}" " -lhdf5" " -llibhdf5")
endforeach()
endif()
endif()
if(VCPKG_TARGET_IS_WINDOWS)
vcpkg_replace_string("${file}" "/msmpi.lib\"" "/msmpi\"")
endif()
endforeach()
file(READ "${CURRENT_PACKAGES_DIR}/share/hdf5/hdf5-config.cmake" contents)
string(REPLACE [[${HDF5_PACKAGE_NAME}_TOOLS_DIR "${PACKAGE_PREFIX_DIR}/bin"]]

1
ports/hdf5/vcpkg.json
View File

@ -1,6 +1,7 @@
{
"name": "hdf5",
"version": "1.12.2",
"port-version": 1,
"description": "HDF5 is a data model, library, and file format for storing and managing data",
"homepage": "https://www.hdfgroup.org/downloads/hdf5/",
"license": "BSD-3-Clause",

2
versions/baseline.json
View File

@ -2774,7 +2774,7 @@
},
"hdf5": {
"baseline": "1.12.2",
"port-version": 0
"port-version": 1
},
"healpix": {
"baseline": "1.12.10",

5
versions/h-/hdf5.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "f6647d7591d9b5a588d92e0fb4266d2028132ff9",
"version": "1.12.2",
"port-version": 1
},
{
"git-tree": "4abe78968a986c1793207ae653eb686926f3c141",
"version": "1.12.2",