Mercurial > hg > orthanc

comparison Resources/CMake/DcmtkConfiguration.cmake @ 1884:7bef560b9782 dcmtk-3.6.1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
integration mainline->dcmtk-3.6.1
author Sebastien Jodogne <s.jodogne@gmail.com>
date Fri, 11 Dec 2015 09:45:07 +0100
parents 483f26479743 71356f41ec2f
children
comparison
equal deleted inserted replaced
1874:950745f3f48b 1884:7bef560b9782
177 if (EXISTS "${DCMTK_DIR}/config/cfunix.h") 177 if (EXISTS "${DCMTK_DIR}/config/cfunix.h")
178 set(DCMTK_CONFIGURATION_FILE "${DCMTK_DIR}/config/cfunix.h") 178 set(DCMTK_CONFIGURATION_FILE "${DCMTK_DIR}/config/cfunix.h")
179 elseif (EXISTS "${DCMTK_DIR}/config/osconfig.h") # This is for Arch Linux 179 elseif (EXISTS "${DCMTK_DIR}/config/osconfig.h") # This is for Arch Linux
180 set(DCMTK_CONFIGURATION_FILE "${DCMTK_DIR}/config/osconfig.h") 180 set(DCMTK_CONFIGURATION_FILE "${DCMTK_DIR}/config/osconfig.h")
181 else() 181 else()
182 message(FATAL_ERROR "Please install libdcmtk1-dev") 182 message(FATAL_ERROR "Please install libdcmtk*-dev")
183 endif() 183 endif()
184 184
185 # Autodetection of the version of DCMTK 185 # Autodetection of the version of DCMTK
186 file(STRINGS 186 file(STRINGS
187 "${DCMTK_CONFIGURATION_FILE}" 187 "${DCMTK_CONFIGURATION_FILE}"
206 if (NOT DCMTK_USE_EMBEDDED_DICTIONARIES) 206 if (NOT DCMTK_USE_EMBEDDED_DICTIONARIES)
207 # Lookup for DICOM dictionaries, if none is specified by the user 207 # Lookup for DICOM dictionaries, if none is specified by the user
208 if (DCMTK_DICTIONARY_DIR STREQUAL "") 208 if (DCMTK_DICTIONARY_DIR STREQUAL "")
209 find_path(DCMTK_DICTIONARY_DIR_AUTO dicom.dic 209 find_path(DCMTK_DICTIONARY_DIR_AUTO dicom.dic
210 /usr/share/dcmtk 210 /usr/share/dcmtk
211 /usr/share/libdcmtk1
211 /usr/share/libdcmtk2 212 /usr/share/libdcmtk2
213 /usr/share/libdcmtk3
212 /usr/share/libdcmtk4 214 /usr/share/libdcmtk4
215 /usr/share/libdcmtk5
216 /usr/share/libdcmtk6
213 /usr/local/share/dcmtk 217 /usr/local/share/dcmtk
214 ) 218 )
215 219
216 if (${DCMTK_DICTIONARY_DIR_AUTO} MATCHES "DCMTK_DICTIONARY_DIR_AUTO-NOTFOUND") 220 if (${DCMTK_DICTIONARY_DIR_AUTO} MATCHES "DCMTK_DICTIONARY_DIR_AUTO-NOTFOUND")
217 message(FATAL_ERROR "Cannot locate the DICOM dictionary on this system") 221 message(FATAL_ERROR "Cannot locate the DICOM dictionary on this system")