Mercurial > hg > orthanc

comparison OrthancFramework/Resources/CMake/DcmtkConfigurationStatic-3.6.0.cmake @ 4045:05b8fd21089c framework

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix path
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 10 Jun 2020 21:27:31 +0200
parents d25f4c0fa160
children 304842a0d152
comparison
equal deleted inserted replaced
4044:d25f4c0fa160 4045:05b8fd21089c
18 # 3.6.2. This adds support for more private tags, and fixes some 18 # 3.6.2. This adds support for more private tags, and fixes some
19 # import problems with Philips MRI Achieva. 19 # import problems with Philips MRI Achieva.
20 if (USE_DCMTK_362_PRIVATE_DIC) 20 if (USE_DCMTK_362_PRIVATE_DIC)
21 message("Using the dictionary of private tags from DCMTK 3.6.2") 21 message("Using the dictionary of private tags from DCMTK 3.6.2")
22 configure_file( 22 configure_file(
23 ${ORTHANC_ROOT}/Resources/Patches/dcmtk-3.6.2-private.dic 23 ${CMAKE_CURRENT_LIST_DIR}/../Patches/dcmtk-3.6.2-private.dic
24 ${DCMTK_SOURCES_DIR}/dcmdata/data/private.dic 24 ${DCMTK_SOURCES_DIR}/dcmdata/data/private.dic
25 COPYONLY) 25 COPYONLY)
26 else() 26 else()
27 message("Using the dictionary of private tags from DCMTK 3.6.0") 27 message("Using the dictionary of private tags from DCMTK 3.6.0")
28 endif() 28 endif()
29 29
30 # Patches specific to DCMTK 3.6.0 30 # Patches specific to DCMTK 3.6.0
31 message("Applying patch to solve vulnerability in DCMTK 3.6.0") 31 message("Applying patch to solve vulnerability in DCMTK 3.6.0")
32 execute_process( 32 execute_process(
33 COMMAND ${PATCH_EXECUTABLE} -p0 -N -i 33 COMMAND ${PATCH_EXECUTABLE} -p0 -N -i
34 ${ORTHANC_ROOT}/Resources/Patches/dcmtk-3.6.0-dulparse-vulnerability.patch 34 ${CMAKE_CURRENT_LIST_DIR}/../Patches/dcmtk-3.6.0-dulparse-vulnerability.patch
35 WORKING_DIRECTORY ${CMAKE_BINARY_DIR} 35 WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
36 RESULT_VARIABLE Failure 36 RESULT_VARIABLE Failure
37 ) 37 )
38 38
39 if (Failure) 39 if (Failure)
44 # (information sent by Jorg Riesmeier on Twitter on 2017-07-19): 44 # (information sent by Jorg Riesmeier on Twitter on 2017-07-19):
45 # http://git.dcmtk.org/?p=dcmtk.git;a=commit;h=8df1f5e517b8629ae09088d0935c2a8dd333c76f 45 # http://git.dcmtk.org/?p=dcmtk.git;a=commit;h=8df1f5e517b8629ae09088d0935c2a8dd333c76f
46 message("Applying patch for speed in DCMTK 3.6.0") 46 message("Applying patch for speed in DCMTK 3.6.0")
47 execute_process( 47 execute_process(
48 COMMAND ${PATCH_EXECUTABLE} -p0 -N -i 48 COMMAND ${PATCH_EXECUTABLE} -p0 -N -i
49 ${ORTHANC_ROOT}/Resources/Patches/dcmtk-3.6.0-speed.patch 49 ${CMAKE_CURRENT_LIST_DIR}/../Patches/dcmtk-3.6.0-speed.patch
50 WORKING_DIRECTORY ${CMAKE_BINARY_DIR} 50 WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
51 RESULT_VARIABLE Failure 51 RESULT_VARIABLE Failure
52 ) 52 )
53 53
54 if (Failure) 54 if (Failure)
68 elseif(CMAKE_SYSTEM_NAME STREQUAL "Emscripten") # WebAssembly or asm.js 68 elseif(CMAKE_SYSTEM_NAME STREQUAL "Emscripten") # WebAssembly or asm.js
69 69
70 # Check out "../WebAssembly/ArithmeticTests/" to regenerate the 70 # Check out "../WebAssembly/ArithmeticTests/" to regenerate the
71 # "arith.h" file 71 # "arith.h" file
72 configure_file( 72 configure_file(
73 ${ORTHANC_ROOT}/Resources/WebAssembly/arith.h 73 ${CMAKE_CURRENT_LIST_DIR}/WebAssembly/arith.h
74 ${DCMTK_SOURCES_DIR}/config/include/dcmtk/config/arith.h 74 ${DCMTK_SOURCES_DIR}/config/include/dcmtk/config/arith.h
75 COPYONLY) 75 COPYONLY)
76 76
77 UNSET(C_CHAR_UNSIGNED CACHE) 77 UNSET(C_CHAR_UNSIGNED CACHE)
78 SET(C_CHAR_UNSIGNED 0 CACHE INTERNAL "") 78 SET(C_CHAR_UNSIGNED 0 CACHE INTERNAL "")
87 SET(DCMTK_ENABLE_CHARSET_CONVERSION "iconv" CACHE STRING "") 87 SET(DCMTK_ENABLE_CHARSET_CONVERSION "iconv" CACHE STRING "")
88 SET(HAVE_SYS_GETTID 0 CACHE INTERNAL "") 88 SET(HAVE_SYS_GETTID 0 CACHE INTERNAL "")
89 89
90 execute_process( 90 execute_process(
91 COMMAND ${PATCH_EXECUTABLE} -p0 -N -i 91 COMMAND ${PATCH_EXECUTABLE} -p0 -N -i
92 ${ORTHANC_ROOT}/Resources/Patches/dcmtk-3.6.2-linux-standard-base.patch 92 ${CMAKE_CURRENT_LIST_DIR}/../Patches/dcmtk-3.6.2-linux-standard-base.patch
93 WORKING_DIRECTORY ${CMAKE_BINARY_DIR} 93 WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
94 RESULT_VARIABLE Failure 94 RESULT_VARIABLE Failure
95 ) 95 )
96 96
97 if (FirstRun AND Failure) 97 if (FirstRun AND Failure)
161 161
162 if (CMAKE_COMPILER_IS_GNUCXX) 162 if (CMAKE_COMPILER_IS_GNUCXX)
163 # This is a patch for DCMTK 3.6.0 and MinGW64 163 # This is a patch for DCMTK 3.6.0 and MinGW64
164 execute_process( 164 execute_process(
165 COMMAND ${PATCH_EXECUTABLE} -p0 -N -i 165 COMMAND ${PATCH_EXECUTABLE} -p0 -N -i
166 ${ORTHANC_ROOT}/Resources/Patches/dcmtk-3.6.0-mingw64.patch 166 ${CMAKE_CURRENT_LIST_DIR}/../Patches/dcmtk-3.6.0-mingw64.patch
167 WORKING_DIRECTORY ${CMAKE_BINARY_DIR} 167 WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
168 RESULT_VARIABLE Failure 168 RESULT_VARIABLE Failure
169 ) 169 )
170 170
171 if (Failure AND FirstRun) 171 if (Failure AND FirstRun)