Mercurial > hg > orthanc

comparison Resources/CMake/DcmtkConfiguration.cmake @ 2149:e438b5964d77

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix dcmtk 3.6.1 build
author Sebastien Jodogne <s.jodogne@gmail.com>
date Mon, 14 Nov 2016 10:58:13 +0100
parents 09cb73980740
children 9a272d552c27
comparison
equal deleted inserted replaced
2148:e18023c2fdfb 2149:e438b5964d77
63 ${DCMTK_SOURCES_DIR}/config/include/dcmtk/config/osconfig.h) 63 ${DCMTK_SOURCES_DIR}/config/include/dcmtk/config/osconfig.h)
64 64
65 if (USE_DCMTK_361) 65 if (USE_DCMTK_361)
66 # This step must be after the generation of "osconfig.h" 66 # This step must be after the generation of "osconfig.h"
67 INSPECT_FUNDAMENTAL_ARITHMETIC_TYPES() 67 INSPECT_FUNDAMENTAL_ARITHMETIC_TYPES()
68 else()
69 # Removing this file is required with DCMTK 3.6.0
70 list(REMOVE_ITEM DCMTK_SOURCES
71 ${DCMTK_SOURCES_DIR}/dcmdata/libsrc/dcdictbi.cc
72 )
68 endif() 73 endif()
69 74
70 AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmdata/libsrc DCMTK_SOURCES) 75 AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmdata/libsrc DCMTK_SOURCES)
71 AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/ofstd/libsrc DCMTK_SOURCES) 76 AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/ofstd/libsrc DCMTK_SOURCES)
72 77
179 endif() 184 endif()
180 185
181 list(REMOVE_ITEM DCMTK_SOURCES 186 list(REMOVE_ITEM DCMTK_SOURCES
182 ${DCMTK_SOURCES_DIR}/dcmdata/libsrc/mkdictbi.cc 187 ${DCMTK_SOURCES_DIR}/dcmdata/libsrc/mkdictbi.cc
183 ${DCMTK_SOURCES_DIR}/dcmdata/libsrc/mkdeftag.cc 188 ${DCMTK_SOURCES_DIR}/dcmdata/libsrc/mkdeftag.cc
184 ${DCMTK_SOURCES_DIR}/dcmdata/libsrc/dcdictbi.cc
185 ) 189 )
186 190
187 #set_source_files_properties(${DCMTK_SOURCES} 191 #set_source_files_properties(${DCMTK_SOURCES}
188 # PROPERTIES COMPILE_DEFINITIONS 192 # PROPERTIES COMPILE_DEFINITIONS
189 # "PACKAGE_VERSION=\"${DCMTK_PACKAGE_VERSION}\";PACKAGE_VERSION_NUMBER=\"${DCMTK_VERSION_NUMBER}\"") 193 # "PACKAGE_VERSION=\"${DCMTK_PACKAGE_VERSION}\";PACKAGE_VERSION_NUMBER=\"${DCMTK_VERSION_NUMBER}\"")