Mercurial > hg > orthanc
comparison OrthancFramework/Resources/CMake/DcmtkConfigurationStatic-3.6.2.cmake @ 4045:05b8fd21089c framework
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 |
---|---|
34 # "3.6.2 CXX11 fails on Linux; patch suggestions included" | 34 # "3.6.2 CXX11 fails on Linux; patch suggestions included" |
35 # https://forum.dcmtk.org/viewtopic.php?f=3&t=4637 | 35 # https://forum.dcmtk.org/viewtopic.php?f=3&t=4637 |
36 message("Applying patch to detect mathematic primitives in DCMTK 3.6.2 with C++11") | 36 message("Applying patch to detect mathematic primitives in DCMTK 3.6.2 with C++11") |
37 execute_process( | 37 execute_process( |
38 COMMAND ${PATCH_EXECUTABLE} -p0 -N -i | 38 COMMAND ${PATCH_EXECUTABLE} -p0 -N -i |
39 ${ORTHANC_ROOT}/Resources/Patches/dcmtk-3.6.2.patch | 39 ${CMAKE_CURRENT_LIST_DIR}/../Patches/dcmtk-3.6.2.patch |
40 WORKING_DIRECTORY ${CMAKE_BINARY_DIR} | 40 WORKING_DIRECTORY ${CMAKE_BINARY_DIR} |
41 RESULT_VARIABLE Failure | 41 RESULT_VARIABLE Failure |
42 ) | 42 ) |
43 | 43 |
44 if (Failure) | 44 if (Failure) |
45 message(FATAL_ERROR "Error while patching a file") | 45 message(FATAL_ERROR "Error while patching a file") |
46 endif() | 46 endif() |
47 | 47 |
48 configure_file( | 48 configure_file( |
49 ${ORTHANC_ROOT}/Resources/Patches/dcmtk-dcdict_orthanc.cc | 49 ${CMAKE_CURRENT_LIST_DIR}/../Patches/dcmtk-dcdict_orthanc.cc |
50 ${DCMTK_SOURCES_DIR}/dcmdata/libsrc/dcdict_orthanc.cc | 50 ${DCMTK_SOURCES_DIR}/dcmdata/libsrc/dcdict_orthanc.cc |
51 COPYONLY) | 51 COPYONLY) |
52 else() | 52 else() |
53 message("The patches for DCMTK have already been applied") | 53 message("The patches for DCMTK have already been applied") |
54 endif() | 54 endif() |
63 elseif(CMAKE_SYSTEM_NAME STREQUAL "Emscripten") # WebAssembly or asm.js | 63 elseif(CMAKE_SYSTEM_NAME STREQUAL "Emscripten") # WebAssembly or asm.js |
64 | 64 |
65 # Check out "../WebAssembly/ArithmeticTests/" to regenerate the | 65 # Check out "../WebAssembly/ArithmeticTests/" to regenerate the |
66 # "arith.h" file | 66 # "arith.h" file |
67 configure_file( | 67 configure_file( |
68 ${ORTHANC_ROOT}/Resources/WebAssembly/arith.h | 68 ${CMAKE_CURRENT_LIST_DIR}/WebAssembly/arith.h |
69 ${DCMTK_SOURCES_DIR}/config/include/dcmtk/config/arith.h | 69 ${DCMTK_SOURCES_DIR}/config/include/dcmtk/config/arith.h |
70 COPYONLY) | 70 COPYONLY) |
71 | 71 |
72 UNSET(C_CHAR_UNSIGNED CACHE) | 72 UNSET(C_CHAR_UNSIGNED CACHE) |
73 SET(C_CHAR_UNSIGNED 0 CACHE INTERNAL "") | 73 SET(C_CHAR_UNSIGNED 0 CACHE INTERNAL "") |
83 SET(HAVE_SYS_GETTID 0 CACHE INTERNAL "") | 83 SET(HAVE_SYS_GETTID 0 CACHE INTERNAL "") |
84 | 84 |
85 if (FirstRun) | 85 if (FirstRun) |
86 execute_process( | 86 execute_process( |
87 COMMAND ${PATCH_EXECUTABLE} -p0 -N -i | 87 COMMAND ${PATCH_EXECUTABLE} -p0 -N -i |
88 ${ORTHANC_ROOT}/Resources/Patches/dcmtk-3.6.2-linux-standard-base.patch | 88 ${CMAKE_CURRENT_LIST_DIR}/../Patches/dcmtk-3.6.2-linux-standard-base.patch |
89 WORKING_DIRECTORY ${CMAKE_BINARY_DIR} | 89 WORKING_DIRECTORY ${CMAKE_BINARY_DIR} |
90 RESULT_VARIABLE Failure | 90 RESULT_VARIABLE Failure |
91 ) | 91 ) |
92 | 92 |
93 if (Failure) | 93 if (Failure) |