Mercurial > hg > orthanc

changeset 3279:dd10fe965870

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
use of DCMTK 3.6.4 in static builds
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 21 Feb 2019 15:13:49 +0100
parents ce6a98f8ed85
children fddf3ceed7e5
files NEWS Resources/CMake/DcmtkConfiguration.cmake Resources/CMake/DcmtkConfigurationStatic-3.6.0.cmake Resources/CMake/DcmtkConfigurationStatic-3.6.2.cmake Resources/CMake/DcmtkConfigurationStatic-3.6.4.cmake Resources/CMake/OrthancFrameworkParameters.cmake
diffstat 6 files changed, 241 insertions(+), 126 deletions(-) [+]
line wrap: on
line diff
--- a/NEWS	Thu Feb 21 12:05:48 2019 +0100
+++ b/NEWS	Thu Feb 21 15:13:49 2019 +0100
@@ -1,16 +1,30 @@
 Pending changes in the mainline
 ===============================
 
-* Separation of ideographic and phonetic characters in DICOMweb JSON and XML
+
+General
+-------
+
 * Support of the following multi-byte specific character sets:
   - Japanese Kanji (ISO 2022 IR 87)
   - Korean (ISO 2022 IR 149)
   - Simplified Chinese (ISO 2022 IR 58)
 * Basic support for character sets with code extensions (ISO 2022 escape sequences)
+
+Plugins
+-------
+
+* Separation of ideographic and phonetic characters in DICOMweb JSON and XML
+
+Maintenance
+-----------
+
 * Fix issue #134 (/patient/modify gives 500, should really be 400)
 * Support of SOP classes: BreastProjectionXRayImageStorageForProcessing/Presentation
 * More tolerance wrt. missing DICOM tags that must be returned by Orthanc C-FIND SCP
 * New CMake option: "-DMSVC_MULTIPLE_PROCESSES=ON" for parallel build with Visual Studio
+* Upgraded dependencies for static and Windows builds:
+  - DCMTK 3.6.4
 
 
 Version 1.5.4 (2019-02-08)
--- a/Resources/CMake/DcmtkConfiguration.cmake	Thu Feb 21 12:05:48 2019 +0100
+++ b/Resources/CMake/DcmtkConfiguration.cmake	Thu Feb 21 15:13:49 2019 +0100
@@ -4,13 +4,11 @@
 
 if (STATIC_BUILD OR NOT USE_SYSTEM_DCMTK)
   if (DCMTK_STATIC_VERSION STREQUAL "3.6.0")
-    include(${CMAKE_CURRENT_LIST_DIR}/DcmtkConfigurationStatic-3.6.0.cmake)
-    
+    include(${CMAKE_CURRENT_LIST_DIR}/DcmtkConfigurationStatic-3.6.0.cmake)   
   elseif (DCMTK_STATIC_VERSION STREQUAL "3.6.2")
     include(${CMAKE_CURRENT_LIST_DIR}/DcmtkConfigurationStatic-3.6.2.cmake)
-    
-    #elseif (DCMTK_STATIC_VERSION STREQUAL "3.6.4")
-
+  elseif (DCMTK_STATIC_VERSION STREQUAL "3.6.4")
+    include(${CMAKE_CURRENT_LIST_DIR}/DcmtkConfigurationStatic-3.6.4.cmake)
   else()
     message(FATAL_ERROR "Unsupported version of DCMTK: ${DCMTK_STATIC_VERSION}")
   endif()
@@ -19,6 +17,69 @@
   ##
   ## Commands shared by all versions of DCMTK
   ##
+
+  AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmdata/libsrc DCMTK_SOURCES)
+  AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/ofstd/libsrc DCMTK_SOURCES)
+
+  LIST(REMOVE_ITEM DCMTK_SOURCES 
+    ${DCMTK_SOURCES_DIR}/dcmdata/libsrc/mkdictbi.cc
+    ${DCMTK_SOURCES_DIR}/dcmdata/libsrc/mkdeftag.cc
+    )
+
+  if (ENABLE_DCMTK_NETWORKING)
+    AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmnet/libsrc DCMTK_SOURCES)
+    include_directories(
+      ${DCMTK_SOURCES_DIR}/dcmnet/include
+      )
+  endif()
+
+  if (ENABLE_DCMTK_JPEG)
+    AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmjpeg/libsrc DCMTK_SOURCES)
+    AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmjpeg/libijg8 DCMTK_SOURCES)
+    AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmjpeg/libijg12 DCMTK_SOURCES)
+    AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmjpeg/libijg16 DCMTK_SOURCES)
+    include_directories(
+      ${DCMTK_SOURCES_DIR}/dcmjpeg/include
+      ${DCMTK_SOURCES_DIR}/dcmjpeg/libijg8
+      ${DCMTK_SOURCES_DIR}/dcmjpeg/libijg12
+      ${DCMTK_SOURCES_DIR}/dcmjpeg/libijg16
+      ${DCMTK_SOURCES_DIR}/dcmimgle/include
+      )
+    list(REMOVE_ITEM DCMTK_SOURCES 
+      ${DCMTK_SOURCES_DIR}/dcmjpeg/libsrc/ddpiimpl.cc
+
+      # Disable support for encoding JPEG (modification in Orthanc 1.0.1)
+      ${DCMTK_SOURCES_DIR}/dcmjpeg/libsrc/djcodece.cc
+      ${DCMTK_SOURCES_DIR}/dcmjpeg/libsrc/djencsv1.cc
+      ${DCMTK_SOURCES_DIR}/dcmjpeg/libsrc/djencbas.cc
+      ${DCMTK_SOURCES_DIR}/dcmjpeg/libsrc/djencpro.cc
+      ${DCMTK_SOURCES_DIR}/dcmjpeg/libsrc/djenclol.cc
+      ${DCMTK_SOURCES_DIR}/dcmjpeg/libsrc/djencode.cc
+      ${DCMTK_SOURCES_DIR}/dcmjpeg/libsrc/djencext.cc
+      ${DCMTK_SOURCES_DIR}/dcmjpeg/libsrc/djencsps.cc
+      )
+  endif()
+
+
+  if (ENABLE_DCMTK_JPEG_LOSSLESS)
+    AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmjpls/libsrc DCMTK_SOURCES)
+    AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmjpls/libcharls DCMTK_SOURCES)
+    include_directories(
+      ${DCMTK_SOURCES_DIR}/dcmjpeg/include
+      ${DCMTK_SOURCES_DIR}/dcmjpls/include
+      ${DCMTK_SOURCES_DIR}/dcmjpls/libcharls
+      )
+    list(REMOVE_ITEM DCMTK_SOURCES 
+      ${DCMTK_SOURCES_DIR}/dcmjpls/libsrc/djcodece.cc
+
+      # Disable support for encoding JPEG-LS (modification in Orthanc 1.0.1)
+      ${DCMTK_SOURCES_DIR}/dcmjpls/libsrc/djencode.cc
+      )
+    list(APPEND DCMTK_SOURCES 
+      ${DCMTK_SOURCES_DIR}/dcmjpeg/libsrc/djrplol.cc
+      )
+  endif()
+
   
   # This fixes crashes related to the destruction of the DCMTK OFLogger
   # http://support.dcmtk.org/docs-snapshot/file_macros.html
--- a/Resources/CMake/DcmtkConfigurationStatic-3.6.0.cmake	Thu Feb 21 12:05:48 2019 +0100
+++ b/Resources/CMake/DcmtkConfigurationStatic-3.6.0.cmake	Thu Feb 21 15:13:49 2019 +0100
@@ -137,62 +137,6 @@
   ${DCMTK_SOURCES_DIR}/CMake/osconfig.h.in
   ${DCMTK_SOURCES_DIR}/config/include/dcmtk/config/osconfig.h)
 
-AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmdata/libsrc DCMTK_SOURCES)
-AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/ofstd/libsrc DCMTK_SOURCES)
-
-if (ENABLE_DCMTK_NETWORKING)
-  AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmnet/libsrc DCMTK_SOURCES)
-  include_directories(
-    ${DCMTK_SOURCES_DIR}/dcmnet/include
-    )
-endif()
-
-if (ENABLE_DCMTK_JPEG)
-  AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmjpeg/libsrc DCMTK_SOURCES)
-  AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmjpeg/libijg8 DCMTK_SOURCES)
-  AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmjpeg/libijg12 DCMTK_SOURCES)
-  AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmjpeg/libijg16 DCMTK_SOURCES)
-  include_directories(
-    ${DCMTK_SOURCES_DIR}/dcmjpeg/include
-    ${DCMTK_SOURCES_DIR}/dcmjpeg/libijg8
-    ${DCMTK_SOURCES_DIR}/dcmjpeg/libijg12
-    ${DCMTK_SOURCES_DIR}/dcmjpeg/libijg16
-    ${DCMTK_SOURCES_DIR}/dcmimgle/include
-    )
-  list(REMOVE_ITEM DCMTK_SOURCES 
-    ${DCMTK_SOURCES_DIR}/dcmjpeg/libsrc/ddpiimpl.cc
-
-    # Disable support for encoding JPEG (modification in Orthanc 1.0.1)
-    ${DCMTK_SOURCES_DIR}/dcmjpeg/libsrc/djcodece.cc
-    ${DCMTK_SOURCES_DIR}/dcmjpeg/libsrc/djencsv1.cc
-    ${DCMTK_SOURCES_DIR}/dcmjpeg/libsrc/djencbas.cc
-    ${DCMTK_SOURCES_DIR}/dcmjpeg/libsrc/djencpro.cc
-    ${DCMTK_SOURCES_DIR}/dcmjpeg/libsrc/djenclol.cc
-    ${DCMTK_SOURCES_DIR}/dcmjpeg/libsrc/djencode.cc
-    ${DCMTK_SOURCES_DIR}/dcmjpeg/libsrc/djencext.cc
-    ${DCMTK_SOURCES_DIR}/dcmjpeg/libsrc/djencsps.cc
-    )
-endif()
-
-
-if (ENABLE_DCMTK_JPEG_LOSSLESS)
-  AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmjpls/libsrc DCMTK_SOURCES)
-  AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmjpls/libcharls DCMTK_SOURCES)
-  include_directories(
-    ${DCMTK_SOURCES_DIR}/dcmjpeg/include
-    ${DCMTK_SOURCES_DIR}/dcmjpls/include
-    ${DCMTK_SOURCES_DIR}/dcmjpls/libcharls
-    )
-  list(REMOVE_ITEM DCMTK_SOURCES 
-    ${DCMTK_SOURCES_DIR}/dcmjpls/libsrc/djcodece.cc
-
-    # Disable support for encoding JPEG-LS (modification in Orthanc 1.0.1)
-    ${DCMTK_SOURCES_DIR}/dcmjpls/libsrc/djencode.cc
-    )
-  list(APPEND DCMTK_SOURCES 
-    ${DCMTK_SOURCES_DIR}/dcmjpeg/libsrc/djrplol.cc
-    )
-endif()
 
 
 # Source for the logging facility of DCMTK
--- a/Resources/CMake/DcmtkConfigurationStatic-3.6.2.cmake	Thu Feb 21 12:05:48 2019 +0100
+++ b/Resources/CMake/DcmtkConfigurationStatic-3.6.2.cmake	Thu Feb 21 15:13:49 2019 +0100
@@ -140,63 +140,6 @@
   INSPECT_FUNDAMENTAL_ARITHMETIC_TYPES()
 endif()
 
-AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmdata/libsrc DCMTK_SOURCES)
-AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/ofstd/libsrc DCMTK_SOURCES)
-
-if (ENABLE_DCMTK_NETWORKING)
-  AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmnet/libsrc DCMTK_SOURCES)
-  include_directories(
-    ${DCMTK_SOURCES_DIR}/dcmnet/include
-    )
-endif()
-
-if (ENABLE_DCMTK_JPEG)
-  AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmjpeg/libsrc DCMTK_SOURCES)
-  AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmjpeg/libijg8 DCMTK_SOURCES)
-  AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmjpeg/libijg12 DCMTK_SOURCES)
-  AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmjpeg/libijg16 DCMTK_SOURCES)
-  include_directories(
-    ${DCMTK_SOURCES_DIR}/dcmjpeg/include
-    ${DCMTK_SOURCES_DIR}/dcmjpeg/libijg8
-    ${DCMTK_SOURCES_DIR}/dcmjpeg/libijg12
-    ${DCMTK_SOURCES_DIR}/dcmjpeg/libijg16
-    ${DCMTK_SOURCES_DIR}/dcmimgle/include
-    )
-  list(REMOVE_ITEM DCMTK_SOURCES 
-    ${DCMTK_SOURCES_DIR}/dcmjpeg/libsrc/ddpiimpl.cc
-
-    # Disable support for encoding JPEG (modification in Orthanc 1.0.1)
-    ${DCMTK_SOURCES_DIR}/dcmjpeg/libsrc/djcodece.cc
-    ${DCMTK_SOURCES_DIR}/dcmjpeg/libsrc/djencsv1.cc
-    ${DCMTK_SOURCES_DIR}/dcmjpeg/libsrc/djencbas.cc
-    ${DCMTK_SOURCES_DIR}/dcmjpeg/libsrc/djencpro.cc
-    ${DCMTK_SOURCES_DIR}/dcmjpeg/libsrc/djenclol.cc
-    ${DCMTK_SOURCES_DIR}/dcmjpeg/libsrc/djencode.cc
-    ${DCMTK_SOURCES_DIR}/dcmjpeg/libsrc/djencext.cc
-    ${DCMTK_SOURCES_DIR}/dcmjpeg/libsrc/djencsps.cc
-    )
-endif()
-
-
-if (ENABLE_DCMTK_JPEG_LOSSLESS)
-  AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmjpls/libsrc DCMTK_SOURCES)
-  AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmjpls/libcharls DCMTK_SOURCES)
-  include_directories(
-    ${DCMTK_SOURCES_DIR}/dcmjpeg/include
-    ${DCMTK_SOURCES_DIR}/dcmjpls/include
-    ${DCMTK_SOURCES_DIR}/dcmjpls/libcharls
-    )
-  list(REMOVE_ITEM DCMTK_SOURCES 
-    ${DCMTK_SOURCES_DIR}/dcmjpls/libsrc/djcodece.cc
-
-    # Disable support for encoding JPEG-LS (modification in Orthanc 1.0.1)
-    ${DCMTK_SOURCES_DIR}/dcmjpls/libsrc/djencode.cc
-    )
-  list(APPEND DCMTK_SOURCES 
-    ${DCMTK_SOURCES_DIR}/dcmjpeg/libsrc/djrplol.cc
-    )
-endif()
-
 
 # Source for the logging facility of DCMTK
 AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/oflog/libsrc DCMTK_SOURCES)
@@ -233,12 +176,6 @@
 endif()
 
 
