comparison Resources/CMake/DcmtkConfigurationStatic-3.6.0.cmake @ 3274:95b0536be2c3

preparing for dcmtk 3.6.4
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 20 Feb 2019 17:19:27 +0100
parents
children dd10fe965870
comparison
equal deleted inserted replaced
3273:45786a7c3735 3274:95b0536be2c3
1 SET(DCMTK_VERSION_NUMBER 360)
2 SET(DCMTK_PACKAGE_VERSION "3.6.0")
3 SET(DCMTK_SOURCES_DIR ${CMAKE_BINARY_DIR}/dcmtk-3.6.0)
4 SET(DCMTK_URL "http://orthanc.osimis.io/ThirdPartyDownloads/dcmtk-3.6.0.zip")
5 SET(DCMTK_MD5 "219ad631b82031806147e4abbfba4fa4")
6
7 if (IS_DIRECTORY "${DCMTK_SOURCES_DIR}")
8 set(FirstRun OFF)
9 else()
10 set(FirstRun ON)
11 endif()
12
13 DownloadPackage(${DCMTK_MD5} ${DCMTK_URL} "${DCMTK_SOURCES_DIR}")
14
15
16 if (FirstRun)
17 # If using DCMTK 3.6.0, backport the "private.dic" file from DCMTK
18 # 3.6.2. This adds support for more private tags, and fixes some
19 # import problems with Philips MRI Achieva.
20 if (USE_DCMTK_362_PRIVATE_DIC)
21 message("Using the dictionary of private tags from DCMTK 3.6.2")
22 configure_file(
23 ${ORTHANC_ROOT}/Resources/Patches/dcmtk-3.6.2-private.dic
24 ${DCMTK_SOURCES_DIR}/dcmdata/data/private.dic
25 COPYONLY)
26 else()
27 message("Using the dictionary of private tags from DCMTK 3.6.0")
28 endif()
29
30 # Patches specific to DCMTK 3.6.0
31 message("Applying patch to solve vulnerability in DCMTK 3.6.0")
32 execute_process(
33 COMMAND ${PATCH_EXECUTABLE} -p0 -N -i
34 ${ORTHANC_ROOT}/Resources/Patches/dcmtk-3.6.0-dulparse-vulnerability.patch
35 WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
36 RESULT_VARIABLE Failure
37 )
38
39 if (Failure)
40 message(FATAL_ERROR "Error while patching a file")
41 endif()
42
43 # This patch is not needed anymore thanks to the following commit
44 # (information sent by Jorg Riesmeier on Twitter on 2017-07-19):
45 # http://git.dcmtk.org/?p=dcmtk.git;a=commit;h=8df1f5e517b8629ae09088d0935c2a8dd333c76f
46 message("Applying patch for speed in DCMTK 3.6.0")
47 execute_process(
48 COMMAND ${PATCH_EXECUTABLE} -p0 -N -i
49 ${ORTHANC_ROOT}/Resources/Patches/dcmtk-3.6.0-speed.patch
50 WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
51 RESULT_VARIABLE Failure
52 )
53
54 if (Failure)
55 message(FATAL_ERROR "Error while patching a file")
56 endif()
57 else()
58 message("The patches for DCMTK have already been applied")
59 endif()
60
61
62 # C_CHAR_UNSIGNED *must* be set before calling "GenerateDCMTKConfigure.cmake"
63 IF (CMAKE_CROSSCOMPILING)
64 if (CMAKE_COMPILER_IS_GNUCXX AND
65 CMAKE_SYSTEM_NAME STREQUAL "Windows") # MinGW
66 SET(C_CHAR_UNSIGNED 1 CACHE INTERNAL "Whether char is unsigned.")
67
68 elseif(CMAKE_SYSTEM_NAME STREQUAL "Emscripten") # WebAssembly or asm.js
69
70 # Check out "../WebAssembly/ArithmeticTests/" to regenerate the
71 # "arith.h" file
72 configure_file(
73 ${ORTHANC_ROOT}/Resources/WebAssembly/arith.h
74 ${DCMTK_SOURCES_DIR}/config/include/dcmtk/config/arith.h
75 COPYONLY)
76
77 UNSET(C_CHAR_UNSIGNED CACHE)
78 SET(C_CHAR_UNSIGNED 0 CACHE INTERNAL "")
79
80 else()
81 message(FATAL_ERROR "Support your platform here")
82 endif()
83 ENDIF()
84
85
86 if ("${CMAKE_SYSTEM_VERSION}" STREQUAL "LinuxStandardBase")
87 SET(DCMTK_ENABLE_CHARSET_CONVERSION "iconv" CACHE STRING "")
88 SET(HAVE_SYS_GETTID 0 CACHE INTERNAL "")
89
90 execute_process(
91 COMMAND ${PATCH_EXECUTABLE} -p0 -N -i
92 ${ORTHANC_ROOT}/Resources/Patches/dcmtk-3.6.2-linux-standard-base.patch
93 WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
94 RESULT_VARIABLE Failure
95 )
96
97 if (FirstRun AND Failure)
98 message(FATAL_ERROR "Error while patching a file")
99 endif()
100 endif()
101
102 SET(DCMTK_SOURCE_DIR ${DCMTK_SOURCES_DIR})
103 include(${DCMTK_SOURCES_DIR}/CMake/CheckFunctionWithHeaderExists.cmake)
104 include(${DCMTK_SOURCES_DIR}/CMake/GenerateDCMTKConfigure.cmake)
105
106
107 if (CMAKE_SYSTEM_NAME STREQUAL "Emscripten") # WebAssembly or
108 # asm.js The macros below are not properly discovered by DCMTK
109 # when using WebAssembly. Check out "../WebAssembly/arith.h" for
110 # how we produced these values. This step MUST be after
111 # "GenerateDCMTKConfigure" and before the generation of
112 # "osconfig.h".
113 UNSET(SIZEOF_VOID_P CACHE)
114 UNSET(SIZEOF_CHAR CACHE)
115 UNSET(SIZEOF_DOUBLE CACHE)
116 UNSET(SIZEOF_FLOAT CACHE)
117 UNSET(SIZEOF_INT CACHE)
118 UNSET(SIZEOF_LONG CACHE)
119 UNSET(SIZEOF_SHORT CACHE)
120 UNSET(SIZEOF_VOID_P CACHE)
121
122 SET(SIZEOF_VOID_P 4 CACHE INTERNAL "")
123 SET(SIZEOF_CHAR 1 CACHE INTERNAL "")
124 SET(SIZEOF_DOUBLE 8 CACHE INTERNAL "")
125 SET(SIZEOF_FLOAT 4 CACHE INTERNAL "")
126 SET(SIZEOF_INT 4 CACHE INTERNAL "")
127 SET(SIZEOF_LONG 4 CACHE INTERNAL "")
128 SET(SIZEOF_SHORT 2 CACHE INTERNAL "")
129 SET(SIZEOF_VOID_P 4 CACHE INTERNAL "")
130 endif()
131
132
133 set(DCMTK_PACKAGE_VERSION_SUFFIX "")
134 set(DCMTK_PACKAGE_VERSION_NUMBER ${DCMTK_VERSION_NUMBER})
135
136 CONFIGURE_FILE(
137 ${DCMTK_SOURCES_DIR}/CMake/osconfig.h.in
138 ${DCMTK_SOURCES_DIR}/config/include/dcmtk/config/osconfig.h)
139
140 AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmdata/libsrc DCMTK_SOURCES)
141 AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/ofstd/libsrc DCMTK_SOURCES)
142
143 if (ENABLE_DCMTK_NETWORKING)
144 AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmnet/libsrc DCMTK_SOURCES)
145 include_directories(
146 ${DCMTK_SOURCES_DIR}/dcmnet/include
147 )
148 endif()
149
150 if (ENABLE_DCMTK_JPEG)
151 AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmjpeg/libsrc DCMTK_SOURCES)
152 AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmjpeg/libijg8 DCMTK_SOURCES)
153 AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmjpeg/libijg12 DCMTK_SOURCES)
154 AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmjpeg/libijg16 DCMTK_SOURCES)
155 include_directories(
156 ${DCMTK_SOURCES_DIR}/dcmjpeg/include
157 ${DCMTK_SOURCES_DIR}/dcmjpeg/libijg8
158 ${DCMTK_SOURCES_DIR}/dcmjpeg/libijg12
159 ${DCMTK_SOURCES_DIR}/dcmjpeg/libijg16
160 ${DCMTK_SOURCES_DIR}/dcmimgle/include
161 )
162 list(REMOVE_ITEM DCMTK_SOURCES
163 ${DCMTK_SOURCES_DIR}/dcmjpeg/libsrc/ddpiimpl.cc
164
165 # Disable support for encoding JPEG (modification in Orthanc 1.0.1)
166 ${DCMTK_SOURCES_DIR}/dcmjpeg/libsrc/djcodece.cc
167 ${DCMTK_SOURCES_DIR}/dcmjpeg/libsrc/djencsv1.cc
168 ${DCMTK_SOURCES_DIR}/dcmjpeg/libsrc/djencbas.cc
169 ${DCMTK_SOURCES_DIR}/dcmjpeg/libsrc/djencpro.cc
170 ${DCMTK_SOURCES_DIR}/dcmjpeg/libsrc/djenclol.cc
171 ${DCMTK_SOURCES_DIR}/dcmjpeg/libsrc/djencode.cc
172 ${DCMTK_SOURCES_DIR}/dcmjpeg/libsrc/djencext.cc
173 ${DCMTK_SOURCES_DIR}/dcmjpeg/libsrc/djencsps.cc
174 )
175 endif()
176
177
178 if (ENABLE_DCMTK_JPEG_LOSSLESS)
179 AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmjpls/libsrc DCMTK_SOURCES)
180 AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmjpls/libcharls DCMTK_SOURCES)
181 include_directories(
182 ${DCMTK_SOURCES_DIR}/dcmjpeg/include
183 ${DCMTK_SOURCES_DIR}/dcmjpls/include
184 ${DCMTK_SOURCES_DIR}/dcmjpls/libcharls
185 )
186 list(REMOVE_ITEM DCMTK_SOURCES
187 ${DCMTK_SOURCES_DIR}/dcmjpls/libsrc/djcodece.cc
188
189 # Disable support for encoding JPEG-LS (modification in Orthanc 1.0.1)
190 ${DCMTK_SOURCES_DIR}/dcmjpls/libsrc/djencode.cc
191 )
192 list(APPEND DCMTK_SOURCES
193 ${DCMTK_SOURCES_DIR}/dcmjpeg/libsrc/djrplol.cc
194 )
195 endif()
196
197
198 # Source for the logging facility of DCMTK
199 AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/oflog/libsrc DCMTK_SOURCES)
200 if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux" OR
201 ${CMAKE_SYSTEM_NAME} STREQUAL "Darwin" OR
202 ${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD" OR
203 ${CMAKE_SYSTEM_NAME} STREQUAL "kFreeBSD" OR
204 ${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD" OR
205 ${CMAKE_SYSTEM_NAME} STREQUAL "Emscripten")
206 list(REMOVE_ITEM DCMTK_SOURCES
207 ${DCMTK_SOURCES_DIR}/oflog/libsrc/clfsap.cc
208 ${DCMTK_SOURCES_DIR}/oflog/libsrc/windebap.cc
209 ${DCMTK_SOURCES_DIR}/oflog/libsrc/winsock.cc
210 )
211
212 elseif (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
213 list(REMOVE_ITEM DCMTK_SOURCES
214 ${DCMTK_SOURCES_DIR}/oflog/libsrc/unixsock.cc
215 ${DCMTK_SOURCES_DIR}/oflog/libsrc/clfsap.cc
216 )
217
218 if (CMAKE_COMPILER_IS_GNUCXX)
219 # This is a patch for DCMTK 3.6.0 and MinGW64
220 execute_process(
221 COMMAND ${PATCH_EXECUTABLE} -p0 -N -i
222 ${ORTHANC_ROOT}/Resources/Patches/dcmtk-3.6.0-mingw64.patch
223 WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
224 RESULT_VARIABLE Failure
225 )
226
227 if (Failure AND FirstRun)
228 message(FATAL_ERROR "Error while patching a file")
229 endif()
230 endif()
231 endif()
232
233
234 list(REMOVE_ITEM DCMTK_SOURCES
235 ${DCMTK_SOURCES_DIR}/dcmdata/libsrc/mkdictbi.cc
236 ${DCMTK_SOURCES_DIR}/dcmdata/libsrc/mkdeftag.cc
237 )