Mercurial > hg > orthanc
changeset 5490:2742be05c0bc
setting DCMTK_ENABLE_CHARSET_CONVERSION
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Tue, 09 Jan 2024 21:20:22 +0100 |
| parents | 50910d241dd7 |
| children | 42e6593aa78e |
| files | OrthancFramework/Resources/CMake/DcmtkConfigurationStatic-3.6.8.cmake |
| diffstat | 1 files changed, 11 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- 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