Mercurial > hg > orthanc

comparison Resources/CMake/DcmtkConfigurationStatic-3.6.4.cmake @ 3593:0301f59450fe

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
improved the patch for loading DICOM dictionary from memory
author Sebastien Jodogne <s.jodogne@gmail.com>
date Mon, 06 Jan 2020 17:58:15 +0100
parents 4b1017928fc4
children 0654d0838de8
comparison
equal deleted inserted replaced
3592:de1665e7b341 3593:0301f59450fe
23 endif() 23 endif()
24 24
25 DownloadPackage(${DCMTK_MD5} ${DCMTK_URL} "${DCMTK_SOURCES_DIR}") 25 DownloadPackage(${DCMTK_MD5} ${DCMTK_URL} "${DCMTK_SOURCES_DIR}")
26 26
27 27
28 # Apply the patches 28 if (FirstRun)
29 execute_process( 29 # Apply the patches
30 COMMAND ${PATCH_EXECUTABLE} -p0 -N -i 30 execute_process(
31 ${ORTHANC_ROOT}/Resources/Patches/dcmtk-3.6.4.patch 31 COMMAND ${PATCH_EXECUTABLE} -p0 -N -i
32 WORKING_DIRECTORY ${CMAKE_BINARY_DIR} 32 ${ORTHANC_ROOT}/Resources/Patches/dcmtk-3.6.4.patch
33 RESULT_VARIABLE Failure 33 WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
34 ) 34 RESULT_VARIABLE Failure
35 )
35 36
36 if (FirstRun AND Failure) 37 if (Failure)
37 message(FATAL_ERROR "Error while patching files") 38 message(FATAL_ERROR "Error while patching a file")
39 endif()
40
41 configure_file(
42 ${ORTHANC_ROOT}/Resources/Patches/dcmtk-dcdict_orthanc.cc
43 ${DCMTK_SOURCES_DIR}/dcmdata/libsrc/dcdict_orthanc.cc
44 COPYONLY)
45 else()
46 message("The patches for DCMTK have already been applied")
38 endif() 47 endif()
39 48
40 49
41 include_directories( 50 include_directories(
42 ${DCMTK_SOURCES_DIR}/dcmiod/include 51 ${DCMTK_SOURCES_DIR}/dcmiod/include
150 ${DCMTK_SOURCES_DIR}/oflog/libsrc/clfsap.cc 159 ${DCMTK_SOURCES_DIR}/oflog/libsrc/clfsap.cc
151 ) 160 )
152 endif() 161 endif()
153 162
154 163
155 if (ORTHANC_SANDBOXED)
156 configure_file(
157 ${ORTHANC_ROOT}/Resources/WebAssembly/dcdict.h
158 ${DCMTK_SOURCES_DIR}/dcmdata/include/dcmtk/dcmdata/dcdict.h
159 COPYONLY)
160
161 configure_file(
162 ${ORTHANC_ROOT}/Resources/WebAssembly/dcdict.cc
163 ${DCMTK_SOURCES_DIR}/dcmdata/libsrc/dcdict.cc
164 COPYONLY)
165 endif()
166
167
168 list(REMOVE_ITEM DCMTK_SOURCES 164 list(REMOVE_ITEM DCMTK_SOURCES
169 ${DCMTK_SOURCES_DIR}/dcmdata/libsrc/mkdictbi.cc 165 ${DCMTK_SOURCES_DIR}/dcmdata/libsrc/mkdictbi.cc
170 ${DCMTK_SOURCES_DIR}/dcmdata/libsrc/mkdeftag.cc 166 ${DCMTK_SOURCES_DIR}/dcmdata/libsrc/mkdeftag.cc
167 ${DCMTK_SOURCES_DIR}/dcmdata/libsrc/dcdict_orthanc.cc
171 ) 168 )
172 169
173 170
174 # Starting with DCMTK 3.6.2, the Nagle algorithm is not disabled by 171 # Starting with DCMTK 3.6.2, the Nagle algorithm is not disabled by
175 # default since this does not seem to be appropriate (anymore) for 172 # default since this does not seem to be appropriate (anymore) for