Mercurial > hg > orthanc

comparison OrthancFramework/Resources/CMake/DcmtkConfiguration.cmake @ 5505:b305bc32b77d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
upgraded to zlib 1.3.1
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 24 Jan 2024 17:51:21 +0100
parents 33f8e180edcf
children 0a74634073c0
comparison
equal deleted inserted replaced
5503:5910aa0c96ce 5505:b305bc32b77d
64 endif() 64 endif()
65 65
66 if (ENABLE_DCMTK_NETWORKING) 66 if (ENABLE_DCMTK_NETWORKING)
67 AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmnet/libsrc DCMTK_SOURCES) 67 AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmnet/libsrc DCMTK_SOURCES)
68 include_directories( 68 include_directories(
69 BEFORE SYSTEM
69 ${DCMTK_SOURCES_DIR}/dcmnet/include 70 ${DCMTK_SOURCES_DIR}/dcmnet/include
70 ) 71 )
71 endif() 72 endif()
72 73
73 if (ENABLE_DCMTK_TRANSCODING) 74 if (ENABLE_DCMTK_TRANSCODING)
74 AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmimgle/libsrc DCMTK_SOURCES) 75 AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmimgle/libsrc DCMTK_SOURCES)
75 AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmimage/libsrc DCMTK_SOURCES) 76 AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmimage/libsrc DCMTK_SOURCES)
76 include_directories( 77 include_directories(
78 BEFORE SYSTEM
77 ${DCMTK_SOURCES_DIR}/dcmimage/include 79 ${DCMTK_SOURCES_DIR}/dcmimage/include
78 ) 80 )
79 endif() 81 endif()
80 82
81 if (ENABLE_DCMTK_JPEG) 83 if (ENABLE_DCMTK_JPEG)
82 AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmjpeg/libsrc DCMTK_SOURCES) 84 AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmjpeg/libsrc DCMTK_SOURCES)
83 AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmjpeg/libijg8 DCMTK_SOURCES) 85 AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmjpeg/libijg8 DCMTK_SOURCES)
84 AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmjpeg/libijg12 DCMTK_SOURCES) 86 AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmjpeg/libijg12 DCMTK_SOURCES)
85 AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmjpeg/libijg16 DCMTK_SOURCES) 87 AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmjpeg/libijg16 DCMTK_SOURCES)
86 include_directories( 88 include_directories(
89 BEFORE SYSTEM
87 ${DCMTK_SOURCES_DIR}/dcmjpeg/include 90 ${DCMTK_SOURCES_DIR}/dcmjpeg/include
88 ${DCMTK_SOURCES_DIR}/dcmjpeg/libijg8 91 ${DCMTK_SOURCES_DIR}/dcmjpeg/libijg8
89 ${DCMTK_SOURCES_DIR}/dcmjpeg/libijg12 92 ${DCMTK_SOURCES_DIR}/dcmjpeg/libijg12
90 ${DCMTK_SOURCES_DIR}/dcmjpeg/libijg16 93 ${DCMTK_SOURCES_DIR}/dcmjpeg/libijg16
91 ${DCMTK_SOURCES_DIR}/dcmimgle/include 94 ${DCMTK_SOURCES_DIR}/dcmimgle/include
118 121
119 if (ENABLE_DCMTK_JPEG_LOSSLESS) 122 if (ENABLE_DCMTK_JPEG_LOSSLESS)
120 AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmjpls/libsrc DCMTK_SOURCES) 123 AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmjpls/libsrc DCMTK_SOURCES)
121 AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmjpls/libcharls DCMTK_SOURCES) 124 AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmjpls/libcharls DCMTK_SOURCES)
122 include_directories( 125 include_directories(
126 BEFORE SYSTEM
123 ${DCMTK_SOURCES_DIR}/dcmjpeg/include 127 ${DCMTK_SOURCES_DIR}/dcmjpeg/include
124 ${DCMTK_SOURCES_DIR}/dcmjpls/include 128 ${DCMTK_SOURCES_DIR}/dcmjpls/include
125 ${DCMTK_SOURCES_DIR}/dcmjpls/libcharls 129 ${DCMTK_SOURCES_DIR}/dcmjpls/libcharls
126 ) 130 )
127 list(APPEND DCMTK_SOURCES 131 list(APPEND DCMTK_SOURCES
141 145
142 # New in Orthanc 1.9.0 for DICOM TLS 146 # New in Orthanc 1.9.0 for DICOM TLS
143 if (ENABLE_DCMTK_NETWORKING AND ENABLE_SSL) 147 if (ENABLE_DCMTK_NETWORKING AND ENABLE_SSL)
144 AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmtls/libsrc DCMTK_SOURCES) 148 AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmtls/libsrc DCMTK_SOURCES)
145 include_directories( 149 include_directories(
150 BEFORE SYSTEM
146 ${DCMTK_SOURCES_DIR}/dcmtls/include 151 ${DCMTK_SOURCES_DIR}/dcmtls/include
147 ) 152 )
148 153
149 if (STATIC_BUILD OR NOT USE_SYSTEM_OPENSSL) 154 if (STATIC_BUILD OR NOT USE_SYSTEM_OPENSSL)
150 # The function "SSL_CTX_get0_param()" is available on both 155 # The function "SSL_CTX_get0_param()" is available on both
187 -DDCMTK_LOG4CPLUS_DISABLE_DEBUG=1 192 -DDCMTK_LOG4CPLUS_DISABLE_DEBUG=1
188 ) 193 )
189 endif() 194 endif()
190 195
191 include_directories( 196 include_directories(
197 BEFORE SYSTEM
192 #${DCMTK_SOURCES_DIR} 198 #${DCMTK_SOURCES_DIR}
193 ${DCMTK_SOURCES_DIR}/config/include 199 ${DCMTK_SOURCES_DIR}/config/include
194 ${DCMTK_SOURCES_DIR}/ofstd/include 200 ${DCMTK_SOURCES_DIR}/ofstd/include
195 ${DCMTK_SOURCES_DIR}/oflog/include 201 ${DCMTK_SOURCES_DIR}/oflog/include
196 ${DCMTK_SOURCES_DIR}/dcmdata/include 202 ${DCMTK_SOURCES_DIR}/dcmdata/include