Mercurial > hg > orthanc

comparison Resources/CMake/DcmtkConfiguration.cmake @ 1149:dd6d7fd82da9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix version of dcmtk
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 11 Sep 2014 15:34:08 +0200
parents 3a26bc6e4867
children 7f0aa3c0f659 6784a119484d
comparison
equal deleted inserted replaced
1148:ac36589f699e 1149:dd6d7fd82da9
37 set(HAVE_PROTOTYPE_BIND 1) 37 set(HAVE_PROTOTYPE_BIND 1)
38 set(HAVE_PROTOTYPE_ACCEPT 1) 38 set(HAVE_PROTOTYPE_ACCEPT 1)
39 set(HAVE_PROTOTYPE_SETSOCKNAME 1) 39 set(HAVE_PROTOTYPE_SETSOCKNAME 1)
40 set(HAVE_PROTOTYPE_GETSOCKNAME 1) 40 set(HAVE_PROTOTYPE_GETSOCKNAME 1)
41 endif() 41 endif()
42
43 set(DCMTK_PACKAGE_VERSION "3.6.0")
44 set(DCMTK_PACKAGE_VERSION_SUFFIX "")
45 set(DCMTK_PACKAGE_VERSION_NUMBER 360)
42 46
43 CONFIGURE_FILE( 47 CONFIGURE_FILE(
44 ${DCMTK_SOURCES_DIR}/CMake/osconfig.h.in 48 ${DCMTK_SOURCES_DIR}/CMake/osconfig.h.in
45 ${DCMTK_SOURCES_DIR}/config/include/dcmtk/config/osconfig.h) 49 ${DCMTK_SOURCES_DIR}/config/include/dcmtk/config/osconfig.h)
46 50
112 ${DCMTK_SOURCES_DIR}/dcmdata/libsrc/mkdictbi.cc 116 ${DCMTK_SOURCES_DIR}/dcmdata/libsrc/mkdictbi.cc
113 ${DCMTK_SOURCES_DIR}/dcmdata/libsrc/mkdeftag.cc 117 ${DCMTK_SOURCES_DIR}/dcmdata/libsrc/mkdeftag.cc
114 ${DCMTK_SOURCES_DIR}/dcmdata/libsrc/dcdictbi.cc 118 ${DCMTK_SOURCES_DIR}/dcmdata/libsrc/dcdictbi.cc
115 ) 119 )
116 120
121 #set_source_files_properties(${DCMTK_SOURCES}
122 # PROPERTIES COMPILE_DEFINITIONS
123 # "PACKAGE_VERSION=\"3.6.0\";PACKAGE_VERSION_NUMBER=\"360\"")
124
117 # This fixes crashes related to the destruction of the DCMTK OFLogger 125 # This fixes crashes related to the destruction of the DCMTK OFLogger
118 # http://support.dcmtk.org/docs-snapshot/file_macros.html 126 # http://support.dcmtk.org/docs-snapshot/file_macros.html
119 add_definitions( 127 add_definitions(
120 -DLOG4CPLUS_DISABLE_FATAL=1 128 -DLOG4CPLUS_DISABLE_FATAL=1
121 -DDCMTK_VERSION_NUMBER=360 129 -DDCMTK_VERSION_NUMBER=360