diff --git a/ports/dcmtk/fix_link_xml2.patch b/ports/dcmtk/fix_link_xml2.patch new file mode 100644 index 0000000000..feaa4038ff --- /dev/null +++ b/ports/dcmtk/fix_link_xml2.patch @@ -0,0 +1,13 @@ +diff --git a/CMake/3rdparty.cmake b/CMake/3rdparty.cmake +index 2c974e8..90707bd 100644 +--- a/CMake/3rdparty.cmake ++++ b/CMake/3rdparty.cmake +@@ -94,7 +94,7 @@ if(DCMTK_USE_FIND_PACKAGE) + else() + message(STATUS "Info: DCMTK XML support will be enabled") + set(WITH_LIBXML 1) +- include_directories(${LIBXML2_INCLUDE_DIR}) ++ include_directories(${LIBXML2_INCLUDE_DIRS}) + set(LIBXML_LIBS ${LIBXML2_LIBRARIES} ${LIBXML2_EXTRA_LIBS_STATIC}) + endif() + endif() diff --git a/ports/dcmtk/portfile.cmake b/ports/dcmtk/portfile.cmake index 724876e274..859581c400 100644 --- a/ports/dcmtk/portfile.cmake +++ b/ports/dcmtk/portfile.cmake @@ -8,6 +8,7 @@ vcpkg_from_github( dcmtk.patch windows-patch.patch fix-pc-format.patch + fix_link_xml2.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS diff --git a/ports/dcmtk/vcpkg.json b/ports/dcmtk/vcpkg.json index 7adfe71059..470cd87dd4 100644 --- a/ports/dcmtk/vcpkg.json +++ b/ports/dcmtk/vcpkg.json @@ -1,7 +1,7 @@ { "name": "dcmtk", "version": "3.6.7", - "port-version": 5, + "port-version": 6, "description": "This DICOM ToolKit (DCMTK) package consists of source code, documentation and installation instructions for a set of software libraries and applications implementing part of the DICOM/MEDICOM Standard.", "homepage": "https://github.com/DCMTK/dcmtk", "license": "BSD-3-Clause OR BSD-2-Clause OR libtiff OR MIT OR Zlib OR Libpng", diff --git a/versions/baseline.json b/versions/baseline.json index e8c2cb7d72..1509ee9e4c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2146,7 +2146,7 @@ }, "dcmtk": { "baseline": "3.6.7", - "port-version": 5 + "port-version": 6 }, "debug-assert": { "baseline": "1.3.3", diff --git a/versions/d-/dcmtk.json b/versions/d-/dcmtk.json index 0e5e9f7f96..c2c22d9cb9 100644 --- a/versions/d-/dcmtk.json +++ b/versions/d-/dcmtk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bea28d42632b9740c795d645252307fe02c273cc", + "version": "3.6.7", + "port-version": 6 + }, { "git-tree": "a66dd62879ace07389aae2f77cc909744f9d7458", "version": "3.6.7",