diff --git a/ports/minc/portfile.cmake b/ports/minc/portfile.cmake index 6fbec96273a..5cb60d0fc41 100644 --- a/ports/minc/portfile.cmake +++ b/ports/minc/portfile.cmake @@ -1,6 +1,6 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH - REPO BIC-MNI/libminc + REPO BIC-MNI/libminc REF e75a936c12a305b596d743c26a5437196ebce2a4 SHA512 744f879ac8f0594c310d1c1b7fe67543c5feeb3e5a0979035918dbb2bf1d0973fbd389e5357a75631e618cc614b648c21179f7467576bd68e3522e63f21451b0 HEAD_REF master @@ -10,8 +10,10 @@ vcpkg_from_github( fix-dependency-hdf5.patch ) -vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - "minc1" LIBMINC_MINC1_SUPPORT +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + "minc1" LIBMINC_MINC1_SUPPORT ) if(VCPKG_TARGET_IS_WINDOWS) @@ -20,14 +22,13 @@ endif() set(OPTIONS) if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - list(APPEND OPTIONS "-DLIBMINC_BUILD_SHARED_LIBS=ON") + list(APPEND OPTIONS "-DLIBMINC_BUILD_SHARED_LIBS=ON") else() list(APPEND OPTIONS "-DLIBMINC_BUILD_SHARED_LIBS=OFF") endif() -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" DISABLE_PARALLEL_CONFIGURE OPTIONS "-DBUILD_TESTING=OFF" @@ -36,9 +37,9 @@ vcpkg_configure_cmake( ${FEATURE_OPTIONS} ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake TARGET_PATH share/libminc) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake PACKAGE_NAME libminc) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") @@ -46,4 +47,4 @@ endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/minc/vcpkg.json b/ports/minc/vcpkg.json index 0fd609d6779..6b23453782e 100644 --- a/ports/minc/vcpkg.json +++ b/ports/minc/vcpkg.json @@ -1,15 +1,24 @@ { "name": "minc", "version-string": "2.4.03", - "port-version": 2, + "port-version": 3, "description": "MINC - Medical Image NetCDF or MINC isn't netCDF", "homepage": "https://github.com/BIC-MNI/libminc", + "license": null, "dependencies": [ { "name": "hdf5", "default-features": false }, "nifticlib", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, "zlib" ], "features": { @@ -17,7 +26,7 @@ "description": "Support minc1 file format, requires NETCDF", "dependencies": [ { - "name": "netcdf", + "name": "netcdf-c", "default-features": false } ] diff --git a/versions/baseline.json b/versions/baseline.json index 63d7ab0c5f7..78942570c21 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4842,7 +4842,7 @@ }, "minc": { "baseline": "2.4.03", - "port-version": 2 + "port-version": 3 }, "minhook": { "baseline": "1.3.3", diff --git a/versions/m-/minc.json b/versions/m-/minc.json index 875fca8fe5a..bb707d820bf 100644 --- a/versions/m-/minc.json +++ b/versions/m-/minc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7cadb35b3498a07bf7e64fafd1a2cfc04ef96a52", + "version-string": "2.4.03", + "port-version": 3 + }, { "git-tree": "c1f17dd915374b25e123d358f01990425f3e0e97", "version-string": "2.4.03",