Mercurial > hg > orthanc

comparison Resources/CMake/DcmtkConfiguration.cmake @ 2150:9a272d552c27

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix
author Sebastien Jodogne <s.jodogne@gmail.com>
date Mon, 14 Nov 2016 12:10:07 +0100
parents e438b5964d77
children cbebc5d072b0
comparison
equal deleted inserted replaced
2149:e438b5964d77 2150:9a272d552c27
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 )
73 endif() 68 endif()
74 69
75 AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmdata/libsrc DCMTK_SOURCES) 70 AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmdata/libsrc DCMTK_SOURCES)
76 AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/ofstd/libsrc DCMTK_SOURCES) 71 AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/ofstd/libsrc DCMTK_SOURCES)
77 72
185 180
186 list(REMOVE_ITEM DCMTK_SOURCES 181 list(REMOVE_ITEM DCMTK_SOURCES
187 ${DCMTK_SOURCES_DIR}/dcmdata/libsrc/mkdictbi.cc 182 ${DCMTK_SOURCES_DIR}/dcmdata/libsrc/mkdictbi.cc
188 ${DCMTK_SOURCES_DIR}/dcmdata/libsrc/mkdeftag.cc 183 ${DCMTK_SOURCES_DIR}/dcmdata/libsrc/mkdeftag.cc
189 ) 184 )
185
186 if (NOT USE_DCMTK_361)
187 # Removing this file is required with DCMTK 3.6.0
188 list(REMOVE_ITEM DCMTK_SOURCES
189 ${DCMTK_SOURCES_DIR}/dcmdata/libsrc/dcdictbi.cc
190 )
191 endif()
190 192
191 #set_source_files_properties(${DCMTK_SOURCES} 193 #set_source_files_properties(${DCMTK_SOURCES}
192 # PROPERTIES COMPILE_DEFINITIONS 194 # PROPERTIES COMPILE_DEFINITIONS
193 # "PACKAGE_VERSION=\"${DCMTK_PACKAGE_VERSION}\";PACKAGE_VERSION_NUMBER=\"${DCMTK_VERSION_NUMBER}\"") 195 # "PACKAGE_VERSION=\"${DCMTK_PACKAGE_VERSION}\";PACKAGE_VERSION_NUMBER=\"${DCMTK_VERSION_NUMBER}\"")
194 196