Skip to content

Commit 3d8f781

Browse files
[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>
1 parent ac6ef2f commit 3d8f781

4 files changed

Lines changed: 16 additions & 6 deletions

File tree

ports/hdf5/portfile.cmake

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -84,12 +84,16 @@ if(VCPKG_TARGET_IS_WINDOWS)
8484
endif()
8585

8686
vcpkg_fixup_pkgconfig()
87-
if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW AND VCPKG_LIBRARY_LINKAGE STREQUAL "static")
88-
file(GLOB pc_files "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/*.pc" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/*.pc")
89-
foreach(file IN LISTS pc_files)
87+
88+
file(GLOB pc_files "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/*.pc" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/*.pc")
89+
foreach(file IN LISTS pc_files)
90+
if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW AND VCPKG_LIBRARY_LINKAGE STREQUAL "static")
9091
vcpkg_replace_string("${file}" " -lhdf5" " -llibhdf5")
91-
endforeach()
92-
endif()
92+
endif()
93+
if(VCPKG_TARGET_IS_WINDOWS)
94+
vcpkg_replace_string("${file}" "/msmpi.lib\"" "/msmpi\"")
95+
endif()
96+
endforeach()
9397

9498
file(READ "${CURRENT_PACKAGES_DIR}/share/hdf5/hdf5-config.cmake" contents)
9599
string(REPLACE [[${HDF5_PACKAGE_NAME}_TOOLS_DIR "${PACKAGE_PREFIX_DIR}/bin"]]

ports/hdf5/vcpkg.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"name": "hdf5",
33
"version": "1.12.2",
4+
"port-version": 1,
45
"description": "HDF5 is a data model, library, and file format for storing and managing data",
56
"homepage": "https://www.hdfgroup.org/downloads/hdf5/",
67
"license": "BSD-3-Clause",

versions/baseline.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2774,7 +2774,7 @@
27742774
},
27752775
"hdf5": {
27762776
"baseline": "1.12.2",
2777-
"port-version": 0
2777+
"port-version": 1
27782778
},
27792779
"healpix": {
27802780
"baseline": "1.12.10",

versions/h-/hdf5.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
{
22
"versions": [
3+
{
4+
"git-tree": "f6647d7591d9b5a588d92e0fb4266d2028132ff9",
5+
"version": "1.12.2",
6+
"port-version": 1
7+
},
38
{
49
"git-tree": "4abe78968a986c1793207ae653eb686926f3c141",
510
"version": "1.12.2",

0 commit comments

Comments
 (0)