diff options
| author | Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> | 2020-12-28 21:21:03 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-28 21:21:03 -0800 |
| commit | 8f8f7168ee0a524d4f71e632fd5cf2936d96469c (patch) | |
| tree | ca4d2085410b0ef47fcab501d070aec45b07d318 /ports/minc | |
| parent | 580da706ed3502f1b1fcd9ab70212cda548d3520 (diff) | |
| download | vcpkg-8f8f7168ee0a524d4f71e632fd5cf2936d96469c.tar.gz vcpkg-8f8f7168ee0a524d4f71e632fd5cf2936d96469c.zip | |
[cmake] update to 3.19.2 (#14716)
* [cmake] update to 3.19.0
* update vmss
* [cmake] update to 3.19.1
* [solid3] Fix configure error, fix static definition
* [flann] Add feature hdf5 and fix it
* [highfive] Fix dependency hdf5
* [simage] Fix configure error
* [aws-c-common] Fix configure error
* [cmake] Update to 3.19.2
* Revert changes about cmake bug
* [VMSS] Update cmake path on Windows
* [cmake] Update cmake hash
* [minc] Fix dependency hdf5
* [cmake] Update cmake package name and path on MacOS
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
Diffstat (limited to 'ports/minc')
| -rw-r--r-- | ports/minc/CONTROL | 1 | ||||
| -rw-r--r-- | ports/minc/fix-dependency-hdf5.patch | 31 | ||||
| -rw-r--r-- | ports/minc/portfile.cmake | 6 |
3 files changed, 36 insertions, 2 deletions
diff --git a/ports/minc/CONTROL b/ports/minc/CONTROL index 6cd1d5499..c31621bcd 100644 --- a/ports/minc/CONTROL +++ b/ports/minc/CONTROL @@ -1,5 +1,6 @@ Source: minc Version: 2.4.03 +Port-Version: 1 Description: MINC - Medical Image NetCDF or MINC isn't netCDF Homepage: https://github.com/BIC-MNI/libminc Build-Depends: nifticlib, hdf5[core], zlib diff --git a/ports/minc/fix-dependency-hdf5.patch b/ports/minc/fix-dependency-hdf5.patch new file mode 100644 index 000000000..40943411c --- /dev/null +++ b/ports/minc/fix-dependency-hdf5.patch @@ -0,0 +1,31 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a6830b4..da3d635 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -65,7 +65,12 @@ IF(NOT LIBMINC_EXTERNALLY_CONFIGURED) + # external packages + FIND_PACKAGE(ZLIB REQUIRED) + SET(HDF5_NO_FIND_PACKAGE_CONFIG_FILE ON) +- FIND_PACKAGE(HDF5 REQUIRED COMPONENTS C ) ++ FIND_PACKAGE(hdf5 CONFIG REQUIRED) ++ if (TARGET hdf5::hdf5-shared) ++ SET(HDF5_LIBRARIES hdf5::hdf5-shared) ++ elseif (TARGET hdf5::hdf5-static) ++ SET(HDF5_LIBRARIES hdf5::hdf5-static) ++ endif() + + IF (LIBMINC_USE_SYSTEM_NIFTI) + FIND_PACKAGE(NIFTI) +@@ -515,12 +520,8 @@ IF(SUPERBUILD_STAGING_PREFIX) + STRING(REPLACE "${SUPERBUILD_STAGING_PREFIX}/" "" LIBMINC_LIBRARIES_CONFIG "${LIBMINC_LIBRARIES_CONFIG}") + STRING(REPLACE "${SUPERBUILD_STAGING_PREFIX}/" "" EZMINC_LIBRARIES "${EZMINC_LIBRARIES}") + STRING(REPLACE "${SUPERBUILD_STAGING_PREFIX}/" "" NETCDF_INCLUDE_DIR "${NETCDF_INCLUDE_DIR}") +- STRING(REPLACE "${SUPERBUILD_STAGING_PREFIX}/" "" HDF5_INCLUDE_DIR "${HDF5_INCLUDE_DIR}") +- STRING(REPLACE "${SUPERBUILD_STAGING_PREFIX}/" "" HDF5_INCLUDE_DIRS "${HDF5_INCLUDE_DIRS}") + STRING(REPLACE "${SUPERBUILD_STAGING_PREFIX}/" "" NIFTI_INCLUDE_DIR "${NIFTI_INCLUDE_DIR}") + STRING(REPLACE "${SUPERBUILD_STAGING_PREFIX}/" "" NETCDF_LIBRARY "${NETCDF_LIBRARY}") +- STRING(REPLACE "${SUPERBUILD_STAGING_PREFIX}/" "" HDF5_LIBRARY "${HDF5_LIBRARY}") +- STRING(REPLACE "${SUPERBUILD_STAGING_PREFIX}/" "" HDF5_LIBRARIES "${HDF5_LIBRARIES}") + STRING(REPLACE "${SUPERBUILD_STAGING_PREFIX}/" "" NIFTI_LIBRARY "${NIFTI_LIBRARY}") + STRING(REPLACE "${SUPERBUILD_STAGING_PREFIX}/" "" ZNZ_LIBRARY "${ZNZ_LIBRARY}") + STRING(REPLACE "${SUPERBUILD_STAGING_PREFIX}/" "" ZLIB_LIBRARY "${ZLIB_LIBRARY}") diff --git a/ports/minc/portfile.cmake b/ports/minc/portfile.cmake index 4b9ff63b1..6fbec9627 100644 --- a/ports/minc/portfile.cmake +++ b/ports/minc/portfile.cmake @@ -4,8 +4,10 @@ vcpkg_from_github( REF e75a936c12a305b596d743c26a5437196ebce2a4 SHA512 744f879ac8f0594c310d1c1b7fe67543c5feeb3e5a0979035918dbb2bf1d0973fbd389e5357a75631e618cc614b648c21179f7467576bd68e3522e63f21451b0 HEAD_REF master - PATCHES build.patch - config.patch + PATCHES + build.patch + config.patch + fix-dependency-hdf5.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS |