Mercurial > hg > orthanc

comparison Resources/CMake/DcmtkConfiguration.cmake @ 3279:dd10fe965870

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
use of DCMTK 3.6.4 in static builds
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 21 Feb 2019 15:13:49 +0100
parents 95b0536be2c3
children 4b1017928fc4
comparison
equal deleted inserted replaced
3278:ce6a98f8ed85 3279:dd10fe965870
2 set(ENABLE_DCMTK_NETWORKING ON) 2 set(ENABLE_DCMTK_NETWORKING ON)
3 endif() 3 endif()
4 4
5 if (STATIC_BUILD OR NOT USE_SYSTEM_DCMTK) 5 if (STATIC_BUILD OR NOT USE_SYSTEM_DCMTK)
6 if (DCMTK_STATIC_VERSION STREQUAL "3.6.0") 6 if (DCMTK_STATIC_VERSION STREQUAL "3.6.0")
7 include(${CMAKE_CURRENT_LIST_DIR}/DcmtkConfigurationStatic-3.6.0.cmake) 7 include(${CMAKE_CURRENT_LIST_DIR}/DcmtkConfigurationStatic-3.6.0.cmake)
8
9 elseif (DCMTK_STATIC_VERSION STREQUAL "3.6.2") 8 elseif (DCMTK_STATIC_VERSION STREQUAL "3.6.2")
10 include(${CMAKE_CURRENT_LIST_DIR}/DcmtkConfigurationStatic-3.6.2.cmake) 9 include(${CMAKE_CURRENT_LIST_DIR}/DcmtkConfigurationStatic-3.6.2.cmake)
11 10 elseif (DCMTK_STATIC_VERSION STREQUAL "3.6.4")
12 #elseif (DCMTK_STATIC_VERSION STREQUAL "3.6.4") 11 include(${CMAKE_CURRENT_LIST_DIR}/DcmtkConfigurationStatic-3.6.4.cmake)
13
14 else() 12 else()
15 message(FATAL_ERROR "Unsupported version of DCMTK: ${DCMTK_STATIC_VERSION}") 13 message(FATAL_ERROR "Unsupported version of DCMTK: ${DCMTK_STATIC_VERSION}")
16 endif() 14 endif()
17 15
18 16
19 ## 17 ##
20 ## Commands shared by all versions of DCMTK 18 ## Commands shared by all versions of DCMTK
21 ## 19 ##
20
21 AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmdata/libsrc DCMTK_SOURCES)
22 AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/ofstd/libsrc DCMTK_SOURCES)
23
24 LIST(REMOVE_ITEM DCMTK_SOURCES
25 ${DCMTK_SOURCES_DIR}/dcmdata/libsrc/mkdictbi.cc
26 ${DCMTK_SOURCES_DIR}/dcmdata/libsrc/mkdeftag.cc
27 )
28
29 if (ENABLE_DCMTK_NETWORKING)
30 AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmnet/libsrc DCMTK_SOURCES)
31 include_directories(
32 ${DCMTK_SOURCES_DIR}/dcmnet/include
33 )
34 endif()
35
36 if (ENABLE_DCMTK_JPEG)
37 AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmjpeg/libsrc DCMTK_SOURCES)
38 AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmjpeg/libijg8 DCMTK_SOURCES)
39 AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmjpeg/libijg12 DCMTK_SOURCES)
40 AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmjpeg/libijg16 DCMTK_SOURCES)
41 include_directories(
42 ${DCMTK_SOURCES_DIR}/dcmjpeg/include
43 ${DCMTK_SOURCES_DIR}/dcmjpeg/libijg8
44 ${DCMTK_SOURCES_DIR}/dcmjpeg/libijg12
45 ${DCMTK_SOURCES_DIR}/dcmjpeg/libijg16
46 ${DCMTK_SOURCES_DIR}/dcmimgle/include
47 )
48 list(REMOVE_ITEM DCMTK_SOURCES
49 ${DCMTK_SOURCES_DIR}/dcmjpeg/libsrc/ddpiimpl.cc
50
51 # Disable support for encoding JPEG (modification in Orthanc 1.0.1)
52 ${DCMTK_SOURCES_DIR}/dcmjpeg/libsrc/djcodece.cc
53 ${DCMTK_SOURCES_DIR}/dcmjpeg/libsrc/djencsv1.cc
54 ${DCMTK_SOURCES_DIR}/dcmjpeg/libsrc/djencbas.cc
55 ${DCMTK_SOURCES_DIR}/dcmjpeg/libsrc/djencpro.cc
56 ${DCMTK_SOURCES_DIR}/dcmjpeg/libsrc/djenclol.cc
57 ${DCMTK_SOURCES_DIR}/dcmjpeg/libsrc/djencode.cc
58 ${DCMTK_SOURCES_DIR}/dcmjpeg/libsrc/djencext.cc
59 ${DCMTK_SOURCES_DIR}/dcmjpeg/libsrc/djencsps.cc
60 )
61 endif()
62
63
64 if (ENABLE_DCMTK_JPEG_LOSSLESS)
65 AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmjpls/libsrc DCMTK_SOURCES)
66 AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmjpls/libcharls DCMTK_SOURCES)
67 include_directories(
68 ${DCMTK_SOURCES_DIR}/dcmjpeg/include
69 ${DCMTK_SOURCES_DIR}/dcmjpls/include
70 ${DCMTK_SOURCES_DIR}/dcmjpls/libcharls
71 )
72 list(REMOVE_ITEM DCMTK_SOURCES
73 ${DCMTK_SOURCES_DIR}/dcmjpls/libsrc/djcodece.cc
74
75 # Disable support for encoding JPEG-LS (modification in Orthanc 1.0.1)
76 ${DCMTK_SOURCES_DIR}/dcmjpls/libsrc/djencode.cc
77 )
78 list(APPEND DCMTK_SOURCES
79 ${DCMTK_SOURCES_DIR}/dcmjpeg/libsrc/djrplol.cc
80 )
81 endif()
82
22 83
23 # This fixes crashes related to the destruction of the DCMTK OFLogger 84 # This fixes crashes related to the destruction of the DCMTK OFLogger
24 # http://support.dcmtk.org/docs-snapshot/file_macros.html 85 # http://support.dcmtk.org/docs-snapshot/file_macros.html
25 add_definitions( 86 add_definitions(
26 -DLOG4CPLUS_DISABLE_FATAL=1 87 -DLOG4CPLUS_DISABLE_FATAL=1