diff options
| author | Griffin Downs <35574547+grdowns@users.noreply.github.com> | 2019-07-01 13:14:53 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-01 13:14:53 -0700 |
| commit | 0b9cf040bafa0a8ed064e47459779d72fcf9b9c4 (patch) | |
| tree | 53036c9f0b7f051abe737376f7ddeeeccd9948d0 /ports/hdf5 | |
| parent | 34d19da9ffd0571bf16190ec4a16a04bef265900 (diff) | |
| parent | 77cfd20b83e71a0c513658e7c4d049d4039905af (diff) | |
| download | vcpkg-0b9cf040bafa0a8ed064e47459779d72fcf9b9c4.tar.gz vcpkg-0b9cf040bafa0a8ed064e47459779d72fcf9b9c4.zip | |
Merge branch 'master' into openssl-unix-dynamic
Diffstat (limited to 'ports/hdf5')
| -rw-r--r-- | ports/hdf5/CONTROL | 23 | ||||
| -rw-r--r-- | ports/hdf5/portfile.cmake | 9 |
2 files changed, 15 insertions, 17 deletions
diff --git a/ports/hdf5/CONTROL b/ports/hdf5/CONTROL index 19939c95a..18f03e487 100644 --- a/ports/hdf5/CONTROL +++ b/ports/hdf5/CONTROL @@ -1,11 +1,12 @@ -Source: hdf5
-Version: 1.10.5-6
-Description: HDF5 is a data model, library, and file format for storing and managing data
-Build-Depends: zlib, szip
-
-Feature: parallel
-Description: parallel support for HDF5
-Build-Depends: msmpi
-
-Feature: cpp
-Description: Builds cpp lib
+Source: hdf5 +Version: 1.10.5-7 +Homepage: https://www.hdfgroup.org/downloads/hdf5/ +Description: HDF5 is a data model, library, and file format for storing and managing data +Build-Depends: zlib, szip + +Feature: parallel +Description: parallel support for HDF5 +Build-Depends: msmpi + +Feature: cpp +Description: Builds cpp lib diff --git a/ports/hdf5/portfile.cmake b/ports/hdf5/portfile.cmake index 593b38abf..1a148c2c3 100644 --- a/ports/hdf5/portfile.cmake +++ b/ports/hdf5/portfile.cmake @@ -30,10 +30,8 @@ else() set(ENABLE_CPP OFF) endif() -#Note: HDF5 Builds by default static as well as shared libraries. Set BUILD_SHARED_LIBS to OFF to only get static libraries -string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_SHARED_LIBS) - file(REMOVE ${SOURCE_PATH}/config/cmake_ext_mod/FindSZIP.cmake)#Outdated; does not find debug szip + vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} DISABLE_PARALLEL_CONFIGURE @@ -54,10 +52,9 @@ vcpkg_configure_cmake( vcpkg_install_cmake() vcpkg_copy_pdbs() +vcpkg_fixup_cmake_targets() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/hdf5) - -#Linux build create additional scripts here. I dont know what they are doing so I am deleting them and hope for the best +#Linux build create additional scripts here. I dont know what they are doing so I am deleting them and hope for the best if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) endif() |