[dcmtk] Fix link xml2 error (#35414)

This commit is contained in:
jim wang 2023-12-05 09:24:32 +08:00 committed by GitHub
parent 544daf445a
commit a5bc2a1b25
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 21 additions and 2 deletions

View File

@ -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()

View File

@ -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

View File

@ -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",

View File

@ -2146,7 +2146,7 @@
},
"dcmtk": {
"baseline": "3.6.7",
"port-version": 5
"port-version": 6
},
"debug-assert": {
"baseline": "1.3.3",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "bea28d42632b9740c795d645252307fe02c273cc",
"version": "3.6.7",
"port-version": 6
},
{
"git-tree": "a66dd62879ace07389aae2f77cc909744f9d7458",
"version": "3.6.7",