Mercurial > hg > orthanc

comparison Resources/CMake/DcmtkConfiguration.cmake @ 2193:6ac6193a7935

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix a vulnerability in dcmtk 3.6.0
author Sebastien Jodogne <s.jodogne@gmail.com>
date Fri, 02 Dec 2016 16:04:00 +0100
parents 8b51b133bb8b
children 9f3414878c02
comparison
equal deleted inserted replaced
2191:c6fe92b9adeb 2193:6ac6193a7935
47 ${ORTHANC_ROOT}/Resources/Patches/dcmtk-3.6.1-private.dic 47 ${ORTHANC_ROOT}/Resources/Patches/dcmtk-3.6.1-private.dic
48 ${DCMTK_SOURCES_DIR}/dcmdata/data/private.dic 48 ${DCMTK_SOURCES_DIR}/dcmdata/data/private.dic
49 COPYONLY) 49 COPYONLY)
50 else() 50 else()
51 message("Using the dictionary of private tags from DCMTK 3.6.0") 51 message("Using the dictionary of private tags from DCMTK 3.6.0")
52 endif()
53
54 # Patches specific to DCMTK 3.6.0
55 execute_process(
56 COMMAND ${PATCH_EXECUTABLE} -p0 -N -i ${ORTHANC_ROOT}/Resources/Patches/dcmtk-3.6.0-dulparse-vulnerability.patch
57 WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
58 RESULT_VARIABLE Failure
59 )
60
61 if (Failure)
62 message(FATAL_ERROR "Error while patching a file")
52 endif() 63 endif()
53 endif() 64 endif()
54 65
55 66
56 IF (CMAKE_CROSSCOMPILING) 67 IF (CMAKE_CROSSCOMPILING)