# HG changeset patch # User Sebastien Jodogne # Date 1704831622 -3600 # Node ID 2742be05c0bc856a3fbadd615d0ece74805ed7ad # Parent 50910d241dd7398ad8c3cb381ba9b3d4792ffae8 setting DCMTK_ENABLE_CHARSET_CONVERSION diff -r 50910d241dd7 -r 2742be05c0bc OrthancFramework/Resources/CMake/DcmtkConfigurationStatic-3.6.8.cmake --- a/OrthancFramework/Resources/CMake/DcmtkConfigurationStatic-3.6.8.cmake Tue Jan 09 18:36:55 2024 +0100 +++ b/OrthancFramework/Resources/CMake/DcmtkConfigurationStatic-3.6.8.cmake Tue Jan 09 21:20:22 2024 +0100 @@ -187,6 +187,17 @@ endif() +# "DCMTK_ENABLE_CHARSET_CONVERSION" is defined by "osconfig.h.in" +if (BOOST_LOCALE_BACKEND STREQUAL "gcc") + set(DCMTK_ENABLE_CHARSET_CONVERSION "DCMTK_CHARSET_CONVERSION_STDLIBC_ICONV") +elseif (BOOST_LOCALE_BACKEND STREQUAL "libiconv") + set(DCMTK_ENABLE_CHARSET_CONVERSION "DCMTK_CHARSET_CONVERSION_ICONV") +elseif (BOOST_LOCALE_BACKEND STREQUAL "icu") + set(DCMTK_ENABLE_CHARSET_CONVERSION "DCMTK_CHARSET_CONVERSION_ICU") +else() + message(FATAL_ERROR "Invalid value for BOOST_LOCALE_BACKEND: ${BOOST_LOCALE_BACKEND}") +endif() + CONFIGURE_FILE( ${DCMTK_SOURCES_DIR}/CMake/osconfig.h.in ${DCMTK_SOURCES_DIR}/config/include/dcmtk/config/osconfig.h) @@ -234,9 +245,6 @@ endif() -AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/oficonv/libsrc DCMTK_SOURCES) - - # Starting with DCMTK 3.6.2, the Nagle algorithm is not disabled by # default since this does not seem to be appropriate (anymore) for # most modern operating systems. In order to change this default, the