[dcmtk] Fix dependencies (#36607)

* fix dep

* update version

* fix link

* update vertsion

* update version

* fix patch

* update version
This commit is contained in:
jim wang 2024-02-08 06:27:35 +00:00 committed by GitHub
parent cf37b82bca
commit fe9f0b22b3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
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 955ea71..9968352 100644
--- a/CMake/3rdparty.cmake
+++ b/CMake/3rdparty.cmake
@@ -42,7 +42,7 @@ if(DCMTK_USE_FIND_PACKAGE)
message(STATUS "Info: DCMTK TIFF support will be enabled")
include_directories(${TIFF_INCLUDE_DIR} ${JPEG_INCLUDE_DIR})
endif()
- set(LIBTIFF_LIBS ${TIFF_LIBRARY} ${TIFF_EXTRA_LIBS_STATIC} ${JPEG_LIBRARY})
+ set(LIBTIFF_LIBS ${TIFF_LIBRARIES})
endif()
endif()

View File

@ -8,6 +8,7 @@ vcpkg_from_github(
dcmtk.patch
fix_link_xml2.patch
dictionary_paths.patch
fix_link_tiff.patch
)
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS

View File

@ -1,7 +1,7 @@
{
"name": "dcmtk",
"version": "3.6.8",
"port-version": 1,
"port-version": 2,
"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

@ -2174,7 +2174,7 @@
},
"dcmtk": {
"baseline": "3.6.8",
"port-version": 1
"port-version": 2
},
"debug-assert": {
"baseline": "1.3.3",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "86607f6cdca69d2aca997eead93dfa2b767679a1",
"version": "3.6.8",
"port-version": 2
},
{
"git-tree": "bec215b4880ee37ff46a69fdbc6bd3888901c52a",
"version": "3.6.8",