comparison Resources/CMake/DcmtkConfiguration.cmake @ 2500:3b802ac81a27

dcmtk-3.6.2-cmath.patch
author Sebastien Jodogne <s.jodogne@gmail.com>
date Sat, 24 Mar 2018 11:29:02 +0100
parents 4f2474079fbf
children de6eb6d0d34d
comparison
equal deleted inserted replaced
2498:0188c21e417a 2500:3b802ac81a27
79 79
80 if (Failure) 80 if (Failure)
81 message(FATAL_ERROR "Error while patching a file") 81 message(FATAL_ERROR "Error while patching a file")
82 endif() 82 endif()
83 83
84 else (FirstRun()) 84 else()
85 message("No need to apply a patch for speed in DCMTK") 85 message("Applying patch to detect mathematic primitives in DCMTK 3.6.2")
86 execute_process(
87 COMMAND ${PATCH_EXECUTABLE} -p0 -N -i
88 ${ORTHANC_ROOT}/Resources/Patches/dcmtk-3.6.2-cmath.patch
89 WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
90 RESULT_VARIABLE Failure
91 )
92
93 if (Failure)
94 message(FATAL_ERROR "Error while patching a file")
95 endif()
86 endif() 96 endif()
87 else() 97 else()
88 message("The patches for DCMTK have already been applied") 98 message("The patches for DCMTK have already been applied")
89 endif() 99 endif()
90 100
97 endif() 107 endif()
98 ENDIF() 108 ENDIF()
99 109
100 if ("${CMAKE_SYSTEM_VERSION}" STREQUAL "LinuxStandardBase") 110 if ("${CMAKE_SYSTEM_VERSION}" STREQUAL "LinuxStandardBase")
101 SET(DCMTK_ENABLE_CHARSET_CONVERSION "iconv" CACHE STRING "") 111 SET(DCMTK_ENABLE_CHARSET_CONVERSION "iconv" CACHE STRING "")
102 SET(HAVE_PROTOTYPE_STD__ISINF 1 CACHE INTERNAL "")
103 SET(HAVE_PROTOTYPE_STD__ISNAN 1 CACHE INTERNAL "")
104 SET(HAVE_SYS_GETTID 0 CACHE INTERNAL "") 112 SET(HAVE_SYS_GETTID 0 CACHE INTERNAL "")
105 113
106 execute_process( 114 execute_process(
107 COMMAND ${PATCH_EXECUTABLE} -p0 -N -i 115 COMMAND ${PATCH_EXECUTABLE} -p0 -N -i
108 ${ORTHANC_ROOT}/Resources/Patches/dcmtk-3.6.2-linux-standard-base.patch 116 ${ORTHANC_ROOT}/Resources/Patches/dcmtk-3.6.2-linux-standard-base.patch