annotate Resources/CMake/DcmtkConfigurationStatic-3.6.2.cmake @ 3785:763533d6dd67 SylvainRouquette/fix-issue169-95b752c

add PreferredTransferSyntax to RemoteModalityParameters DicomUserConnection can now use RemoteModalityParameters.PreferredTransferSyntax instead of using the default transfer syntax (LE-implicit). This way we can transcode by default in LE-explicit. fix issue #169
author sylvain.rouquette@incepto-medical.com
date Wed, 18 Mar 2020 08:59:06 +0100
parents 4b1017928fc4
children 0301f59450fe
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
3274
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1 SET(DCMTK_VERSION_NUMBER 362)
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2 SET(DCMTK_PACKAGE_VERSION "3.6.2")
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3 SET(DCMTK_SOURCES_DIR ${CMAKE_BINARY_DIR}/dcmtk-3.6.2)
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4 SET(DCMTK_URL "http://orthanc.osimis.io/ThirdPartyDownloads/dcmtk-3.6.2.tar.gz")
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
5 SET(DCMTK_MD5 "d219a4152772985191c9b89d75302d12")
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
6
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
7 macro(DCMTK_UNSET)
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
8 endmacro()
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
9
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
10 macro(DCMTK_UNSET_CACHE)
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
11 endmacro()
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
12
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
13 set(DCMTK_BINARY_DIR ${DCMTK_SOURCES_DIR}/)
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
14 set(DCMTK_CMAKE_INCLUDE ${DCMTK_SOURCES_DIR}/)
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
15 set(DCMTK_WITH_THREADS ON)
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
16
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
17 add_definitions(-DDCMTK_INSIDE_LOG4CPLUS=1)
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
18
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
19 if (IS_DIRECTORY "${DCMTK_SOURCES_DIR}")
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
20 set(FirstRun OFF)
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
21 else()
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
22 set(FirstRun ON)
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
23 endif()
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
24
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
25 DownloadPackage(${DCMTK_MD5} ${DCMTK_URL} "${DCMTK_SOURCES_DIR}")
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
26
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
27
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
28 if (FirstRun)
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
29 # "3.6.2 CXX11 fails on Linux; patch suggestions included"
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
30 # https://forum.dcmtk.org/viewtopic.php?f=3&t=4637
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
31 message("Applying patch to detect mathematic primitives in DCMTK 3.6.2 with C++11")
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
32 execute_process(
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
33 COMMAND ${PATCH_EXECUTABLE} -p0 -N -i
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
34 ${ORTHANC_ROOT}/Resources/Patches/dcmtk-3.6.2-cmath.patch
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
35 WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
36 RESULT_VARIABLE Failure
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
37 )
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
38
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
39 if (Failure)
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
40 message(FATAL_ERROR "Error while patching a file")
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
41 endif()
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
42 else()
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
43 message("The patches for DCMTK have already been applied")
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
44 endif()
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
45
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
46
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
47 # C_CHAR_UNSIGNED *must* be set before calling "GenerateDCMTKConfigure.cmake"
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
48 IF (CMAKE_CROSSCOMPILING)
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
49 if (CMAKE_COMPILER_IS_GNUCXX AND
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
50 CMAKE_SYSTEM_NAME STREQUAL "Windows") # MinGW
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
51 SET(C_CHAR_UNSIGNED 1 CACHE INTERNAL "Whether char is unsigned.")
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
52
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
53 elseif(CMAKE_SYSTEM_NAME STREQUAL "Emscripten") # WebAssembly or asm.js
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
54
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
55 # Check out "../WebAssembly/ArithmeticTests/" to regenerate the
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
56 # "arith.h" file
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
57 configure_file(
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
58 ${ORTHANC_ROOT}/Resources/WebAssembly/arith.h
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
59 ${DCMTK_SOURCES_DIR}/config/include/dcmtk/config/arith.h
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
60 COPYONLY)
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
61
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
62 UNSET(C_CHAR_UNSIGNED CACHE)
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
63 SET(C_CHAR_UNSIGNED 0 CACHE INTERNAL "")
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
64
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
65 else()
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
66 message(FATAL_ERROR "Support your platform here")
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
67 endif()
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
68 ENDIF()
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
69
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
70
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
71 if ("${CMAKE_SYSTEM_VERSION}" STREQUAL "LinuxStandardBase")
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
72 SET(DCMTK_ENABLE_CHARSET_CONVERSION "iconv" CACHE STRING "")
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
73 SET(HAVE_SYS_GETTID 0 CACHE INTERNAL "")
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
74
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
75 execute_process(
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
76 COMMAND ${PATCH_EXECUTABLE} -p0 -N -i
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
77 ${ORTHANC_ROOT}/Resources/Patches/dcmtk-3.6.2-linux-standard-base.patch
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
78 WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
79 RESULT_VARIABLE Failure
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
80 )
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
81
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
82 if (FirstRun AND Failure)
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
83 message(FATAL_ERROR "Error while patching a file")
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
84 endif()
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
85 endif()
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
86
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
87 SET(DCMTK_SOURCE_DIR ${DCMTK_SOURCES_DIR})
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
88 include(${DCMTK_SOURCES_DIR}/CMake/CheckFunctionWithHeaderExists.cmake)
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
89 include(${DCMTK_SOURCES_DIR}/CMake/GenerateDCMTKConfigure.cmake)
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
90
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
91
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
92 if (CMAKE_SYSTEM_NAME STREQUAL "Emscripten") # WebAssembly or
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
93 # asm.js The macros below are not properly discovered by DCMTK
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
94 # when using WebAssembly. Check out "../WebAssembly/arith.h" for
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
95 # how we produced these values. This step MUST be after
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
96 # "GenerateDCMTKConfigure" and before the generation of
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
97 # "osconfig.h".
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
98 UNSET(SIZEOF_VOID_P CACHE)
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
99 UNSET(SIZEOF_CHAR CACHE)
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
100 UNSET(SIZEOF_DOUBLE CACHE)
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
101 UNSET(SIZEOF_FLOAT CACHE)
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
102 UNSET(SIZEOF_INT CACHE)
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
103 UNSET(SIZEOF_LONG CACHE)
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
104 UNSET(SIZEOF_SHORT CACHE)
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
105 UNSET(SIZEOF_VOID_P CACHE)
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
106
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
107 SET(SIZEOF_VOID_P 4 CACHE INTERNAL "")
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
108 SET(SIZEOF_CHAR 1 CACHE INTERNAL "")
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
109 SET(SIZEOF_DOUBLE 8 CACHE INTERNAL "")
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
110 SET(SIZEOF_FLOAT 4 CACHE INTERNAL "")
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
111 SET(SIZEOF_INT 4 CACHE INTERNAL "")
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
112 SET(SIZEOF_LONG 4 CACHE INTERNAL "")
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
113 SET(SIZEOF_SHORT 2 CACHE INTERNAL "")
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
114 SET(SIZEOF_VOID_P 4 CACHE INTERNAL "")
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
115 endif()
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
116
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
117
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
118 set(DCMTK_PACKAGE_VERSION_SUFFIX "")
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
119 set(DCMTK_PACKAGE_VERSION_NUMBER ${DCMTK_VERSION_NUMBER})
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
120
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
121 CONFIGURE_FILE(
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
122 ${DCMTK_SOURCES_DIR}/CMake/osconfig.h.in
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
123 ${DCMTK_SOURCES_DIR}/config/include/dcmtk/config/osconfig.h)
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
124
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
125 if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
126 link_libraries(netapi32) # For NetWkstaUserGetInfo@12
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
127 link_libraries(iphlpapi) # For GetAdaptersInfo@8
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
128
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
129 # Configure Wine if cross-compiling for Windows
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
130 if (CMAKE_COMPILER_IS_GNUCXX)
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
131 include(${DCMTK_SOURCES_DIR}/CMake/dcmtkUseWine.cmake)
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
132 FIND_PROGRAM(WINE_WINE_PROGRAM wine)
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
133 FIND_PROGRAM(WINE_WINEPATH_PROGRAM winepath)
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
134 list(APPEND DCMTK_TRY_COMPILE_REQUIRED_CMAKE_FLAGS "-DCMAKE_EXE_LINKER_FLAGS=-static")
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
135 endif()
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
136 endif()
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
137
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
138 # This step must be after the generation of "osconfig.h"
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
139 if (NOT CMAKE_SYSTEM_NAME STREQUAL "Emscripten")
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
140 INSPECT_FUNDAMENTAL_ARITHMETIC_TYPES()
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
141 endif()
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
142
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
143
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
144 # Source for the logging facility of DCMTK
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
145 AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/oflog/libsrc DCMTK_SOURCES)
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
146 if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux" OR
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
147 ${CMAKE_SYSTEM_NAME} STREQUAL "Darwin" OR
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
148 ${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD" OR
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
149 ${CMAKE_SYSTEM_NAME} STREQUAL "kFreeBSD" OR
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
150 ${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD" OR
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
151 ${CMAKE_SYSTEM_NAME} STREQUAL "Emscripten")
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
152 list(REMOVE_ITEM DCMTK_SOURCES
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
153 ${DCMTK_SOURCES_DIR}/oflog/libsrc/clfsap.cc
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
154 ${DCMTK_SOURCES_DIR}/oflog/libsrc/windebap.cc
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
155 ${DCMTK_SOURCES_DIR}/oflog/libsrc/winsock.cc
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
156 )
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
157
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
158 elseif (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
159 list(REMOVE_ITEM DCMTK_SOURCES
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
160 ${DCMTK_SOURCES_DIR}/oflog/libsrc/unixsock.cc
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
161 ${DCMTK_SOURCES_DIR}/oflog/libsrc/clfsap.cc
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
162 )
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
163 endif()
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
164
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
165
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
166 if (ORTHANC_SANDBOXED)
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
167 configure_file(
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
168 ${ORTHANC_ROOT}/Resources/WebAssembly/dcdict.h
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
169 ${DCMTK_SOURCES_DIR}/dcmdata/include/dcmtk/dcmdata/dcdict.h
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
170 COPYONLY)
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
171
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
172 configure_file(
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
173 ${ORTHANC_ROOT}/Resources/WebAssembly/dcdict.cc
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
174 ${DCMTK_SOURCES_DIR}/dcmdata/libsrc/dcdict.cc
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
175 COPYONLY)
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
176 endif()
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
177
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
178
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
179 #set_source_files_properties(${DCMTK_SOURCES}
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
180 # PROPERTIES COMPILE_DEFINITIONS
95b0536be2c3 preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
181 # "PACKAGE_VERSION=\"${DCMTK_PACKAGE_VERSION}\";PACKAGE_VERSION_NUMBER=\"${DCMTK_VERSION_NUMBER}\"")
3316
4b1017928fc4 Fix performance issue in DICOM protocol by disabling Nagle's algorithm
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3279
diff changeset
182
4b1017928fc4 Fix performance issue in DICOM protocol by disabling Nagle's algorithm
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3279
diff changeset
183
4b1017928fc4 Fix performance issue in DICOM protocol by disabling Nagle's algorithm
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3279
diff changeset
184 # Starting with DCMTK 3.6.2, the Nagle algorithm is not disabled by
4b1017928fc4 Fix performance issue in DICOM protocol by disabling Nagle's algorithm
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3279
diff changeset
185 # default since this does not seem to be appropriate (anymore) for
4b1017928fc4 Fix performance issue in DICOM protocol by disabling Nagle's algorithm
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3279
diff changeset
186 # most modern operating systems. In order to change this default, the
4b1017928fc4 Fix performance issue in DICOM protocol by disabling Nagle's algorithm
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3279
diff changeset
187 # environment variable NO_TCPDELAY can be set to "1" (see envvars.txt
4b1017928fc4 Fix performance issue in DICOM protocol by disabling Nagle's algorithm
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3279
diff changeset
188 # for details). Alternatively, the macro DISABLE_NAGLE_ALGORITHM can
4b1017928fc4 Fix performance issue in DICOM protocol by disabling Nagle's algorithm
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3279
diff changeset
189 # be defined to change this setting at compilation time (see
4b1017928fc4 Fix performance issue in DICOM protocol by disabling Nagle's algorithm
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3279
diff changeset
190 # macros.txt for details).
4b1017928fc4 Fix performance issue in DICOM protocol by disabling Nagle's algorithm
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3279
diff changeset
191 # https://forum.dcmtk.org/viewtopic.php?t=4632
4b1017928fc4 Fix performance issue in DICOM protocol by disabling Nagle's algorithm
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3279
diff changeset
192 add_definitions(
4b1017928fc4 Fix performance issue in DICOM protocol by disabling Nagle's algorithm
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3279
diff changeset
193 -DDISABLE_NAGLE_ALGORITHM=1
4b1017928fc4 Fix performance issue in DICOM protocol by disabling Nagle's algorithm
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3279
diff changeset
194 )