Mercurial > hg > orthanc
diff 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 |
line wrap: on
line diff
--- a/Resources/CMake/DcmtkConfiguration.cmake Thu Mar 22 17:31:36 2018 +0100 +++ b/Resources/CMake/DcmtkConfiguration.cmake Sat Mar 24 11:29:02 2018 +0100 @@ -81,8 +81,18 @@ message(FATAL_ERROR "Error while patching a file") endif() - else (FirstRun()) - message("No need to apply a patch for speed in DCMTK") + else() + message("Applying patch to detect mathematic primitives in DCMTK 3.6.2") + execute_process( + COMMAND ${PATCH_EXECUTABLE} -p0 -N -i + ${ORTHANC_ROOT}/Resources/Patches/dcmtk-3.6.2-cmath.patch + WORKING_DIRECTORY ${CMAKE_BINARY_DIR} + RESULT_VARIABLE Failure + ) + + if (Failure) + message(FATAL_ERROR "Error while patching a file") + endif() endif() else() message("The patches for DCMTK have already been applied") @@ -99,8 +109,6 @@ if ("${CMAKE_SYSTEM_VERSION}" STREQUAL "LinuxStandardBase") SET(DCMTK_ENABLE_CHARSET_CONVERSION "iconv" CACHE STRING "") - SET(HAVE_PROTOTYPE_STD__ISINF 1 CACHE INTERNAL "") - SET(HAVE_PROTOTYPE_STD__ISNAN 1 CACHE INTERNAL "") SET(HAVE_SYS_GETTID 0 CACHE INTERNAL "") execute_process(