Mercurial > hg > orthanc

comparison Resources/CMake/OrthancFrameworkConfiguration.cmake @ 3786:3801435e34a1 SylvainRouquette/fix-issue169-95b752c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
integration Orthanc-1.6.0->SylvainRouquette
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 19 Mar 2020 11:48:30 +0100
parents 090022f1b5e1
children 4f78da5613a1 4570c57668a8
comparison
equal deleted inserted replaced
3785:763533d6dd67 3786:3801435e34a1
105 105
106 if (NOT ENABLE_DCMTK) 106 if (NOT ENABLE_DCMTK)
107 add_definitions( 107 add_definitions(
108 -DORTHANC_ENABLE_DCMTK=0 108 -DORTHANC_ENABLE_DCMTK=0
109 -DORTHANC_ENABLE_DCMTK_NETWORKING=0 109 -DORTHANC_ENABLE_DCMTK_NETWORKING=0
110 -DORTHANC_ENABLE_DCMTK_TRANSCODING=0
110 ) 111 )
111 unset(DCMTK_DICTIONARY_DIR CACHE) 112 unset(DCMTK_DICTIONARY_DIR CACHE)
112 unset(DCMTK_VERSION CACHE) 113 unset(DCMTK_VERSION CACHE)
113 unset(USE_DCMTK_362_PRIVATE_DIC CACHE) 114 unset(USE_DCMTK_362_PRIVATE_DIC CACHE)
114 unset(USE_SYSTEM_DCMTK CACHE) 115 unset(USE_SYSTEM_DCMTK CACHE)
121 ## List of source files 122 ## List of source files
122 ##################################################################### 123 #####################################################################
123 124
124 set(ORTHANC_CORE_SOURCES_INTERNAL 125 set(ORTHANC_CORE_SOURCES_INTERNAL
125 ${ORTHANC_ROOT}/Core/Cache/MemoryCache.cpp 126 ${ORTHANC_ROOT}/Core/Cache/MemoryCache.cpp
127 ${ORTHANC_ROOT}/Core/Cache/MemoryObjectCache.cpp
128 ${ORTHANC_ROOT}/Core/Cache/MemoryStringCache.cpp
126 ${ORTHANC_ROOT}/Core/ChunkedBuffer.cpp 129 ${ORTHANC_ROOT}/Core/ChunkedBuffer.cpp
127 ${ORTHANC_ROOT}/Core/DicomFormat/DicomTag.cpp 130 ${ORTHANC_ROOT}/Core/DicomFormat/DicomTag.cpp
128 ${ORTHANC_ROOT}/Core/EnumerationDictionary.h 131 ${ORTHANC_ROOT}/Core/EnumerationDictionary.h
129 ${ORTHANC_ROOT}/Core/Enumerations.cpp 132 ${ORTHANC_ROOT}/Core/Enumerations.cpp
130 ${ORTHANC_ROOT}/Core/FileStorage/MemoryStorageArea.cpp 133 ${ORTHANC_ROOT}/Core/FileStorage/MemoryStorageArea.cpp
459 462
460 set(ORTHANC_DICOM_SOURCES_INTERNAL 463 set(ORTHANC_DICOM_SOURCES_INTERNAL
461 ${ORTHANC_ROOT}/Core/DicomParsing/DicomModification.cpp 464 ${ORTHANC_ROOT}/Core/DicomParsing/DicomModification.cpp
462 ${ORTHANC_ROOT}/Core/DicomParsing/DicomWebJsonVisitor.cpp 465 ${ORTHANC_ROOT}/Core/DicomParsing/DicomWebJsonVisitor.cpp
463 ${ORTHANC_ROOT}/Core/DicomParsing/FromDcmtkBridge.cpp 466 ${ORTHANC_ROOT}/Core/DicomParsing/FromDcmtkBridge.cpp
467 ${ORTHANC_ROOT}/Core/DicomParsing/ParsedDicomDir.cpp
464 ${ORTHANC_ROOT}/Core/DicomParsing/ParsedDicomFile.cpp 468 ${ORTHANC_ROOT}/Core/DicomParsing/ParsedDicomFile.cpp
465 ${ORTHANC_ROOT}/Core/DicomParsing/ToDcmtkBridge.cpp 469 ${ORTHANC_ROOT}/Core/DicomParsing/ToDcmtkBridge.cpp
466 470
467 ${ORTHANC_ROOT}/Core/DicomParsing/Internals/DicomFrameIndex.cpp 471 ${ORTHANC_ROOT}/Core/DicomParsing/Internals/DicomFrameIndex.cpp
468 ${ORTHANC_ROOT}/Core/DicomParsing/Internals/DicomImageDecoder.cpp 472 ${ORTHANC_ROOT}/Core/DicomParsing/Internals/DicomImageDecoder.cpp
487 ${ORTHANC_ROOT}/Core/DicomNetworking/RemoteModalityParameters.cpp 491 ${ORTHANC_ROOT}/Core/DicomNetworking/RemoteModalityParameters.cpp
488 ${ORTHANC_ROOT}/Core/DicomNetworking/TimeoutDicomConnectionManager.cpp 492 ${ORTHANC_ROOT}/Core/DicomNetworking/TimeoutDicomConnectionManager.cpp
489 ) 493 )
490 else() 494 else()
491 add_definitions(-DORTHANC_ENABLE_DCMTK_NETWORKING=0) 495 add_definitions(-DORTHANC_ENABLE_DCMTK_NETWORKING=0)
496 endif()
497
498 # New in Orthanc 1.6.0
499 if (ENABLE_DCMTK_TRANSCODING)
500 add_definitions(-DORTHANC_ENABLE_DCMTK_TRANSCODING=1)
501 else()
502 add_definitions(-DORTHANC_ENABLE_DCMTK_TRANSCODING=0)
492 endif() 503 endif()
493 504
494 if (STANDALONE_BUILD AND NOT HAS_EMBEDDED_RESOURCES) 505 if (STANDALONE_BUILD AND NOT HAS_EMBEDDED_RESOURCES)
495 EmbedResources( 506 EmbedResources(
496 ${DCMTK_DICTIONARIES} 507 ${DCMTK_DICTIONARIES}