Skip to content

Commit

Permalink
ENH: Bump DCMTK to 2024-03-11 master
Browse files Browse the repository at this point in the history
We can drop the arith.h patch because it was removed in:

  DCMTK/dcmtk@5714b4c

We also need to add oficonv to the linked libraries for the default
build. Remove the Apple workaround since we are linking oficonv.
  • Loading branch information
thewtex committed Mar 13, 2024
1 parent e318949 commit db9c048
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 18 deletions.
12 changes: 1 addition & 11 deletions Modules/ThirdParty/DCMTK/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -78,18 +78,8 @@ else(DCMTK_USE_ICU)
)
endif()

if(APPLE)
# Character set conversion creates linking errors on MacOS. We disable
# `iconv` which is likely going to be found on the system by DCMTK, and
# that is going to create linking errors.
list(APPEND
CHARSET_CONVERSION_ARGS
-DDCMTK_WITH_ICONV:BOOL=OFF
)
endif()

set(_ITKDCMTK_LIB_NAMES dcmdata dcmimage dcmimgle dcmjpeg dcmjpls
dcmnet dcmpstat dcmqrdb dcmsr dcmtls ijg12 ijg16 ijg8 oflog ofstd)
dcmnet dcmpstat dcmqrdb dcmsr dcmtls ijg12 ijg16 ijg8 oflog ofstd oficonv)
if(WIN32)
set(ITKDCMTK_LIBDEP_WIN iphlpapi ws2_32 netapi32 wsock32)
endif()
Expand Down
11 changes: 4 additions & 7 deletions Modules/ThirdParty/DCMTK/DCMTKGitTag.cmake
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Set GIT tag here for use in multiple CMakeLists.txt
#
set(DCMTK_GIT_REPOSITORY "https://github.com/InsightSoftwareConsortium/DCMTK.git")
# 2020.02.14 patched
# 2024.03.11 patched
# Patch list:

#Francois Budin (1):
Expand All @@ -13,10 +13,7 @@ set(DCMTK_GIT_REPOSITORY "https://github.com/InsightSoftwareConsortium/DCMTK.git
#Jean-Christophe Fillion-Robin (1):
#COMP: Set 3rd party package CMake variables only if needed

#Matt McCormick (2):
#Support CMAKE_CROSSCOMPILING_EMULATOR
#Support the generation of arith.h with Emscription
#Matt McCormick (1):
#Support CMAKE_CROSSCOMPILING_EMULATOR # pushed upstream in https://github.com/DCMTK/dcmtk/pull/94



set(DCMTK_GIT_TAG "cba5794fb294ca7a473a70dd97fdee115922a348") # 20220117_DCMTK_PATCHES_FOR_ITK
set(DCMTK_GIT_TAG "bed2645624b30823189b1afa0d0feb8c8964847e") # 20240311_DCMTK_PATCHES_FOR_ITK

0 comments on commit db9c048

Please sign in to comment.