Mercurial > hg > orthanc
annotate OrthancFramework/Resources/CMake/DcmtkConfigurationStatic-3.6.7.cmake @ 5669:f690568f0325
Fix C-Find queries not returning computed tags in very specific use-cases
| author | Alain Mazy <am@orthanc.team> |
|---|---|
| date | Fri, 05 Jul 2024 19:18:23 +0200 |
| parents | f7adfb22e20e |
| children |
| rev | line source |
|---|---|
| 5067 | 1 # Orthanc - A Lightweight, RESTful DICOM Store |
| 2 # Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics | |
| 3 # Department, University Hospital of Liege, Belgium | |
|
5640
f7adfb22e20e
updated copyright, as Orthanc Team now replaces Osimis
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5485
diff
changeset
|
4 # Copyright (C) 2017-2023 Osimis S.A., Belgium |
|
f7adfb22e20e
updated copyright, as Orthanc Team now replaces Osimis
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5485
diff
changeset
|
5 # Copyright (C) 2024-2024 Orthanc Team SRL, Belgium |
|
5485
48b8dae6dc77
upgrade to year 2024
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5434
diff
changeset
|
6 # Copyright (C) 2021-2024 Sebastien Jodogne, ICTEAM UCLouvain, Belgium |
| 5067 | 7 # |
| 8 # This program is free software: you can redistribute it and/or | |
| 9 # modify it under the terms of the GNU Lesser General Public License | |
| 10 # as published by the Free Software Foundation, either version 3 of | |
| 11 # the License, or (at your option) any later version. | |
| 12 # | |
| 13 # This program is distributed in the hope that it will be useful, but | |
| 14 # WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 15 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 16 # Lesser General Public License for more details. | |
| 17 # | |
| 18 # You should have received a copy of the GNU Lesser General Public | |
| 19 # License along with this program. If not, see | |
| 20 # <http://www.gnu.org/licenses/>. | |
| 21 | |
| 22 | |
| 23 SET(DCMTK_VERSION_NUMBER 367) | |
| 24 SET(DCMTK_PACKAGE_VERSION "3.6.7") | |
| 25 SET(DCMTK_SOURCES_DIR ${CMAKE_BINARY_DIR}/dcmtk-3.6.7) | |
|
5434
aa1c09fa6632
changed location of third-party downloads
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5271
diff
changeset
|
26 SET(DCMTK_URL "https://orthanc.uclouvain.be/downloads/third-party-downloads/dcmtk-3.6.7.tar.gz") |
| 5067 | 27 SET(DCMTK_MD5 "e4d519bb315ec3944f3f1d61df465cbd") |
| 28 | |
| 29 macro(DCMTK_UNSET) | |
| 30 endmacro() | |
| 31 | |
| 32 macro(DCMTK_UNSET_CACHE) | |
| 33 endmacro() | |
| 34 | |
| 35 set(DCMTK_BINARY_DIR ${DCMTK_SOURCES_DIR}/) | |
| 36 set(DCMTK_CMAKE_INCLUDE ${DCMTK_SOURCES_DIR}/) | |
| 37 | |
| 38 if (CMAKE_SYSTEM_NAME STREQUAL "Emscripten") | |
| 39 set(DCMTK_WITH_THREADS OFF) # Disable thread support in wasm/asm.js | |
| 40 else() | |
| 41 set(DCMTK_WITH_THREADS ON) | |
| 42 endif() | |
| 43 | |
| 44 add_definitions(-DDCMTK_INSIDE_LOG4CPLUS=1) | |
| 45 | |
| 46 if (IS_DIRECTORY "${DCMTK_SOURCES_DIR}") | |
| 47 set(FirstRun OFF) | |
| 48 else() | |
| 49 set(FirstRun ON) | |
| 50 endif() | |
| 51 | |
| 52 DownloadPackage(${DCMTK_MD5} ${DCMTK_URL} "${DCMTK_SOURCES_DIR}") | |
| 53 | |
| 54 | |
| 55 if (FirstRun) | |
| 56 # Apply the patches | |
| 57 execute_process( | |
| 58 COMMAND ${PATCH_EXECUTABLE} -p0 -N -i | |
| 59 ${CMAKE_CURRENT_LIST_DIR}/../Patches/dcmtk-3.6.7.patch | |
| 60 WORKING_DIRECTORY ${CMAKE_BINARY_DIR} | |
| 61 RESULT_VARIABLE Failure | |
| 62 ) | |
| 63 | |
| 64 if (Failure) | |
| 65 message(FATAL_ERROR "Error while patching a file") | |
| 66 endif() | |
| 67 | |
|
5075
a342e561c29d
fix MSVC2008 build
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5072
diff
changeset
|
68 if (MSVC) |
|
a342e561c29d
fix MSVC2008 build
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5072
diff
changeset
|
69 # Older versions of Microsoft Visual Studio (notably MSVC2008) |
|
a342e561c29d
fix MSVC2008 build
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5072
diff
changeset
|
70 # don't like void usage of function arguments in C source files, |
|
a342e561c29d
fix MSVC2008 build
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5072
diff
changeset
|
71 # in order to avoid a warning about unused arguments. This patch |
|
a342e561c29d
fix MSVC2008 build
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5072
diff
changeset
|
72 # removes such usages that were not present in DCMTK <= 3.6.6. |
|
a342e561c29d
fix MSVC2008 build
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5072
diff
changeset
|
73 execute_process( |
|
a342e561c29d
fix MSVC2008 build
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5072
diff
changeset
|
74 COMMAND ${PATCH_EXECUTABLE} -p0 -N -i |
|
a342e561c29d
fix MSVC2008 build
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5072
diff
changeset
|
75 ${CMAKE_CURRENT_LIST_DIR}/../Patches/dcmtk-3.6.7-visual-studio.patch |
|
a342e561c29d
fix MSVC2008 build
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5072
diff
changeset
|
76 WORKING_DIRECTORY ${CMAKE_BINARY_DIR} |
|
a342e561c29d
fix MSVC2008 build
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5072
diff
changeset
|
77 RESULT_VARIABLE Failure |
|
a342e561c29d
fix MSVC2008 build
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5072
diff
changeset
|
78 ) |
|
a342e561c29d
fix MSVC2008 build
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5072
diff
changeset
|
79 |
|
a342e561c29d
fix MSVC2008 build
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5072
diff
changeset
|
80 if (Failure) |
|
a342e561c29d
fix MSVC2008 build
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5072
diff
changeset
|
81 message(FATAL_ERROR "Error while patching a file") |
|
a342e561c29d
fix MSVC2008 build
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5072
diff
changeset
|
82 endif() |
|
a342e561c29d
fix MSVC2008 build
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5072
diff
changeset
|
83 endif() |
|
a342e561c29d
fix MSVC2008 build
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5072
diff
changeset
|
84 |
| 5067 | 85 configure_file( |
| 86 ${CMAKE_CURRENT_LIST_DIR}/../Patches/dcmtk-dcdict_orthanc.cc | |
| 87 ${DCMTK_SOURCES_DIR}/dcmdata/libsrc/dcdict_orthanc.cc | |
| 88 COPYONLY) | |
| 89 else() | |
| 90 message("The patches for DCMTK have already been applied") | |
| 91 endif() | |
| 92 | |
| 93 | |
| 94 include_directories( | |
| 95 ${DCMTK_SOURCES_DIR}/dcmiod/include | |
| 96 ) | |
| 97 | |
| 98 | |
| 99 # C_CHAR_UNSIGNED *must* be set before calling "GenerateDCMTKConfigure.cmake" | |
| 100 IF (CMAKE_CROSSCOMPILING) | |
| 101 if (CMAKE_COMPILER_IS_GNUCXX AND | |
| 102 CMAKE_SYSTEM_NAME STREQUAL "Windows") # MinGW | |
| 103 SET(C_CHAR_UNSIGNED 1 CACHE INTERNAL "Whether char is unsigned.") | |
| 104 | |
| 105 elseif(CMAKE_SYSTEM_NAME STREQUAL "Emscripten") # WebAssembly or asm.js | |
| 106 | |
| 107 # Check out "../WebAssembly/ArithmeticTests/" to regenerate the | |
| 108 # "arith.h" file | |
| 109 configure_file( | |
| 110 ${CMAKE_CURRENT_LIST_DIR}/WebAssembly/arith.h | |
| 111 ${DCMTK_SOURCES_DIR}/config/include/dcmtk/config/arith.h | |
| 112 COPYONLY) | |
| 113 | |
| 114 UNSET(C_CHAR_UNSIGNED CACHE) | |
| 115 SET(C_CHAR_UNSIGNED 0 CACHE INTERNAL "") | |
| 116 | |
| 117 else() | |
| 118 message(FATAL_ERROR "Support your platform here") | |
| 119 endif() | |
| 120 ENDIF() | |
| 121 | |
| 122 | |
| 123 if ("${CMAKE_SYSTEM_VERSION}" STREQUAL "LinuxStandardBase") | |
| 124 SET(DCMTK_ENABLE_CHARSET_CONVERSION "iconv" CACHE STRING "") | |
| 125 SET(HAVE_SYS_GETTID 0 CACHE INTERNAL "") | |
| 126 endif() | |
| 127 | |
| 128 | |
| 129 SET(DCMTK_SOURCE_DIR ${DCMTK_SOURCES_DIR}) | |
| 130 include(${DCMTK_SOURCES_DIR}/CMake/CheckFunctionWithHeaderExists.cmake) | |
| 131 include(${DCMTK_SOURCES_DIR}/CMake/GenerateDCMTKConfigure.cmake) | |
| 132 | |
| 133 | |
| 134 if (CMAKE_SYSTEM_NAME STREQUAL "Emscripten") # WebAssembly or | |
| 135 # asm.js The macros below are not properly discovered by DCMTK | |
| 136 # when using WebAssembly. Check out "../WebAssembly/arith.h" for | |
| 137 # how we produced these values. This step MUST be after | |
| 138 # "GenerateDCMTKConfigure" and before the generation of | |
| 139 # "osconfig.h". | |
| 140 UNSET(SIZEOF_VOID_P CACHE) | |
| 141 UNSET(SIZEOF_CHAR CACHE) | |
| 142 UNSET(SIZEOF_DOUBLE CACHE) | |
| 143 UNSET(SIZEOF_FLOAT CACHE) | |
| 144 UNSET(SIZEOF_INT CACHE) | |
| 145 UNSET(SIZEOF_LONG CACHE) | |
| 146 UNSET(SIZEOF_SHORT CACHE) | |
| 147 UNSET(SIZEOF_VOID_P CACHE) | |
| 148 | |
| 149 SET(SIZEOF_VOID_P 4 CACHE INTERNAL "") | |
| 150 SET(SIZEOF_CHAR 1 CACHE INTERNAL "") | |
| 151 SET(SIZEOF_DOUBLE 8 CACHE INTERNAL "") | |
| 152 SET(SIZEOF_FLOAT 4 CACHE INTERNAL "") | |
| 153 SET(SIZEOF_INT 4 CACHE INTERNAL "") | |
| 154 SET(SIZEOF_LONG 4 CACHE INTERNAL "") | |
| 155 SET(SIZEOF_SHORT 2 CACHE INTERNAL "") | |
| 156 SET(SIZEOF_VOID_P 4 CACHE INTERNAL "") | |
| 157 endif() | |
| 158 | |
| 159 | |
| 160 set(DCMTK_PACKAGE_VERSION_SUFFIX "") | |
| 161 set(DCMTK_PACKAGE_VERSION_NUMBER ${DCMTK_VERSION_NUMBER}) | |
| 162 | |
| 163 | |
| 164 # For the dcmtls module, necessary since DCMTK 3.6.7 (cf. file | |
| 165 # "dcmtls/libsrc/tlslayer.cc"). This must be done before the | |
| 166 # invokation of "configure_file()"! | |
|
5071
8fbe84997e23
another try to fix
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5069
diff
changeset
|
167 if (STATIC_BUILD OR NOT USE_SYSTEM_OPENSSL) |
|
5072
b23a4bb18065
replaced bzero() by memset()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5071
diff
changeset
|
168 # The "CHECK_FUNCTIONWITHHEADER_EXISTS()" provided by DCMTK only |
|
b23a4bb18065
replaced bzero() by memset()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5071
diff
changeset
|
169 # works with the system-wide version of OpenSSL. If statically |
|
b23a4bb18065
replaced bzero() by memset()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5071
diff
changeset
|
170 # linking against OpenSSL, we manually provide information about |
|
b23a4bb18065
replaced bzero() by memset()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5071
diff
changeset
|
171 # OpenSSL 3.0.x |
|
5071
8fbe84997e23
another try to fix
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5069
diff
changeset
|
172 set(HAVE_OPENSSL_PROTOTYPE_DH_BITS 1) |
|
8fbe84997e23
another try to fix
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5069
diff
changeset
|
173 set(HAVE_OPENSSL_PROTOTYPE_EVP_PKEY_BASE_ID 1) |
|
8fbe84997e23
another try to fix
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5069
diff
changeset
|
174 set(HAVE_OPENSSL_PROTOTYPE_SSL_CTX_GET0_PARAM 1) |
|
8fbe84997e23
another try to fix
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5069
diff
changeset
|
175 set(HAVE_OPENSSL_PROTOTYPE_SSL_CTX_GET_CERT_STORE 1) |
|
8fbe84997e23
another try to fix
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5069
diff
changeset
|
176 set(HAVE_OPENSSL_PROTOTYPE_SSL_CTX_GET_CIPHERS 1) |
|
8fbe84997e23
another try to fix
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5069
diff
changeset
|
177 set(HAVE_OPENSSL_PROTOTYPE_X509_GET_SIGNATURE_NID 1) |
|
8fbe84997e23
another try to fix
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5069
diff
changeset
|
178 set(HAVE_OPENSSL_PROTOTYPE_X509_STORE_GET0_PARAM 1) |
|
8fbe84997e23
another try to fix
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5069
diff
changeset
|
179 else() |
|
8fbe84997e23
another try to fix
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5069
diff
changeset
|
180 CHECK_FUNCTIONWITHHEADER_EXISTS("DH_bits" "openssl/dh.h" HAVE_OPENSSL_PROTOTYPE_DH_BITS) |
|
8fbe84997e23
another try to fix
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5069
diff
changeset
|
181 CHECK_FUNCTIONWITHHEADER_EXISTS("EVP_PKEY_base_id" "openssl/evp.h" HAVE_OPENSSL_PROTOTYPE_EVP_PKEY_BASE_ID) |
|
8fbe84997e23
another try to fix
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5069
diff
changeset
|
182 CHECK_FUNCTIONWITHHEADER_EXISTS("SSL_CTX_get0_param" "openssl/ssl.h" HAVE_OPENSSL_PROTOTYPE_SSL_CTX_GET0_PARAM) |
|
8fbe84997e23
another try to fix
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5069
diff
changeset
|
183 CHECK_FUNCTIONWITHHEADER_EXISTS("SSL_CTX_get_cert_store" "openssl/ssl.h" HAVE_OPENSSL_PROTOTYPE_SSL_CTX_GET_CERT_STORE) |
|
8fbe84997e23
another try to fix
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5069
diff
changeset
|
184 CHECK_FUNCTIONWITHHEADER_EXISTS("SSL_CTX_get_ciphers" "openssl/ssl.h" HAVE_OPENSSL_PROTOTYPE_SSL_CTX_GET_CIPHERS) |
|
8fbe84997e23
another try to fix
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5069
diff
changeset
|
185 CHECK_FUNCTIONWITHHEADER_EXISTS("X509_STORE_get0_param" "openssl/x509.h" HAVE_OPENSSL_PROTOTYPE_X509_STORE_GET0_PARAM) |
|
8fbe84997e23
another try to fix
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5069
diff
changeset
|
186 CHECK_FUNCTIONWITHHEADER_EXISTS("X509_get_signature_nid" "openssl/x509.h" HAVE_OPENSSL_PROTOTYPE_X509_GET_SIGNATURE_NID) |
|
8fbe84997e23
another try to fix
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5069
diff
changeset
|
187 endif() |
| 5067 | 188 |
| 189 | |
| 190 CONFIGURE_FILE( | |
| 191 ${DCMTK_SOURCES_DIR}/CMake/osconfig.h.in | |
| 192 ${DCMTK_SOURCES_DIR}/config/include/dcmtk/config/osconfig.h) | |
| 193 | |
| 194 | |
| 195 | |
| 196 if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows") | |
| 197 link_libraries(netapi32) # For NetWkstaUserGetInfo@12 | |
| 198 link_libraries(iphlpapi) # For GetAdaptersInfo@8 | |
| 199 | |
| 200 # Configure Wine if cross-compiling for Windows | |
| 201 if (CMAKE_COMPILER_IS_GNUCXX) | |
| 202 include(${DCMTK_SOURCES_DIR}/CMake/dcmtkUseWine.cmake) | |
| 203 FIND_PROGRAM(WINE_WINE_PROGRAM wine) | |
| 204 FIND_PROGRAM(WINE_WINEPATH_PROGRAM winepath) | |
| 205 list(APPEND DCMTK_TRY_COMPILE_REQUIRED_CMAKE_FLAGS "-DCMAKE_EXE_LINKER_FLAGS=-static") | |
| 206 endif() | |
| 207 endif() | |
| 208 | |
| 209 # This step must be after the generation of "osconfig.h" | |
| 210 if (NOT CMAKE_SYSTEM_NAME STREQUAL "Emscripten") | |
| 211 INSPECT_FUNDAMENTAL_ARITHMETIC_TYPES() | |
| 212 endif() | |
| 213 | |
| 214 | |
| 215 # Source for the logging facility of DCMTK | |
| 216 AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/oflog/libsrc DCMTK_SOURCES) | |
| 217 if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux" OR | |
| 218 ${CMAKE_SYSTEM_NAME} STREQUAL "Darwin" OR | |
| 219 ${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD" OR | |
| 220 ${CMAKE_SYSTEM_NAME} STREQUAL "kFreeBSD" OR | |
| 221 ${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD" OR | |
| 222 ${CMAKE_SYSTEM_NAME} STREQUAL "Emscripten") | |
| 223 list(REMOVE_ITEM DCMTK_SOURCES | |
| 224 ${DCMTK_SOURCES_DIR}/oflog/libsrc/clfsap.cc | |
| 225 ${DCMTK_SOURCES_DIR}/oflog/libsrc/windebap.cc | |
| 226 ${DCMTK_SOURCES_DIR}/oflog/libsrc/winsock.cc | |
| 227 ) | |
| 228 | |
| 229 elseif (${CMAKE_SYSTEM_NAME} STREQUAL "Windows") | |
| 230 list(REMOVE_ITEM DCMTK_SOURCES | |
| 231 ${DCMTK_SOURCES_DIR}/oflog/libsrc/unixsock.cc | |
| 232 ${DCMTK_SOURCES_DIR}/oflog/libsrc/clfsap.cc | |
| 233 ) | |
| 234 endif() | |
| 235 | |
| 236 | |
| 237 # Starting with DCMTK 3.6.2, the Nagle algorithm is not disabled by | |
| 238 # default since this does not seem to be appropriate (anymore) for | |
| 239 # most modern operating systems. In order to change this default, the | |
| 240 # environment variable NO_TCPDELAY can be set to "1" (see envvars.txt | |
| 241 # for details). Alternatively, the macro DISABLE_NAGLE_ALGORITHM can | |
| 242 # be defined to change this setting at compilation time (see | |
| 243 # macros.txt for details). | |
| 244 # https://forum.dcmtk.org/viewtopic.php?t=4632 | |
| 245 add_definitions( | |
| 246 -DDISABLE_NAGLE_ALGORITHM=1 | |
| 247 ) | |
| 248 | |
| 249 | |
| 250 if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows") | |
| 251 # For compatibility with Windows XP, avoid using fiber-local-storage | |
| 252 # in log4cplus, but use thread-local-storage instead. Otherwise, | |
| 253 # Windows XP complains about missing "FlsGetValue()" in KERNEL32.dll | |
| 254 add_definitions( | |
| 255 -DDCMTK_LOG4CPLUS_AVOID_WIN32_FLS | |
| 256 ) | |
| 257 | |
| 258 if (CMAKE_COMPILER_IS_GNUCXX OR # MinGW | |
| 259 "${CMAKE_SIZEOF_VOID_P}" STREQUAL "4") # MSVC for 32bit (*) | |
| 260 | |
| 261 # (*) With multithreaded logging enabled, Visual Studio 2008 fails | |
| 262 # with error: ".\dcmtk-3.6.7\oflog\libsrc\globinit.cc(422) : error | |
| 263 # C2664: 'dcmtk::log4cplus::thread::impl::tls_init' : cannot | |
| 264 # convert parameter 1 from 'void (__stdcall *)(void *)' to | |
| 265 # 'dcmtk::log4cplus::thread::impl::tls_init_cleanup_func_type'" | |
| 266 # None of the functions with this name in scope match the target type | |
| 267 | |
| 268 add_definitions( | |
| 269 -DDCMTK_LOG4CPLUS_SINGLE_THREADED | |
| 270 ) | |
| 271 endif() | |
| 272 endif() |