Mercurial > hg > orthanc

comparison Resources/CMake/DcmtkConfiguration.cmake @ 3764:d55768319f8e transcoding

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix static build of dcmtk
author Sebastien Jodogne <s.jodogne@gmail.com>
date Mon, 16 Mar 2020 15:21:35 +0100
parents d737173197e1
children 4a25727401cd
comparison
equal deleted inserted replaced
3761:3b5feb2bbd4b 3764:d55768319f8e
34 include_directories( 34 include_directories(
35 ${DCMTK_SOURCES_DIR}/dcmnet/include 35 ${DCMTK_SOURCES_DIR}/dcmnet/include
36 ) 36 )
37 endif() 37 endif()
38 38
39 if (ENABLE_DCMTK_TRANSCODING)
40 AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmimgle/libsrc DCMTK_SOURCES)
41 endif()
42
39 if (ENABLE_DCMTK_JPEG) 43 if (ENABLE_DCMTK_JPEG)
40 AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmjpeg/libsrc DCMTK_SOURCES) 44 AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmjpeg/libsrc DCMTK_SOURCES)
41 AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmjpeg/libijg8 DCMTK_SOURCES) 45 AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmjpeg/libijg8 DCMTK_SOURCES)
42 AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmjpeg/libijg12 DCMTK_SOURCES) 46 AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmjpeg/libijg12 DCMTK_SOURCES)
43 AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmjpeg/libijg16 DCMTK_SOURCES) 47 AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmjpeg/libijg16 DCMTK_SOURCES)
54 # Solves linking problem in WebAssembly: "wasm-ld: error: 58 # Solves linking problem in WebAssembly: "wasm-ld: error:
55 # duplicate symbol: jaritab" (modification in Orthanc 1.5.9) 59 # duplicate symbol: jaritab" (modification in Orthanc 1.5.9)
56 ${DCMTK_SOURCES_DIR}/dcmjpeg/libijg8/jaricom.c 60 ${DCMTK_SOURCES_DIR}/dcmjpeg/libijg8/jaricom.c
57 ${DCMTK_SOURCES_DIR}/dcmjpeg/libijg12/jaricom.c 61 ${DCMTK_SOURCES_DIR}/dcmjpeg/libijg12/jaricom.c
58 ${DCMTK_SOURCES_DIR}/dcmjpeg/libijg24/jaricom.c 62 ${DCMTK_SOURCES_DIR}/dcmjpeg/libijg24/jaricom.c
59 63 )
60 # Disable support for encoding JPEG (modification in Orthanc 1.0.1) 64
61 ${DCMTK_SOURCES_DIR}/dcmjpeg/libsrc/djcodece.cc 65 if (NOT ENABLE_DCMTK_TRANSCODING)
62 ${DCMTK_SOURCES_DIR}/dcmjpeg/libsrc/djencsv1.cc 66 list(REMOVE_ITEM DCMTK_SOURCES
63 ${DCMTK_SOURCES_DIR}/dcmjpeg/libsrc/djencbas.cc 67 # Disable support for encoding JPEG (modification in Orthanc 1.0.1)
64 ${DCMTK_SOURCES_DIR}/dcmjpeg/libsrc/djencpro.cc 68 ${DCMTK_SOURCES_DIR}/dcmjpeg/libsrc/djcodece.cc
65 ${DCMTK_SOURCES_DIR}/dcmjpeg/libsrc/djenclol.cc 69 ${DCMTK_SOURCES_DIR}/dcmjpeg/libsrc/djencsv1.cc
66 ${DCMTK_SOURCES_DIR}/dcmjpeg/libsrc/djencode.cc 70 ${DCMTK_SOURCES_DIR}/dcmjpeg/libsrc/djencbas.cc
67 ${DCMTK_SOURCES_DIR}/dcmjpeg/libsrc/djencext.cc 71 ${DCMTK_SOURCES_DIR}/dcmjpeg/libsrc/djencpro.cc
68 ${DCMTK_SOURCES_DIR}/dcmjpeg/libsrc/djencsps.cc 72 ${DCMTK_SOURCES_DIR}/dcmjpeg/libsrc/djenclol.cc
69 ) 73 ${DCMTK_SOURCES_DIR}/dcmjpeg/libsrc/djencode.cc
74 ${DCMTK_SOURCES_DIR}/dcmjpeg/libsrc/djencext.cc
75 ${DCMTK_SOURCES_DIR}/dcmjpeg/libsrc/djencsps.cc
76 )
77 endif()
70 endif() 78 endif()
71 79
72 80
73 if (ENABLE_DCMTK_JPEG_LOSSLESS) 81 if (ENABLE_DCMTK_JPEG_LOSSLESS)
74 AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmjpls/libsrc DCMTK_SOURCES) 82 AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmjpls/libsrc DCMTK_SOURCES)
76 include_directories( 84 include_directories(
77 ${DCMTK_SOURCES_DIR}/dcmjpeg/include 85 ${DCMTK_SOURCES_DIR}/dcmjpeg/include
78 ${DCMTK_SOURCES_DIR}/dcmjpls/include 86 ${DCMTK_SOURCES_DIR}/dcmjpls/include
79 ${DCMTK_SOURCES_DIR}/dcmjpls/libcharls 87 ${DCMTK_SOURCES_DIR}/dcmjpls/libcharls
80 ) 88 )
81 list(REMOVE_ITEM DCMTK_SOURCES
82 ${DCMTK_SOURCES_DIR}/dcmjpls/libsrc/djcodece.cc
83
84 # Disable support for encoding JPEG-LS (modification in Orthanc 1.0.1)
85 ${DCMTK_SOURCES_DIR}/dcmjpls/libsrc/djencode.cc
86 )
87 list(APPEND DCMTK_SOURCES 89 list(APPEND DCMTK_SOURCES
88 ${DCMTK_SOURCES_DIR}/dcmjpeg/libsrc/djrplol.cc 90 ${DCMTK_SOURCES_DIR}/dcmjpeg/libsrc/djrplol.cc
89 ) 91 )
92
93 if (NOT ENABLE_DCMTK_TRANSCODING)
94 list(REMOVE_ITEM DCMTK_SOURCES
95 ${DCMTK_SOURCES_DIR}/dcmjpls/libsrc/djcodece.cc
96
97 # Disable support for encoding JPEG-LS (modification in Orthanc 1.0.1)
98 ${DCMTK_SOURCES_DIR}/dcmjpls/libsrc/djencode.cc
99 )
100 endif()
90 endif() 101 endif()
91 102
92 103
93 # This fixes crashes related to the destruction of the DCMTK OFLogger 104 # This fixes crashes related to the destruction of the DCMTK OFLogger
94 # http://support.dcmtk.org/docs-snapshot/file_macros.html 105 # http://support.dcmtk.org/docs-snapshot/file_macros.html