Mercurial > hg > orthanc

comparison Resources/CMake/DcmtkConfiguration.cmake @ 298:6c4f6229aad7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix in embedding dictionaries
author Sebastien Jodogne <s.jodogne@gmail.com>
date Mon, 17 Dec 2012 10:06:45 +0100
parents 4d7469f72a0b
children 301f2831489c
comparison
equal deleted inserted replaced
297:1c8384e8408c 298:6c4f6229aad7
68 68
69 source_group(ThirdParty\\Dcmtk REGULAR_EXPRESSION ${DCMTK_SOURCES_DIR}/.*) 69 source_group(ThirdParty\\Dcmtk REGULAR_EXPRESSION ${DCMTK_SOURCES_DIR}/.*)
70 70
71 set(DCMTK_BUNDLES_LOG4CPLUS 1) 71 set(DCMTK_BUNDLES_LOG4CPLUS 1)
72 72
73 if (${STANDALONE_BUILD}) 73 add_definitions(-DDCMTK_USE_EMBEDDED_DICTIONARIES=1)
74 set(DCMTK_DICTIONARIES 74 set(DCMTK_DICTIONARIES
75 DICTIONARY_DICOM ${DCMTK_SOURCES_DIR}/dcmdata/data/dicom.dic 75 DICTIONARY_DICOM ${DCMTK_SOURCES_DIR}/dcmdata/data/dicom.dic
76 DICTIONARY_PRIVATE ${DCMTK_SOURCES_DIR}/dcmdata/data/private.dic 76 DICTIONARY_PRIVATE ${DCMTK_SOURCES_DIR}/dcmdata/data/private.dic
77 DICTIONARY_DICONDE ${DCMTK_SOURCES_DIR}/dcmdata/data/diconde.dic 77 DICTIONARY_DICONDE ${DCMTK_SOURCES_DIR}/dcmdata/data/diconde.dic
78 ) 78 )
79 endif()
80 79
81 else() 80 else()
82 # The following line allows to manually add libraries at the 81 # The following line allows to manually add libraries at the
83 # command-line, which is necessary for Ubuntu/Debian packages 82 # command-line, which is necessary for Ubuntu/Debian packages
84 set(tmp "${DCMTK_LIBRARIES}") 83 set(tmp "${DCMTK_LIBRARIES}")
110 ".*PACKAGE_VERSION.*\"([0-9]*)\\.([0-9]*)\\.([0-9]*)\"$" 109 ".*PACKAGE_VERSION.*\"([0-9]*)\\.([0-9]*)\\.([0-9]*)\"$"
111 "\\1\\2\\3" 110 "\\1\\2\\3"
112 DCMTK_VERSION_NUMBER 111 DCMTK_VERSION_NUMBER
113 ${DCMTK_VERSION_NUMBER1}) 112 ${DCMTK_VERSION_NUMBER1})
114 113
114 add_definitions(-DDCMTK_USE_EMBEDDED_DICTIONARIES=0)
115
115 endif() 116 endif()
116 117
117 add_definitions(-DDCMTK_VERSION_NUMBER=${DCMTK_VERSION_NUMBER}) 118 add_definitions(-DDCMTK_VERSION_NUMBER=${DCMTK_VERSION_NUMBER})
118 message("DCMTK version: ${DCMTK_VERSION_NUMBER}") 119 message("DCMTK version: ${DCMTK_VERSION_NUMBER}")