Skip to content

COMP: Pin DCMTK charset-conversion backend, disabling external iconv #6407

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hjmjohnson wants to merge 1 commit into
base: main
Choose a base branch
from
+22 −9
Open

COMP: Pin DCMTK charset-conversion backend, disabling external iconv #6407

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 22 additions & 9 deletions Modules/ThirdParty/DCMTK/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,22 @@ set(ITKDCMTK_NO_SRC 1)

include(CMakeParseArguments)

# oficonv is the fixed data backend; ICU and external iconv are mutually exclusive add-ons.
set(
CHARSET_CONVERSION_ARGS
-DDCMTK_ENABLE_BUILTIN_OFICONV_DATA:BOOL=${DCMTK_ENABLE_BUILTIN_OFICONV_DATA}
)
if(DCMTK_USE_ICU)
option(ITK_USE_SYSTEM_ICU "Use an installed version of ICU" OFF)
# ICU backend for both system and in-tree ICU; external iconv stays off.
list(
APPEND
CHARSET_CONVERSION_ARGS
-DDCMTK_WITH_STDLIBC_ICONV:BOOL=OFF
-DDCMTK_WITH_ICU:BOOL=ON
-DDCMTK_WITH_ICONV:BOOL=OFF
-DDCMTK_ENABLE_CHARSET_CONVERSION:STRING=ICU
)
if(NOT ITK_USE_SYSTEM_ICU)
set(ITKDCMTK_PREREQS ${ITKDCMTK_BINARY_DIR}/DCMTK_Prereqs)
set(ITKDCMTK_ICU_LIBRARIES)
Expand Down Expand Up @@ -81,13 +95,7 @@ if(DCMTK_USE_ICU)
else()
set(ICU_ROOT_DIR ${ITKDCMTK_PREREQS})
endif()
set(
CHARSET_CONVERSION_ARGS
-DDCMTK_WITH_STDLIBC_ICONV:BOOL=OFF
-DDCMTK_WITH_ICU:BOOL=ON
-DDCMTK_ENABLE_CHARSET_CONVERSION:STRING=ICU
-DICU_ROOT:PATH=${ICU_ROOT_DIR}
)
list(APPEND CHARSET_CONVERSION_ARGS -DICU_ROOT:PATH=${ICU_ROOT_DIR})
itk_download_attempt_check(icu)
ExternalProject_Add(
icu
Expand All @@ -109,7 +117,13 @@ if(DCMTK_USE_ICU)
set(ICU_DEPENDENCY icu)
endif()
Comment thread
hjmjohnson marked this conversation as resolved.
else()
set(CHARSET_CONVERSION_ARGS -DDCMTK_WITH_ICU:BOOL=OFF)
# Built-in oficonv only; disable ICU and external iconv for a deterministic backend.
list(
APPEND
CHARSET_CONVERSION_ARGS
-DDCMTK_WITH_ICU:BOOL=OFF
-DDCMTK_WITH_ICONV:BOOL=OFF
)
endif()

set(
Expand Down Expand Up @@ -480,7 +494,6 @@ endforeach()
-DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_INSTALL_PREFIX}
-DCMAKE_INSTALL_LIBDIR:PATH=${CMAKE_INSTALL_LIBDIR}
-DCMAKE_INSTALL_BINDIR:PATH=${CMAKE_INSTALL_BINDIR}
-DDCMTK_ENABLE_BUILTIN_OFICONV_DATA:BOOL=${DCMTK_ENABLE_BUILTIN_OFICONV_DATA}
${CHARSET_CONVERSION_ARGS}
DEPENDS
${JPEG_DEPENDENCY}
Expand Down
Loading