From 2c2afe98de8b2824cd22253cfcd44f687252bb84 Mon Sep 17 00:00:00 2001 From: SunBlack Date: Wed, 7 Jan 2026 09:50:53 +0100 Subject: [PATCH] [vtk-dicom] Update 0.8.17 (#49264) --- ports/vtk-dicom/portfile.cmake | 29 +++++++---------------------- ports/vtk-dicom/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/v-/vtk-dicom.json | 5 +++++ 4 files changed, 15 insertions(+), 26 deletions(-) diff --git a/ports/vtk-dicom/portfile.cmake b/ports/vtk-dicom/portfile.cmake index f6df5d1a24..c9f866b212 100644 --- a/ports/vtk-dicom/portfile.cmake +++ b/ports/vtk-dicom/portfile.cmake @@ -1,36 +1,22 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO dgobbi/vtk-dicom - REF cfeceadfa68d2cc3172632bd1fd3ea8a38b6c609 # v0.8.16 - SHA512 0715ef91a1c585c9c819efd2bd6e2b73d3bff73a626b89f4877812fa6587e8379fb55ad99a376fb4d8dfa46c438e7a7052ba02ae61feb950cafb00c95df09b3f + REF "v${VERSION}" + SHA512 ddc294acc60d18f9d60a00fb4e15fbc30743262ec041e4f0f0e6cbccdc821f2e7def4679446e55a9f3a658072c81c2e4b31d017cdc00760d7942452a85f051e8 HEAD_REF master ) -if ("gdcm" IN_LIST FEATURES) - set(USE_GDCM ON ) -else() - set(USE_GDCM OFF ) -endif() - -if(USE_GDCM) - list(APPEND ADDITIONAL_OPTIONS - -DUSE_GDCM=ON - -DUSE_DCMTK=OFF - ) -endif() - -set(python_ver "") -if(NOT VCPKG_TARGET_IS_WINDOWS) - set(python_ver "3") -endif() +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + gdcm USE_GDCM +) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_PROGRAMS=OFF -DBUILD_EXAMPLES=OFF - "-DPython3_EXECUTABLE:PATH=${CURRENT_HOST_INSTALLED_DIR}/tools/python3/python${python_ver}${VCPKG_TARGET_EXECUTABLE_SUFFIX}" - ${ADDITIONAL_OPTIONS} + ${FEATURE_OPTIONS} ) vcpkg_cmake_install() @@ -41,4 +27,3 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/Copyright.txt") - diff --git a/ports/vtk-dicom/vcpkg.json b/ports/vtk-dicom/vcpkg.json index 0e6cf5485b..984e9f6fa3 100644 --- a/ports/vtk-dicom/vcpkg.json +++ b/ports/vtk-dicom/vcpkg.json @@ -1,7 +1,6 @@ { "name": "vtk-dicom", - "version": "0.8.16", - "port-version": 2, + "version": "0.8.17", "description": "DICOM for VTK", "homepage": "https://github.com/dgobbi/vtk-dicom", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index 9aebc3cb50..6ea73ab46b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -10389,8 +10389,8 @@ "port-version": 1 }, "vtk-dicom": { - "baseline": "0.8.16", - "port-version": 2 + "baseline": "0.8.17", + "port-version": 0 }, "vtk-m": { "baseline": "2.3.0", diff --git a/versions/v-/vtk-dicom.json b/versions/v-/vtk-dicom.json index 65d7e8b911..ee17bd9d87 100644 --- a/versions/v-/vtk-dicom.json +++ b/versions/v-/vtk-dicom.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "254db7122781a16b911815c324a1801b82a47e58", + "version": "0.8.17", + "port-version": 0 + }, { "git-tree": "e53703532b0212513a8604e7d613665841c307b5", "version": "0.8.16",