Mercurial > hg > orthanc

comparison Resources/CMake/DcmtkConfiguration.cmake @ 3274:95b0536be2c3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
preparing for dcmtk 3.6.4
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 20 Feb 2019 17:19:27 +0100
parents 0c2a8d5e0097
children dd10fe965870
comparison
equal deleted inserted replaced
3273:45786a7c3735 3274:95b0536be2c3
1 if (NOT DEFINED ENABLE_DCMTK_NETWORKING) 1 if (NOT DEFINED ENABLE_DCMTK_NETWORKING)
2 set(ENABLE_DCMTK_NETWORKING ON) 2 set(ENABLE_DCMTK_NETWORKING ON)
3 endif() 3 endif()
4 4
5 if (STATIC_BUILD OR NOT USE_SYSTEM_DCMTK) 5 if (STATIC_BUILD OR NOT USE_SYSTEM_DCMTK)
6 if (USE_DCMTK_360) 6 if (DCMTK_STATIC_VERSION STREQUAL "3.6.0")
7 SET(DCMTK_VERSION_NUMBER 360) 7 include(${CMAKE_CURRENT_LIST_DIR}/DcmtkConfigurationStatic-3.6.0.cmake)
8 SET(DCMTK_PACKAGE_VERSION "3.6.0") 8
9 SET(DCMTK_SOURCES_DIR ${CMAKE_BINARY_DIR}/dcmtk-3.6.0) 9 elseif (DCMTK_STATIC_VERSION STREQUAL "3.6.2")
10 SET(DCMTK_URL "http://orthanc.osimis.io/ThirdPartyDownloads/dcmtk-3.6.0.zip") 10 include(${CMAKE_CURRENT_LIST_DIR}/DcmtkConfigurationStatic-3.6.2.cmake)
11 SET(DCMTK_MD5 "219ad631b82031806147e4abbfba4fa4") 11
12 #elseif (DCMTK_STATIC_VERSION STREQUAL "3.6.4")
13
12 else() 14 else()
13 SET(DCMTK_VERSION_NUMBER 362) 15 message(FATAL_ERROR "Unsupported version of DCMTK: ${DCMTK_STATIC_VERSION}")
14 SET(DCMTK_PACKAGE_VERSION "3.6.2")
15 SET(DCMTK_SOURCES_DIR ${CMAKE_BINARY_DIR}/dcmtk-3.6.2)
16 SET(DCMTK_URL "http://orthanc.osimis.io/ThirdPartyDownloads/dcmtk-3.6.2.tar.gz")
17 SET(DCMTK_MD5 "d219a4152772985191c9b89d75302d12")
18
19 macro(DCMTK_UNSET)
20 endmacro()
21
22 macro(DCMTK_UNSET_CACHE)
23 endmacro()
24
25 set(DCMTK_BINARY_DIR ${DCMTK_SOURCES_DIR}/)
26 set(DCMTK_CMAKE_INCLUDE ${DCMTK_SOURCES_DIR}/)
27 set(DCMTK_WITH_THREADS ON)
28
29 add_definitions(-DDCMTK_INSIDE_LOG4CPLUS=1)
30 endif()
31
32 if (IS_DIRECTORY "${DCMTK_SOURCES_DIR}")
33 set(FirstRun OFF)
34 else()
35 set(FirstRun ON)
36 endif()
37
38 DownloadPackage(${DCMTK_MD5} ${DCMTK_URL} "${DCMTK_SOURCES_DIR}")
39
40
41 if (FirstRun)
42 if (USE_DCMTK_360)
43 # If using DCMTK 3.6.0, backport the "private.dic" file from DCMTK
44 # 3.6.2. This adds support for more private tags, and fixes some
45 # import problems with Philips MRI Achieva.
46 if (USE_DCMTK_362_PRIVATE_DIC)
47 message("Using the dictionary of private tags from DCMTK 3.6.2")
48 configure_file(
49 ${ORTHANC_ROOT}/Resources/Patches/dcmtk-3.6.2-private.dic
50 ${DCMTK_SOURCES_DIR}/dcmdata/data/private.dic
51 COPYONLY)
52 else()
53 message("Using the dictionary of private tags from DCMTK 3.6.0")
54 endif()
55
56 # Patches specific to DCMTK 3.6.0
57 message("Applying patch to solve vulnerability in DCMTK 3.6.0")
58 execute_process(
59 COMMAND ${PATCH_EXECUTABLE} -p0 -N -i
60 ${ORTHANC_ROOT}/Resources/Patches/dcmtk-3.6.0-dulparse-vulnerability.patch
61 WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
62 RESULT_VARIABLE Failure
63 )
64
65 if (Failure)
66 message(FATAL_ERROR "Error while patching a file")
67 endif()
68
69 # This patch is not needed anymore thanks to the following commit
70 # (information sent by Jorg Riesmeier on Twitter on 2017-07-19):
71 # http://git.dcmtk.org/?p=dcmtk.git;a=commit;h=8df1f5e517b8629ae09088d0935c2a8dd333c76f
72 message("Applying patch for speed in DCMTK 3.6.0")
73 execute_process(
74 COMMAND ${PATCH_EXECUTABLE} -p0 -N -i
75 ${ORTHANC_ROOT}/Resources/Patches/dcmtk-3.6.0-speed.patch
76 WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
77 RESULT_VARIABLE Failure
78 )
79
80 if (Failure)
81 message(FATAL_ERROR "Error while patching a file")
82 endif()
83
84 else()
85 # "3.6.2 CXX11 fails on Linux; patch suggestions included"
86 # https://forum.dcmtk.org/viewtopic.php?f=3&t=4637
87 message("Applying patch to detect mathematic primitives in DCMTK 3.6.2 with C++11")
88 execute_process(
89 COMMAND ${PATCH_EXECUTABLE} -p0 -N -i
90 ${ORTHANC_ROOT}/Resources/Patches/dcmtk-3.6.2-cmath.patch
91 WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
92 RESULT_VARIABLE Failure
93 )
94
95 if (Failure)
96 message(FATAL_ERROR "Error while patching a file")
97 endif()
98 endif()
99 else()
100 message("The patches for DCMTK have already been applied")
101 endif() 16 endif()
102 17
103 18
104 # C_CHAR_UNSIGNED *must* be set before calling "GenerateDCMTKConfigure.cmake" 19 ##
105 IF (CMAKE_CROSSCOMPILING) 20 ## Commands shared by all versions of DCMTK
106 if (CMAKE_COMPILER_IS_GNUCXX AND 21 ##
107 CMAKE_SYSTEM_NAME STREQUAL "Windows") # MinGW
108 SET(C_CHAR_UNSIGNED 1 CACHE INTERNAL "Whether char is unsigned.")
109
110 elseif(CMAKE_SYSTEM_NAME STREQUAL "Emscripten") # WebAssembly or asm.js
111
112 # Check out "../WebAssembly/ArithmeticTests/" to regenerate the
113 # "arith.h" file
114 configure_file(
115 ${ORTHANC_ROOT}/Resources/WebAssembly/arith.h
116 ${DCMTK_SOURCES_DIR}/config/include/dcmtk/config/arith.h
117 COPYONLY)
118
119 UNSET(C_CHAR_UNSIGNED CACHE)
120 SET(C_CHAR_UNSIGNED 0 CACHE INTERNAL "")
121
122 else()
123 message(FATAL_ERROR "Support your platform here")
124 endif()
125 ENDIF()
126
127 22
128 if ("${CMAKE_SYSTEM_VERSION}" STREQUAL "LinuxStandardBase")
129 SET(DCMTK_ENABLE_CHARSET_CONVERSION "iconv" CACHE STRING "")
130 SET(HAVE_SYS_GETTID 0 CACHE INTERNAL "")
131
132 execute_process(
133 COMMAND ${PATCH_EXECUTABLE} -p0 -N -i
134 ${ORTHANC_ROOT}/Resources/Patches/dcmtk-3.6.2-linux-standard-base.patch
135 WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
136 RESULT_VARIABLE Failure
137 )
138
139 if (FirstRun AND Failure)
140 message(FATAL_ERROR "Error while patching a file")
141 endif()
142 endif()
143
144 SET(DCMTK_SOURCE_DIR ${DCMTK_SOURCES_DIR})
145 include(${DCMTK_SOURCES_DIR}/CMake/CheckFunctionWithHeaderExists.cmake)
146 include(${DCMTK_SOURCES_DIR}/CMake/GenerateDCMTKConfigure.cmake)
147
148
149 if (CMAKE_SYSTEM_NAME STREQUAL "Emscripten") # WebAssembly or
150 # asm.js The macros below are not properly discovered by DCMTK
151 # when using WebAssembly. Check out "../WebAssembly/arith.h" for
152 # how we produced these values. This step MUST be after
153 # "GenerateDCMTKConfigure" and before the generation of
154 # "osconfig.h".
155 UNSET(SIZEOF_VOID_P CACHE)
156 UNSET(SIZEOF_CHAR CACHE)
157 UNSET(SIZEOF_DOUBLE CACHE)
158 UNSET(SIZEOF_FLOAT CACHE)
159 UNSET(SIZEOF_INT CACHE)
160 UNSET(SIZEOF_LONG CACHE)
161 UNSET(SIZEOF_SHORT CACHE)
162 UNSET(SIZEOF_VOID_P CACHE)
163
164 SET(SIZEOF_VOID_P 4 CACHE INTERNAL "")
165 SET(SIZEOF_CHAR 1 CACHE INTERNAL "")
166 SET(SIZEOF_DOUBLE 8 CACHE INTERNAL "")
167 SET(SIZEOF_FLOAT 4 CACHE INTERNAL "")
168 SET(SIZEOF_INT 4 CACHE INTERNAL "")
169 SET(SIZEOF_LONG 4 CACHE INTERNAL "")
170 SET(SIZEOF_SHORT 2 CACHE INTERNAL "")
171 SET(SIZEOF_VOID_P 4 CACHE INTERNAL "")
172 endif()
173
174
175 set(DCMTK_PACKAGE_VERSION_SUFFIX "")
176 set(DCMTK_PACKAGE_VERSION_NUMBER ${DCMTK_VERSION_NUMBER})
177
178 CONFIGURE_FILE(
179 ${DCMTK_SOURCES_DIR}/CMake/osconfig.h.in
180 ${DCMTK_SOURCES_DIR}/config/include/dcmtk/config/osconfig.h)
181
182 if (NOT USE_DCMTK_360)
183 if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
184 link_libraries(netapi32) # For NetWkstaUserGetInfo@12
185 link_libraries(iphlpapi) # For GetAdaptersInfo@8
186
187 # Configure Wine if cross-compiling for Windows
188 if (CMAKE_COMPILER_IS_GNUCXX)
189 include(${DCMTK_SOURCES_DIR}/CMake/dcmtkUseWine.cmake)
190 FIND_PROGRAM(WINE_WINE_PROGRAM wine)
191 FIND_PROGRAM(WINE_WINEPATH_PROGRAM winepath)
192 list(APPEND DCMTK_TRY_COMPILE_REQUIRED_CMAKE_FLAGS "-DCMAKE_EXE_LINKER_FLAGS=-static")
193 endif()
194 endif()
195
196 # This step must be after the generation of "osconfig.h"
197 if (NOT CMAKE_SYSTEM_NAME STREQUAL "Emscripten")
198 INSPECT_FUNDAMENTAL_ARITHMETIC_TYPES()
199 endif()
200 endif()
201
202 AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmdata/libsrc DCMTK_SOURCES)
203 AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/ofstd/libsrc DCMTK_SOURCES)
204
205 if (ENABLE_DCMTK_NETWORKING)
206 AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmnet/libsrc DCMTK_SOURCES)
207 include_directories(
208 ${DCMTK_SOURCES_DIR}/dcmnet/include
209 )
210 endif()
211
212 if (ENABLE_DCMTK_JPEG)
213 AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmjpeg/libsrc DCMTK_SOURCES)
214 AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmjpeg/libijg8 DCMTK_SOURCES)
215 AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmjpeg/libijg12 DCMTK_SOURCES)
216 AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmjpeg/libijg16 DCMTK_SOURCES)
217 include_directories(
218 ${DCMTK_SOURCES_DIR}/dcmjpeg/include
219 ${DCMTK_SOURCES_DIR}/dcmjpeg/libijg8
220 ${DCMTK_SOURCES_DIR}/dcmjpeg/libijg12
221 ${DCMTK_SOURCES_DIR}/dcmjpeg/libijg16
222 ${DCMTK_SOURCES_DIR}/dcmimgle/include
223 )
224 list(REMOVE_ITEM DCMTK_SOURCES
225 ${DCMTK_SOURCES_DIR}/dcmjpeg/libsrc/ddpiimpl.cc
226
227 # Disable support for encoding JPEG (modification in Orthanc 1.0.1)
228 ${DCMTK_SOURCES_DIR}/dcmjpeg/libsrc/djcodece.cc
229 ${DCMTK_SOURCES_DIR}/dcmjpeg/libsrc/djencsv1.cc
230 ${DCMTK_SOURCES_DIR}/dcmjpeg/libsrc/djencbas.cc
231 ${DCMTK_SOURCES_DIR}/dcmjpeg/libsrc/djencpro.cc
232 ${DCMTK_SOURCES_DIR}/dcmjpeg/libsrc/djenclol.cc
233 ${DCMTK_SOURCES_DIR}/dcmjpeg/libsrc/djencode.cc
234 ${DCMTK_SOURCES_DIR}/dcmjpeg/libsrc/djencext.cc
235 ${DCMTK_SOURCES_DIR}/dcmjpeg/libsrc/djencsps.cc
236 )
237 endif()
238
239
240 if (ENABLE_DCMTK_JPEG_LOSSLESS)
241 AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmjpls/libsrc DCMTK_SOURCES)
242 AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmjpls/libcharls DCMTK_SOURCES)
243 include_directories(
244 ${DCMTK_SOURCES_DIR}/dcmjpeg/include
245 ${DCMTK_SOURCES_DIR}/dcmjpls/include
246 ${DCMTK_SOURCES_DIR}/dcmjpls/libcharls
247 )
248 list(REMOVE_ITEM DCMTK_SOURCES
249 ${DCMTK_SOURCES_DIR}/dcmjpls/libsrc/djcodece.cc
250
251 # Disable support for encoding JPEG-LS (modification in Orthanc 1.0.1)
252 ${DCMTK_SOURCES_DIR}/dcmjpls/libsrc/djencode.cc
253 )
254 list(APPEND DCMTK_SOURCES
255 ${DCMTK_SOURCES_DIR}/dcmjpeg/libsrc/djrplol.cc
256 )
257 endif()
258
259
260 # Source for the logging facility of DCMTK
261 AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/oflog/libsrc DCMTK_SOURCES)
262 if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux" OR
263 ${CMAKE_SYSTEM_NAME} STREQUAL "Darwin" OR
264 ${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD" OR
265 ${CMAKE_SYSTEM_NAME} STREQUAL "kFreeBSD" OR
266 ${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD" OR
267 ${CMAKE_SYSTEM_NAME} STREQUAL "Emscripten")
268 list(REMOVE_ITEM DCMTK_SOURCES
269 ${DCMTK_SOURCES_DIR}/oflog/libsrc/clfsap.cc
270 ${DCMTK_SOURCES_DIR}/oflog/libsrc/windebap.cc
271 ${DCMTK_SOURCES_DIR}/oflog/libsrc/winsock.cc
272 )
273
274 elseif (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
275 list(REMOVE_ITEM DCMTK_SOURCES
276 ${DCMTK_SOURCES_DIR}/oflog/libsrc/unixsock.cc
277 ${DCMTK_SOURCES_DIR}/oflog/libsrc/clfsap.cc
278 )
279
280 if (CMAKE_COMPILER_IS_GNUCXX AND
281 USE_DCMTK_360)
282 # This is a patch for MinGW64
283 execute_process(
284 COMMAND ${PATCH_EXECUTABLE} -p0 -N -i
285 ${ORTHANC_ROOT}/Resources/Patches/dcmtk-3.6.0-mingw64.patch
286 WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
287 RESULT_VARIABLE Failure
288 )
289
290 if (Failure AND FirstRun)
291 message(FATAL_ERROR "Error while patching a file")
292 endif()
293 endif()
294 endif()
295
296
297 if (NOT USE_DCMTK_360 AND
298 ORTHANC_SANDBOXED)
299 configure_file(
300 ${ORTHANC_ROOT}/Resources/WebAssembly/dcdict.h
301 ${DCMTK_SOURCES_DIR}/dcmdata/include/dcmtk/dcmdata/dcdict.h
302 COPYONLY)
303
304 configure_file(
305 ${ORTHANC_ROOT}/Resources/WebAssembly/dcdict.cc
306 ${DCMTK_SOURCES_DIR}/dcmdata/libsrc/dcdict.cc
307 COPYONLY)
308 endif()
309
310
311 list(REMOVE_ITEM DCMTK_SOURCES
312 ${DCMTK_SOURCES_DIR}/dcmdata/libsrc/mkdictbi.cc
313 ${DCMTK_SOURCES_DIR}/dcmdata/libsrc/mkdeftag.cc
314 )
315
316 #set_source_files_properties(${DCMTK_SOURCES}
317 # PROPERTIES COMPILE_DEFINITIONS
318 # "PACKAGE_VERSION=\"${DCMTK_PACKAGE_VERSION}\";PACKAGE_VERSION_NUMBER=\"${DCMTK_VERSION_NUMBER}\"")
319
320 # This fixes crashes related to the destruction of the DCMTK OFLogger 23 # This fixes crashes related to the destruction of the DCMTK OFLogger
321 # http://support.dcmtk.org/docs-snapshot/file_macros.html 24 # http://support.dcmtk.org/docs-snapshot/file_macros.html
322 add_definitions( 25 add_definitions(
323 -DLOG4CPLUS_DISABLE_FATAL=1 26 -DLOG4CPLUS_DISABLE_FATAL=1
324 -DDCMTK_VERSION_NUMBER=${DCMTK_VERSION_NUMBER} 27 -DDCMTK_VERSION_NUMBER=${DCMTK_VERSION_NUMBER}
344 ${DCMTK_SOURCES_DIR}/dcmdata/include 47 ${DCMTK_SOURCES_DIR}/dcmdata/include
345 ) 48 )
346 49
347 source_group(ThirdParty\\Dcmtk REGULAR_EXPRESSION ${DCMTK_SOURCES_DIR}/.*) 50 source_group(ThirdParty\\Dcmtk REGULAR_EXPRESSION ${DCMTK_SOURCES_DIR}/.*)
348 51
349 set(DCMTK_BUNDLES_LOG4CPLUS 1)
350
351 if (STANDALONE_BUILD) 52 if (STANDALONE_BUILD)
352 set(DCMTK_USE_EMBEDDED_DICTIONARIES 1) 53 set(DCMTK_USE_EMBEDDED_DICTIONARIES 1)
353 set(DCMTK_DICTIONARIES 54 set(DCMTK_DICTIONARIES
354 DICTIONARY_DICOM ${DCMTK_SOURCES_DIR}/dcmdata/data/dicom.dic 55 DICTIONARY_DICOM ${DCMTK_SOURCES_DIR}/dcmdata/data/dicom.dic
355 DICTIONARY_PRIVATE ${DCMTK_SOURCES_DIR}/dcmdata/data/private.dic 56 DICTIONARY_PRIVATE ${DCMTK_SOURCES_DIR}/dcmdata/data/private.dic
356 DICTIONARY_DICONDE ${DCMTK_SOURCES_DIR}/dcmdata/data/diconde.dic 57 DICTIONARY_DICONDE ${DCMTK_SOURCES_DIR}/dcmdata/data/diconde.dic
357 ) 58 )
358 else() 59 else()
359 set(DCMTK_USE_EMBEDDED_DICTIONARIES 0) 60 set(DCMTK_USE_EMBEDDED_DICTIONARIES 0)
360 endif() 61 endif()
62
361 63
362 else() 64 else()
363 # The following line allows to manually add libraries at the 65 # The following line allows to manually add libraries at the
364 # command-line, which is necessary for Ubuntu/Debian packages 66 # command-line, which is necessary for Ubuntu/Debian packages
365 set(tmp "${DCMTK_LIBRARIES}") 67 set(tmp "${DCMTK_LIBRARIES}")