Mercurial > hg > orthanc

diff Resources/CMake/DcmtkConfiguration.cmake @ 3599:e01900f913e7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix duplicate symbol "jaritab" in wasm
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 07 Jan 2020 10:53:32 +0100
parents e1904cfdca2c
children d737173197e1
line wrap: on
line diff
--- a/Resources/CMake/DcmtkConfiguration.cmake	Mon Jan 06 19:57:11 2020 +0100
+++ b/Resources/CMake/DcmtkConfiguration.cmake	Tue Jan 07 10:53:32 2020 +0100
@@ -49,6 +49,12 @@
     list(REMOVE_ITEM DCMTK_SOURCES 
       ${DCMTK_SOURCES_DIR}/dcmjpeg/libsrc/ddpiimpl.cc
 
+      # Solves linking problem in WebAssembly: "wasm-ld: error:
+      # duplicate symbol: jaritab" (modification in Orthanc 1.5.9)
+      ${DCMTK_SOURCES_DIR}/dcmjpeg/libijg8/jaricom.c
+      ${DCMTK_SOURCES_DIR}/dcmjpeg/libijg12/jaricom.c
+      ${DCMTK_SOURCES_DIR}/dcmjpeg/libijg24/jaricom.c
+
       # 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