-list(REMOVE_ITEM DCMTK_SOURCES 
-  ${DCMTK_SOURCES_DIR}/dcmdata/libsrc/mkdictbi.cc
-  ${DCMTK_SOURCES_DIR}/dcmdata/libsrc/mkdeftag.cc
-  )
-
-
 #set_source_files_properties(${DCMTK_SOURCES}
 #  PROPERTIES COMPILE_DEFINITIONS
 #  "PACKAGE_VERSION=\"${DCMTK_PACKAGE_VERSION}\";PACKAGE_VERSION_NUMBER=\"${DCMTK_VERSION_NUMBER}\"")
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Resources/CMake/DcmtkConfigurationStatic-3.6.4.cmake	Thu Feb 21 15:13:49 2019 +0100
@@ -0,0 +1,158 @@
+SET(DCMTK_VERSION_NUMBER 364)
+SET(DCMTK_PACKAGE_VERSION "3.6.4")
+SET(DCMTK_SOURCES_DIR ${CMAKE_BINARY_DIR}/dcmtk-3.6.4)
+SET(DCMTK_URL "http://orthanc.osimis.io/ThirdPartyDownloads/dcmtk-3.6.4.tar.gz")
+SET(DCMTK_MD5 "97597439a2ae7a39086066318db5f3bc")
+
+macro(DCMTK_UNSET)
+endmacro()
+
+macro(DCMTK_UNSET_CACHE)
+endmacro()
+
+set(DCMTK_BINARY_DIR ${DCMTK_SOURCES_DIR}/)
+set(DCMTK_CMAKE_INCLUDE ${DCMTK_SOURCES_DIR}/)
+set(DCMTK_WITH_THREADS ON)
+
+add_definitions(-DDCMTK_INSIDE_LOG4CPLUS=1)
+
+if (IS_DIRECTORY "${DCMTK_SOURCES_DIR}")
+  set(FirstRun OFF)
+else()
+  set(FirstRun ON)
+endif()
+
+DownloadPackage(${DCMTK_MD5} ${DCMTK_URL} "${DCMTK_SOURCES_DIR}")
+
+
+include_directories(
+  ${DCMTK_SOURCES_DIR}/dcmiod/include
+  )
+
+
+# C_CHAR_UNSIGNED *must* be set before calling "GenerateDCMTKConfigure.cmake"
+IF (CMAKE_CROSSCOMPILING)
+  if (CMAKE_COMPILER_IS_GNUCXX AND
+      CMAKE_SYSTEM_NAME STREQUAL "Windows")  # MinGW
+    SET(C_CHAR_UNSIGNED 1 CACHE INTERNAL "Whether char is unsigned.")
+
+  elseif(CMAKE_SYSTEM_NAME STREQUAL "Emscripten")  # WebAssembly or asm.js
+
+    # Check out "../WebAssembly/ArithmeticTests/" to regenerate the
+    # "arith.h" file
+    configure_file(
+      ${ORTHANC_ROOT}/Resources/WebAssembly/arith.h
+      ${DCMTK_SOURCES_DIR}/config/include/dcmtk/config/arith.h
+      COPYONLY)
+
+    UNSET(C_CHAR_UNSIGNED CACHE)
+    SET(C_CHAR_UNSIGNED 0 CACHE INTERNAL "")
+
+  else()
+    message(FATAL_ERROR "Support your platform here")
+  endif()
+ENDIF()
+
+
+if ("${CMAKE_SYSTEM_VERSION}" STREQUAL "LinuxStandardBase")
+  SET(DCMTK_ENABLE_CHARSET_CONVERSION "iconv" CACHE STRING "")
+  SET(HAVE_SYS_GETTID 0 CACHE INTERNAL "")
+endif()
+
+
+SET(DCMTK_SOURCE_DIR ${DCMTK_SOURCES_DIR})
+include(${DCMTK_SOURCES_DIR}/CMake/CheckFunctionWithHeaderExists.cmake)
+include(${DCMTK_SOURCES_DIR}/CMake/GenerateDCMTKConfigure.cmake)
+
+
+if (CMAKE_SYSTEM_NAME STREQUAL "Emscripten")  # WebAssembly or
+  # asm.js The macros below are not properly discovered by DCMTK
+  # when using WebAssembly. Check out "../WebAssembly/arith.h" for
+  # how we produced these values. This step MUST be after
+  # "GenerateDCMTKConfigure" and before the generation of
+  # "osconfig.h".
+  UNSET(SIZEOF_VOID_P   CACHE)
+  UNSET(SIZEOF_CHAR     CACHE)
+  UNSET(SIZEOF_DOUBLE   CACHE)
+  UNSET(SIZEOF_FLOAT    CACHE)
+  UNSET(SIZEOF_INT      CACHE)
+  UNSET(SIZEOF_LONG     CACHE)
+  UNSET(SIZEOF_SHORT    CACHE)
+  UNSET(SIZEOF_VOID_P   CACHE)
+
+  SET(SIZEOF_VOID_P 4   CACHE INTERNAL "")
+  SET(SIZEOF_CHAR 1     CACHE INTERNAL "")
+  SET(SIZEOF_DOUBLE 8   CACHE INTERNAL "")
+  SET(SIZEOF_FLOAT 4    CACHE INTERNAL "")
+  SET(SIZEOF_INT 4      CACHE INTERNAL "")
+  SET(SIZEOF_LONG 4     CACHE INTERNAL "")
+  SET(SIZEOF_SHORT 2    CACHE INTERNAL "")
+  SET(SIZEOF_VOID_P 4   CACHE INTERNAL "")
+endif()
+
+
+set(DCMTK_PACKAGE_VERSION_SUFFIX "")
+set(DCMTK_PACKAGE_VERSION_NUMBER ${DCMTK_VERSION_NUMBER})
+
+CONFIGURE_FILE(
+  ${DCMTK_SOURCES_DIR}/CMake/osconfig.h.in
+  ${DCMTK_SOURCES_DIR}/config/include/dcmtk/config/osconfig.h)
+
+if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
+  link_libraries(netapi32)  # For NetWkstaUserGetInfo@12
+  link_libraries(iphlpapi)  # For GetAdaptersInfo@8
+
+  # Configure Wine if cross-compiling for Windows
+  if (CMAKE_COMPILER_IS_GNUCXX)
+    include(${DCMTK_SOURCES_DIR}/CMake/dcmtkUseWine.cmake)
+    FIND_PROGRAM(WINE_WINE_PROGRAM wine)
+    FIND_PROGRAM(WINE_WINEPATH_PROGRAM winepath)
+    list(APPEND DCMTK_TRY_COMPILE_REQUIRED_CMAKE_FLAGS "-DCMAKE_EXE_LINKER_FLAGS=-static")
+  endif()
+endif()
+
+# This step must be after the generation of "osconfig.h"
+if (NOT CMAKE_SYSTEM_NAME STREQUAL "Emscripten")
+  INSPECT_FUNDAMENTAL_ARITHMETIC_TYPES()
+endif()
+
+
+# Source for the logging facility of DCMTK
+AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/oflog/libsrc DCMTK_SOURCES)
+if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux" OR
+    ${CMAKE_SYSTEM_NAME} STREQUAL "Darwin" OR
+    ${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD" OR
+    ${CMAKE_SYSTEM_NAME} STREQUAL "kFreeBSD" OR
+    ${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD" OR
+    ${CMAKE_SYSTEM_NAME} STREQUAL "Emscripten")
+  list(REMOVE_ITEM DCMTK_SOURCES 
+    ${DCMTK_SOURCES_DIR}/oflog/libsrc/clfsap.cc
+    ${DCMTK_SOURCES_DIR}/oflog/libsrc/windebap.cc
+    ${DCMTK_SOURCES_DIR}/oflog/libsrc/winsock.cc
+    )
+
+elseif (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
+  list(REMOVE_ITEM DCMTK_SOURCES 
+    ${DCMTK_SOURCES_DIR}/oflog/libsrc/unixsock.cc
+    ${DCMTK_SOURCES_DIR}/oflog/libsrc/clfsap.cc
+    )
+endif()
+
+
+if (ORTHANC_SANDBOXED)
+  configure_file(
+    ${ORTHANC_ROOT}/Resources/WebAssembly/dcdict.h
+    ${DCMTK_SOURCES_DIR}/dcmdata/include/dcmtk/dcmdata/dcdict.h
+    COPYONLY)
+  
+  configure_file(
+    ${ORTHANC_ROOT}/Resources/WebAssembly/dcdict.cc
+    ${DCMTK_SOURCES_DIR}/dcmdata/libsrc/dcdict.cc
+    COPYONLY)
+endif()
+
+
+list(REMOVE_ITEM DCMTK_SOURCES 
+  ${DCMTK_SOURCES_DIR}/dcmdata/libsrc/mkdictbi.cc
+  ${DCMTK_SOURCES_DIR}/dcmdata/libsrc/mkdeftag.cc
+  )
--- a/Resources/CMake/OrthancFrameworkParameters.cmake	Thu Feb 21 12:05:48 2019 +0100
+++ b/Resources/CMake/OrthancFrameworkParameters.cmake	Thu Feb 21 15:13:49 2019 +0100
@@ -57,7 +57,7 @@
 
 # Parameters specific to DCMTK
 set(DCMTK_DICTIONARY_DIR "" CACHE PATH "Directory containing the DCMTK dictionaries \"dicom.dic\" and \"private.dic\" (only when using system version of DCMTK)")
-set(DCMTK_STATIC_VERSION "3.6.2" CACHE STRING "Version of DCMTK to be used in static builds (can be \"3.6.0\", \"3.6.2\", or \"3.6.4\")")
+set(DCMTK_STATIC_VERSION "3.6.4" CACHE STRING "Version of DCMTK to be used in static builds (can be \"3.6.0\", \"3.6.2\", or \"3.6.4\")")
 set(USE_DCMTK_362_PRIVATE_DIC ON CACHE BOOL "Use the dictionary of private tags from DCMTK 3.6.2 if using DCMTK 3.6.0")
 set(USE_SYSTEM_DCMTK ON CACHE BOOL "Use the system version of DCMTK")
 set(ENABLE_DCMTK_LOG ON CACHE BOOL "Enable logging internal to DCMTK")
@@ -77,6 +77,7 @@
 mark_as_advanced(SYSTEM_MONGOOSE_USE_CALLBACKS)
 mark_as_advanced(BOOST_LOCALE_BACKEND)
 mark_as_advanced(USE_PUGIXML)
+mark_as_advanced(USE_DCMTK_362_PRIVATE_DIC)
 
 
 #####################################################################