Mercurial > hg > orthanc

annotate Resources/CMake/DcmtkConfigurationStatic-3.6.5.cmake @ 3951:5fe8c6d3212e transcoding

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
removed useless information "hasSopInstanceUidChanged"
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 19 May 2020 21:06:53 +0200
parents 6d2b94698995
children 05a363186da6
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
3719
d737173197e1 upgraded DCMTK to 3.6.5
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3598
diff changeset
1 SET(DCMTK_VERSION_NUMBER 365)
d737173197e1 upgraded DCMTK to 3.6.5
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3598
diff changeset
2 SET(DCMTK_PACKAGE_VERSION "3.6.5")
d737173197e1 upgraded DCMTK to 3.6.5
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3598
diff changeset
3 SET(DCMTK_SOURCES_DIR ${CMAKE_BINARY_DIR}/dcmtk-3.6.5)
d737173197e1 upgraded DCMTK to 3.6.5
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3598
diff changeset
4 SET(DCMTK_URL "http://orthanc.osimis.io/ThirdPartyDownloads/dcmtk-3.6.5.tar.gz")
d737173197e1 upgraded DCMTK to 3.6.5
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3598
diff changeset
5 SET(DCMTK_MD5 "e19707f64ee5695c496b9c1e48e39d07")
3279
dd10fe965870 use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
6
dd10fe965870 use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
7 macro(DCMTK_UNSET)
dd10fe965870 use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
8 endmacro()
dd10fe965870 use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
9
dd10fe965870 use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
10 macro(DCMTK_UNSET_CACHE)
dd10fe965870 use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
11 endmacro()
dd10fe965870 use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
12
dd10fe965870 use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
13 set(DCMTK_BINARY_DIR ${DCMTK_SOURCES_DIR}/)
dd10fe965870 use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
14 set(DCMTK_CMAKE_INCLUDE ${DCMTK_SOURCES_DIR}/)
3594
0654d0838de8 disable thread support in DCMTK if wasm/asm.js
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3593
diff changeset
15
0654d0838de8 disable thread support in DCMTK if wasm/asm.js
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3593
diff changeset
16 if (CMAKE_SYSTEM_NAME STREQUAL "Emscripten")
0654d0838de8 disable thread support in DCMTK if wasm/asm.js
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3593
diff changeset
17 set(DCMTK_WITH_THREADS OFF) # Disable thread support in wasm/asm.js
0654d0838de8 disable thread support in DCMTK if wasm/asm.js
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3593
diff changeset
18 else()
0654d0838de8 disable thread support in DCMTK if wasm/asm.js
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3593
diff changeset
19 set(DCMTK_WITH_THREADS ON)
0654d0838de8 disable thread support in DCMTK if wasm/asm.js
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3593
diff changeset
20 endif()
3279
dd10fe965870 use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
21
dd10fe965870 use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
22 add_definitions(-DDCMTK_INSIDE_LOG4CPLUS=1)
dd10fe965870 use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
23
dd10fe965870 use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
24 if (IS_DIRECTORY "${DCMTK_SOURCES_DIR}")
dd10fe965870 use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
25 set(FirstRun OFF)
dd10fe965870 use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
26 else()
dd10fe965870 use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
27 set(FirstRun ON)
dd10fe965870 use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
28 endif()
dd10fe965870 use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
29
dd10fe965870 use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
30 DownloadPackage(${DCMTK_MD5} ${DCMTK_URL} "${DCMTK_SOURCES_DIR}")
dd10fe965870 use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
31
dd10fe965870 use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
32
3593
0301f59450fe improved the patch for loading DICOM dictionary from memory
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3316
diff changeset
33 if (FirstRun)
0301f59450fe improved the patch for loading DICOM dictionary from memory
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3316
diff changeset
34 # Apply the patches
0301f59450fe improved the patch for loading DICOM dictionary from memory
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3316
diff changeset
35 execute_process(
0301f59450fe improved the patch for loading DICOM dictionary from memory
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3316
diff changeset
36 COMMAND ${PATCH_EXECUTABLE} -p0 -N -i
3719
d737173197e1 upgraded DCMTK to 3.6.5
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3598
diff changeset
37 ${ORTHANC_ROOT}/Resources/Patches/dcmtk-3.6.5.patch
3593
0301f59450fe improved the patch for loading DICOM dictionary from memory
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3316
diff changeset
38 WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
0301f59450fe improved the patch for loading DICOM dictionary from memory
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3316
diff changeset
39 RESULT_VARIABLE Failure
0301f59450fe improved the patch for loading DICOM dictionary from memory
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3316
diff changeset
40 )
3280
fddf3ceed7e5 fixing lsb and msvc builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3279
diff changeset
41
3593
0301f59450fe improved the patch for loading DICOM dictionary from memory
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3316
diff changeset
42 if (Failure)
0301f59450fe improved the patch for loading DICOM dictionary from memory
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3316
diff changeset
43 message(FATAL_ERROR "Error while patching a file")
0301f59450fe improved the patch for loading DICOM dictionary from memory
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3316
diff changeset
44 endif()
0301f59450fe improved the patch for loading DICOM dictionary from memory
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3316
diff changeset
45
0301f59450fe improved the patch for loading DICOM dictionary from memory
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3316
diff changeset
46 configure_file(
0301f59450fe improved the patch for loading DICOM dictionary from memory
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3316
diff changeset
47 ${ORTHANC_ROOT}/Resources/Patches/dcmtk-dcdict_orthanc.cc
0301f59450fe improved the patch for loading DICOM dictionary from memory
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3316
diff changeset
48 ${DCMTK_SOURCES_DIR}/dcmdata/libsrc/dcdict_orthanc.cc
0301f59450fe improved the patch for loading DICOM dictionary from memory
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3316
diff changeset
49 COPYONLY)
0301f59450fe improved the patch for loading DICOM dictionary from memory
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3316
diff changeset
50 else()
0301f59450fe improved the patch for loading DICOM dictionary from memory
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3316
diff changeset
51 message("The patches for DCMTK have already been applied")
3280
fddf3ceed7e5 fixing lsb and msvc builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3279
diff changeset
52 endif()
fddf3ceed7e5 fixing lsb and msvc builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3279
diff changeset
53
fddf3ceed7e5 fixing lsb and msvc builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3279
diff changeset
54
3279
dd10fe965870 use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
55 include_directories(
dd10fe965870 use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
56 ${DCMTK_SOURCES_DIR}/dcmiod/include
dd10fe965870 use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
57 )
dd10fe965870 use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
58
dd10fe965870 use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
59
dd10fe965870 use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
60 # C_CHAR_UNSIGNED *must* be set before calling "GenerateDCMTKConfigure.cmake"
dd10fe965870 use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
61 IF (CMAKE_CROSSCOMPILING)
dd10fe965870 use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
62 if (CMAKE_COMPILER_IS_GNUCXX AND
dd10fe965870 use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
63 CMAKE_SYSTEM_NAME STREQUAL "Windows") # MinGW
dd10fe965870 use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
64 SET(C_CHAR_UNSIGNED 1 CACHE INTERNAL "Whether char is unsigned.")
dd10fe965870 use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
65
dd10fe965870 use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
66 elseif(CMAKE_SYSTEM_NAME STREQUAL "Emscripten") # WebAssembly or asm.js
dd10fe965870 use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
67
dd10fe965870 use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
68 # Check out "../WebAssembly/ArithmeticTests/" to regenerate the
dd10fe965870 use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
69 # "arith.h" file
dd10fe965870 use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
70 configure_file(
dd10fe965870 use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
71 ${ORTHANC_ROOT}/Resources/WebAssembly/arith.h
dd10fe965870 use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
72 ${DCMTK_SOURCES_DIR}/config/include/dcmtk/config/arith.h
dd10fe965870 use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
73 COPYONLY)
dd10fe965870 use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
74
dd10fe965870 use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
75 UNSET(C_CHAR_UNSIGNED CACHE)
dd10fe965870 use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
76 SET(C_CHAR_UNSIGNED 0 CACHE INTERNAL "")
dd10fe965870 use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
77
dd10fe965870 use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
78 else()
dd10fe965870 use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
79 message(FATAL_ERROR "Support your platform here")
dd10fe965870 use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
80 endif()
dd10fe965870 use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
81 ENDIF()
dd10fe965870 use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
82
dd10fe965870 use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
83
dd10fe965870 use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
84 if ("${CMAKE_SYSTEM_VERSION}" STREQUAL "LinuxStandardBase")
dd10fe965870 use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
85 SET(DCMTK_ENABLE_CHARSET_CONVERSION "iconv" CACHE STRING "")
dd10fe965870 use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
86 SET(HAVE_SYS_GETTID 0 CACHE INTERNAL "")
dd10fe965870 use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
87 endif()
dd10fe965870 use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
88
dd10fe965870 use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
89
dd10fe965870 use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
90 SET(DCMTK_SOURCE_DIR ${DCMTK_SOURCES_DIR})
dd10fe965870 use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
91 include(${DCMTK_SOURCES_DIR}/CMake/CheckFunctionWithHeaderExists.cmake)
dd10fe965870 use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
92 include(${DCMTK_SOURCES_DIR}/CMake/GenerateDCMTKConfigure.cmake)
dd10fe965870 use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
93
dd10fe965870 use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
94
dd10fe965870 use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
95 if (CMAKE_SYSTEM_NAME STREQUAL "Emscripten") # WebAssembly or
dd10fe965870 use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
96 # asm.js The macros below are not properly discovered by DCMTK
dd10fe965870 use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
97 # when using WebAssembly. Check out "../WebAssembly/arith.h" for
dd10fe965870 use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
98 # how we produced these values. This step MUST be after
dd10fe965870 use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
99 # "GenerateDCMTKConfigure" and before the generation of
dd10fe965870 use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
100 # "osconfig.h".
dd10fe965870 use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
101 UNSET(SIZEOF_VOID_P CACHE)
dd10fe965870 use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
102 UNSET(SIZEOF_CHAR CACHE)
dd10fe965870 use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
103 UNSET(SIZEOF_DOUBLE CACHE)
dd10fe965870 use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
104 UNSET(SIZEOF_FLOAT CACHE)
dd10fe965870 use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
105 UNSET(SIZEOF_INT CACHE)
dd10fe965870 use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
106 UNSET(SIZEOF_LONG CACHE)
dd10fe965870 use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
107 UNSET(SIZEOF_SHORT CACHE)
dd10fe965870 use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
108 UNSET(SIZEOF_VOID_P CACHE)
dd10fe965870 use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
109
dd10fe965870 use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
110 SET(SIZEOF_VOID_P 4 CACHE INTERNAL "")
dd10fe965870 use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
111 SET(SIZEOF_CHAR 1 CACHE INTERNAL "")
dd10fe965870 use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
112 SET(SIZEOF_DOUBLE 8 CACHE INTERNAL "")
dd10fe965870 use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
113 SET(SIZEOF_FLOAT 4 CACHE INTERNAL "")
dd10fe965870 use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
114 SET(SIZEOF_INT 4 CACHE INTERNAL "")
dd10fe965870 use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
115 SET(SIZEOF_LONG 4 CACHE INTERNAL "")
dd10fe965870 use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
116 SET(SIZEOF_SHORT 2 CACHE INTERNAL "")
dd10fe965870 use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
117 SET(SIZEOF_VOID_P 4 CACHE INTERNAL "")
dd10fe965870 use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
118 endif()
dd10fe965870 use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
119
dd10fe965870 use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
120
dd10fe965870 use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
121 set(DCMTK_PACKAGE_VERSION_SUFFIX "")
dd10fe965870 use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
122 set(DCMTK_PACKAGE_VERSION_NUMBER ${DCMTK_VERSION_NUMBER})
dd10fe965870 use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
123
dd10fe965870 use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
124 CONFIGURE_FILE(
dd10fe965870 use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
125 ${DCMTK_SOURCES_DIR}/CMake/osconfig.h.in
dd10fe965870 use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
126 ${DCMTK_SOURCES_DIR}/config/include/dcmtk/config/osconfig.h)
dd10fe965870 use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
127
dd10fe965870 use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
128 if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
dd10fe965870 use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
129 link_libraries(netapi32) # For NetWkstaUserGetInfo@12
dd10fe965870 use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
130 link_libraries(iphlpapi) # For GetAdaptersInfo@8
dd10fe965870 use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
131
dd10fe965870 use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
132 # Configure Wine if cross-compiling for Windows
dd10fe965870 use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
133 if (CMAKE_COMPILER_IS_GNUCXX)
dd10fe965870 use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
134 include(${DCMTK_SOURCES_DIR}/CMake/dcmtkUseWine.cmake)
dd10fe965870 use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
135 FIND_PROGRAM(WINE_WINE_PROGRAM wine)
dd10fe965870 use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
136 FIND_PROGRAM(WINE_WINEPATH_PROGRAM winepath)
dd10fe965870 use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
137 list(APPEND DCMTK_TRY_COMPILE_REQUIRED_CMAKE_FLAGS "-DCMAKE_EXE_LINKER_FLAGS=-static")
dd10fe965870 use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
138 endif()
dd10fe965870 use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
139 endif()
dd10fe965870 use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
140
dd10fe965870 use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
141 # This step must be after the generation of "osconfig.h"
dd10fe965870 use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
142 if (NOT CMAKE_SYSTEM_NAME STREQUAL "Emscripten")
dd10fe965870 use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
143 INSPECT_FUNDAMENTAL_ARITHMETIC_TYPES()
dd10fe965870 use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
144 endif()
dd10fe965870 use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
145
dd10fe965870 use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
146
dd10fe965870 use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
147 # Source for the logging facility of DCMTK
dd10fe965870 use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
148 AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/oflog/libsrc DCMTK_SOURCES)
dd10fe965870 use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
149 if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux" OR
dd10fe965870 use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
150 ${CMAKE_SYSTEM_NAME} STREQUAL "Darwin" OR
dd10fe965870 use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
151 ${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD" OR
dd10fe965870 use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
152 ${CMAKE_SYSTEM_NAME} STREQUAL "kFreeBSD" OR
dd10fe965870 use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
153 ${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD" OR
dd10fe965870 use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
154 ${CMAKE_SYSTEM_NAME} STREQUAL "Emscripten")
dd10fe965870 use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
155 list(REMOVE_ITEM DCMTK_SOURCES
dd10fe965870 use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
156 ${DCMTK_SOURCES_DIR}/oflog/libsrc/clfsap.cc
dd10fe965870 use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
157 ${DCMTK_SOURCES_DIR}/oflog/libsrc/windebap.cc
dd10fe965870 use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
158 ${DCMTK_SOURCES_DIR}/oflog/libsrc/winsock.cc
dd10fe965870 use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
159 )
dd10fe965870 use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
160
dd10fe965870 use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
161 elseif (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
dd10fe965870 use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
162 list(REMOVE_ITEM DCMTK_SOURCES
dd10fe965870 use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
163 ${DCMTK_SOURCES_DIR}/oflog/libsrc/unixsock.cc
dd10fe965870 use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
164 ${DCMTK_SOURCES_DIR}/oflog/libsrc/clfsap.cc
dd10fe965870 use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
165 )
dd10fe965870 use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
166 endif()
dd10fe965870 use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
167
dd10fe965870 use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
168
dd10fe965870 use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
169 list(REMOVE_ITEM DCMTK_SOURCES
dd10fe965870 use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
170 ${DCMTK_SOURCES_DIR}/dcmdata/libsrc/mkdictbi.cc
dd10fe965870 use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
171 ${DCMTK_SOURCES_DIR}/dcmdata/libsrc/mkdeftag.cc
dd10fe965870 use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
172 )
3316
4b1017928fc4 Fix performance issue in DICOM protocol by disabling Nagle's algorithm
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3280
diff changeset
173
4b1017928fc4 Fix performance issue in DICOM protocol by disabling Nagle's algorithm
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3280
diff changeset
174
4b1017928fc4 Fix performance issue in DICOM protocol by disabling Nagle's algorithm
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3280
diff changeset
175 # 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: 3280
diff changeset
176 # 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: 3280
diff changeset
177 # 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: 3280
diff changeset
178 # 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: 3280
diff changeset
179 # 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: 3280
diff changeset
180 # 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: 3280
diff changeset
181 # macros.txt for details).
4b1017928fc4 Fix performance issue in DICOM protocol by disabling Nagle's algorithm
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3280
diff changeset
182 # 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: 3280
diff changeset
183 add_definitions(
4b1017928fc4 Fix performance issue in DICOM protocol by disabling Nagle's algorithm
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3280
diff changeset
184 -DDISABLE_NAGLE_ALGORITHM=1
4b1017928fc4 Fix performance issue in DICOM protocol by disabling Nagle's algorithm
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3280
diff changeset
185 )
3721
c575fb0adf91 upgraded jsoncpp to 0.10.7 for pre-C++11 compilers
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3719
diff changeset
186
c575fb0adf91 upgraded jsoncpp to 0.10.7 for pre-C++11 compilers
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3719
diff changeset
187
3773
df164cc69529 fix compatibility between MSVC and Windows XP
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3722
diff changeset
188 if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
df164cc69529 fix compatibility between MSVC and Windows XP
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3722
diff changeset
189 # For compatibility with Windows XP, avoid using fiber-local-storage
df164cc69529 fix compatibility between MSVC and Windows XP
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3722
diff changeset
190 # in log4cplus, but use thread-local-storage instead. Otherwise,
df164cc69529 fix compatibility between MSVC and Windows XP
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3722
diff changeset
191 # Windows XP complains about missing "FlsGetValue()" in KERNEL32.dll
3721
c575fb0adf91 upgraded jsoncpp to 0.10.7 for pre-C++11 compilers
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3719
diff changeset
192 add_definitions(
c575fb0adf91 upgraded jsoncpp to 0.10.7 for pre-C++11 compilers
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3719
diff changeset
193 -DDCMTK_LOG4CPLUS_AVOID_WIN32_FLS
c575fb0adf91 upgraded jsoncpp to 0.10.7 for pre-C++11 compilers
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3719
diff changeset
194 )
3773
df164cc69529 fix compatibility between MSVC and Windows XP
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3722
diff changeset
195
3774
6d2b94698995 fix for MSVC 32bit
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3773
diff changeset
196 if (CMAKE_COMPILER_IS_GNUCXX OR # MinGW
6d2b94698995 fix for MSVC 32bit
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3773
diff changeset
197 "${CMAKE_SIZEOF_VOID_P}" STREQUAL "4") # MSVC for 32bit (*)
6d2b94698995 fix for MSVC 32bit
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3773
diff changeset
198
6d2b94698995 fix for MSVC 32bit
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3773
diff changeset
199 # (*) With multithreaded logging enabled, Visual Studio 2008 fails
6d2b94698995 fix for MSVC 32bit
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3773
diff changeset
200 # with error: ".\dcmtk-3.6.5\oflog\libsrc\globinit.cc(422) : error
6d2b94698995 fix for MSVC 32bit
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3773
diff changeset
201 # C2664: 'dcmtk::log4cplus::thread::impl::tls_init' : cannot
6d2b94698995 fix for MSVC 32bit
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3773
diff changeset
202 # convert parameter 1 from 'void (__stdcall *)(void *)' to
6d2b94698995 fix for MSVC 32bit
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3773
diff changeset
203 # 'dcmtk::log4cplus::thread::impl::tls_init_cleanup_func_type'"
6d2b94698995 fix for MSVC 32bit
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3773
diff changeset
204 # None of the functions with this name in scope match the target type
6d2b94698995 fix for MSVC 32bit
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3773
diff changeset
205
3773
df164cc69529 fix compatibility between MSVC and Windows XP
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3722
diff changeset
206 add_definitions(
df164cc69529 fix compatibility between MSVC and Windows XP
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3722
diff changeset
207 -DDCMTK_LOG4CPLUS_SINGLE_THREADED
df164cc69529 fix compatibility between MSVC and Windows XP
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3722
diff changeset
208 )
df164cc69529 fix compatibility between MSVC and Windows XP
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3722
diff changeset
209 endif()
3721
c575fb0adf91 upgraded jsoncpp to 0.10.7 for pre-C++11 compilers
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3719
diff changeset
210 endif()