Mercurial > hg > orthanc

comparison OrthancFramework/Resources/CMake/DcmtkConfigurationStatic-3.6.4.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
32 32
33 if (FirstRun) 33 if (FirstRun)
34 # Apply the patches 34 # Apply the patches
35 execute_process( 35 execute_process(
36 COMMAND ${PATCH_EXECUTABLE} -p0 -N -i 36 COMMAND ${PATCH_EXECUTABLE} -p0 -N -i
37 ${ORTHANC_ROOT}/Resources/Patches/dcmtk-3.6.4.patch 37 ${CMAKE_CURRENT_LIST_DIR}/../Patches/dcmtk-3.6.4.patch
38 WORKING_DIRECTORY ${CMAKE_BINARY_DIR} 38 WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
39 RESULT_VARIABLE Failure 39 RESULT_VARIABLE Failure
40 ) 40 )
41 41
42 if (Failure) 42 if (Failure)
43 message(FATAL_ERROR "Error while patching a file") 43 message(FATAL_ERROR "Error while patching a file")
44 endif() 44 endif()
45 45
46 configure_file( 46 configure_file(
47 ${ORTHANC_ROOT}/Resources/Patches/dcmtk-dcdict_orthanc.cc 47 ${CMAKE_CURRENT_LIST_DIR}/../Patches/dcmtk-dcdict_orthanc.cc
48 ${DCMTK_SOURCES_DIR}/dcmdata/libsrc/dcdict_orthanc.cc 48 ${DCMTK_SOURCES_DIR}/dcmdata/libsrc/dcdict_orthanc.cc
49 COPYONLY) 49 COPYONLY)
50 else() 50 else()
51 message("The patches for DCMTK have already been applied") 51 message("The patches for DCMTK have already been applied")
52 endif() 52 endif()
66 elseif(CMAKE_SYSTEM_NAME STREQUAL "Emscripten") # WebAssembly or asm.js 66 elseif(CMAKE_SYSTEM_NAME STREQUAL "Emscripten") # WebAssembly or asm.js
67 67
68 # Check out "../WebAssembly/ArithmeticTests/" to regenerate the 68 # Check out "../WebAssembly/ArithmeticTests/" to regenerate the
69 # "arith.h" file 69 # "arith.h" file
70 configure_file( 70 configure_file(
71 ${ORTHANC_ROOT}/Resources/WebAssembly/arith.h 71 ${CMAKE_CURRENT_LIST_DIR}/WebAssembly/arith.h
72 ${DCMTK_SOURCES_DIR}/config/include/dcmtk/config/arith.h 72 ${DCMTK_SOURCES_DIR}/config/include/dcmtk/config/arith.h
73 COPYONLY) 73 COPYONLY)
74 74
75 UNSET(C_CHAR_UNSIGNED CACHE) 75 UNSET(C_CHAR_UNSIGNED CACHE)
76 SET(C_CHAR_UNSIGNED 0 CACHE INTERNAL "") 76 SET(C_CHAR_UNSIGNED 0 CACHE INTERNAL "")