Mercurial > hg > orthanc
annotate Resources/CMake/DcmtkConfiguration.cmake @ 4013:1e9f6d706237
cleanup
author | Alain Mazy <alain@mazy.be> |
---|---|
date | Mon, 08 Jun 2020 16:10:09 +0200 |
parents | d86bddb50972 |
children | 9d2d2c1afcec |
rev | line source |
---|---|
1914
501769757bf9
flag to remove network support in dcmtk, removal of unneeded sources in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1883
diff
changeset
|
1 if (NOT DEFINED ENABLE_DCMTK_NETWORKING) |
3274
95b0536be2c3
preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3133
diff
changeset
|
2 set(ENABLE_DCMTK_NETWORKING ON) |
1914
501769757bf9
flag to remove network support in dcmtk, removal of unneeded sources in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1883
diff
changeset
|
3 endif() |
501769757bf9
flag to remove network support in dcmtk, removal of unneeded sources in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1883
diff
changeset
|
4 |
929 | 5 if (STATIC_BUILD OR NOT USE_SYSTEM_DCMTK) |
3274
95b0536be2c3
preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3133
diff
changeset
|
6 if (DCMTK_STATIC_VERSION STREQUAL "3.6.0") |
3279
dd10fe965870
use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3274
diff
changeset
|
7 include(${CMAKE_CURRENT_LIST_DIR}/DcmtkConfigurationStatic-3.6.0.cmake) |
3274
95b0536be2c3
preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3133
diff
changeset
|
8 elseif (DCMTK_STATIC_VERSION STREQUAL "3.6.2") |
95b0536be2c3
preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3133
diff
changeset
|
9 include(${CMAKE_CURRENT_LIST_DIR}/DcmtkConfigurationStatic-3.6.2.cmake) |
3279
dd10fe965870
use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3274
diff
changeset
|
10 elseif (DCMTK_STATIC_VERSION STREQUAL "3.6.4") |
dd10fe965870
use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3274
diff
changeset
|
11 include(${CMAKE_CURRENT_LIST_DIR}/DcmtkConfigurationStatic-3.6.4.cmake) |
3719
d737173197e1
upgraded DCMTK to 3.6.5
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3599
diff
changeset
|
12 elseif (DCMTK_STATIC_VERSION STREQUAL "3.6.5") |
d737173197e1
upgraded DCMTK to 3.6.5
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3599
diff
changeset
|
13 include(${CMAKE_CURRENT_LIST_DIR}/DcmtkConfigurationStatic-3.6.5.cmake) |
2356
7b3b82d426ed
removal of unneeded patch for speed in DCMTK 3.6.2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2344
diff
changeset
|
14 else() |
3274
95b0536be2c3
preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3133
diff
changeset
|
15 message(FATAL_ERROR "Unsupported version of DCMTK: ${DCMTK_STATIC_VERSION}") |
2152
cbebc5d072b0
Use of DCMTK 3.6.1 dictionary of private tags in standalone builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2150
diff
changeset
|
16 endif() |
cbebc5d072b0
Use of DCMTK 3.6.1 dictionary of private tags in standalone builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2150
diff
changeset
|
17 |
2515
7c8a246e8652
fix WebAssembly build
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2513
diff
changeset
|
18 |
3274
95b0536be2c3
preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3133
diff
changeset
|
19 ## |
95b0536be2c3
preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3133
diff
changeset
|
20 ## Commands shared by all versions of DCMTK |
95b0536be2c3
preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3133
diff
changeset
|
21 ## |
3279
dd10fe965870
use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3274
diff
changeset
|
22 |
dd10fe965870
use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3274
diff
changeset
|
23 AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmdata/libsrc DCMTK_SOURCES) |
dd10fe965870
use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3274
diff
changeset
|
24 AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/ofstd/libsrc DCMTK_SOURCES) |
dd10fe965870
use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3274
diff
changeset
|
25 |
dd10fe965870
use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3274
diff
changeset
|
26 LIST(REMOVE_ITEM DCMTK_SOURCES |
dd10fe965870
use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3274
diff
changeset
|
27 ${DCMTK_SOURCES_DIR}/dcmdata/libsrc/mkdictbi.cc |
dd10fe965870
use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3274
diff
changeset
|
28 ${DCMTK_SOURCES_DIR}/dcmdata/libsrc/mkdeftag.cc |
3597 | 29 ${DCMTK_SOURCES_DIR}/dcmdata/libsrc/dcdict_orthanc.cc |
3279
dd10fe965870
use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3274
diff
changeset
|
30 ) |
dd10fe965870
use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3274
diff
changeset
|
31 |
dd10fe965870
use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3274
diff
changeset
|
32 if (ENABLE_DCMTK_NETWORKING) |
dd10fe965870
use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3274
diff
changeset
|
33 AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmnet/libsrc DCMTK_SOURCES) |
dd10fe965870
use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3274
diff
changeset
|
34 include_directories( |
dd10fe965870
use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3274
diff
changeset
|
35 ${DCMTK_SOURCES_DIR}/dcmnet/include |
dd10fe965870
use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3274
diff
changeset
|
36 ) |
dd10fe965870
use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3274
diff
changeset
|
37 endif() |
dd10fe965870
use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3274
diff
changeset
|
38 |
3764
d55768319f8e
fix static build of dcmtk
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3719
diff
changeset
|
39 if (ENABLE_DCMTK_TRANSCODING) |
d55768319f8e
fix static build of dcmtk
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3719
diff
changeset
|
40 AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmimgle/libsrc DCMTK_SOURCES) |
3765
4a25727401cd
first transcoding to jpeg 8bpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3764
diff
changeset
|
41 AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmimage/libsrc DCMTK_SOURCES) |
4a25727401cd
first transcoding to jpeg 8bpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3764
diff
changeset
|
42 include_directories( |
4a25727401cd
first transcoding to jpeg 8bpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3764
diff
changeset
|
43 ${DCMTK_SOURCES_DIR}/dcmimage/include |
4a25727401cd
first transcoding to jpeg 8bpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3764
diff
changeset
|
44 ) |
3764
d55768319f8e
fix static build of dcmtk
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3719
diff
changeset
|
45 endif() |
d55768319f8e
fix static build of dcmtk
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3719
diff
changeset
|
46 |
3279
dd10fe965870
use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3274
diff
changeset
|
47 if (ENABLE_DCMTK_JPEG) |
dd10fe965870
use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3274
diff
changeset
|
48 AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmjpeg/libsrc DCMTK_SOURCES) |
dd10fe965870
use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3274
diff
changeset
|
49 AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmjpeg/libijg8 DCMTK_SOURCES) |
dd10fe965870
use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3274
diff
changeset
|
50 AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmjpeg/libijg12 DCMTK_SOURCES) |
dd10fe965870
use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3274
diff
changeset
|
51 AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmjpeg/libijg16 DCMTK_SOURCES) |
dd10fe965870
use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3274
diff
changeset
|
52 include_directories( |
dd10fe965870
use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3274
diff
changeset
|
53 ${DCMTK_SOURCES_DIR}/dcmjpeg/include |
dd10fe965870
use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3274
diff
changeset
|
54 ${DCMTK_SOURCES_DIR}/dcmjpeg/libijg8 |
dd10fe965870
use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3274
diff
changeset
|
55 ${DCMTK_SOURCES_DIR}/dcmjpeg/libijg12 |
dd10fe965870
use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3274
diff
changeset
|
56 ${DCMTK_SOURCES_DIR}/dcmjpeg/libijg16 |
dd10fe965870
use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3274
diff
changeset
|
57 ${DCMTK_SOURCES_DIR}/dcmimgle/include |
dd10fe965870
use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3274
diff
changeset
|
58 ) |
dd10fe965870
use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3274
diff
changeset
|
59 list(REMOVE_ITEM DCMTK_SOURCES |
dd10fe965870
use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3274
diff
changeset
|
60 ${DCMTK_SOURCES_DIR}/dcmjpeg/libsrc/ddpiimpl.cc |
dd10fe965870
use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3274
diff
changeset
|
61 |
3599
e01900f913e7
fix duplicate symbol "jaritab" in wasm
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3597
diff
changeset
|
62 # Solves linking problem in WebAssembly: "wasm-ld: error: |
e01900f913e7
fix duplicate symbol "jaritab" in wasm
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3597
diff
changeset
|
63 # duplicate symbol: jaritab" (modification in Orthanc 1.5.9) |
e01900f913e7
fix duplicate symbol "jaritab" in wasm
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3597
diff
changeset
|
64 ${DCMTK_SOURCES_DIR}/dcmjpeg/libijg8/jaricom.c |
e01900f913e7
fix duplicate symbol "jaritab" in wasm
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3597
diff
changeset
|
65 ${DCMTK_SOURCES_DIR}/dcmjpeg/libijg12/jaricom.c |
e01900f913e7
fix duplicate symbol "jaritab" in wasm
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3597
diff
changeset
|
66 ${DCMTK_SOURCES_DIR}/dcmjpeg/libijg24/jaricom.c |
3764
d55768319f8e
fix static build of dcmtk
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3719
diff
changeset
|
67 ) |
3599
e01900f913e7
fix duplicate symbol "jaritab" in wasm
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3597
diff
changeset
|
68 |
3764
d55768319f8e
fix static build of dcmtk
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3719
diff
changeset
|
69 if (NOT ENABLE_DCMTK_TRANSCODING) |
d55768319f8e
fix static build of dcmtk
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3719
diff
changeset
|
70 list(REMOVE_ITEM DCMTK_SOURCES |
d55768319f8e
fix static build of dcmtk
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3719
diff
changeset
|
71 # Disable support for encoding JPEG (modification in Orthanc 1.0.1) |
d55768319f8e
fix static build of dcmtk
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3719
diff
changeset
|
72 ${DCMTK_SOURCES_DIR}/dcmjpeg/libsrc/djcodece.cc |
d55768319f8e
fix static build of dcmtk
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3719
diff
changeset
|
73 ${DCMTK_SOURCES_DIR}/dcmjpeg/libsrc/djencsv1.cc |
d55768319f8e
fix static build of dcmtk
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3719
diff
changeset
|
74 ${DCMTK_SOURCES_DIR}/dcmjpeg/libsrc/djencbas.cc |
d55768319f8e
fix static build of dcmtk
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3719
diff
changeset
|
75 ${DCMTK_SOURCES_DIR}/dcmjpeg/libsrc/djencpro.cc |
d55768319f8e
fix static build of dcmtk
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3719
diff
changeset
|
76 ${DCMTK_SOURCES_DIR}/dcmjpeg/libsrc/djenclol.cc |
d55768319f8e
fix static build of dcmtk
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3719
diff
changeset
|
77 ${DCMTK_SOURCES_DIR}/dcmjpeg/libsrc/djencode.cc |
d55768319f8e
fix static build of dcmtk
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3719
diff
changeset
|
78 ${DCMTK_SOURCES_DIR}/dcmjpeg/libsrc/djencext.cc |
d55768319f8e
fix static build of dcmtk
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3719
diff
changeset
|
79 ${DCMTK_SOURCES_DIR}/dcmjpeg/libsrc/djencsps.cc |
d55768319f8e
fix static build of dcmtk
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3719
diff
changeset
|
80 ) |
d55768319f8e
fix static build of dcmtk
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3719
diff
changeset
|
81 endif() |
3279
dd10fe965870
use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3274
diff
changeset
|
82 endif() |
dd10fe965870
use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3274
diff
changeset
|
83 |
dd10fe965870
use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3274
diff
changeset
|
84 |
dd10fe965870
use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3274
diff
changeset
|
85 if (ENABLE_DCMTK_JPEG_LOSSLESS) |
dd10fe965870
use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3274
diff
changeset
|
86 AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmjpls/libsrc DCMTK_SOURCES) |
dd10fe965870
use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3274
diff
changeset
|
87 AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmjpls/libcharls DCMTK_SOURCES) |
dd10fe965870
use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3274
diff
changeset
|
88 include_directories( |
dd10fe965870
use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3274
diff
changeset
|
89 ${DCMTK_SOURCES_DIR}/dcmjpeg/include |
dd10fe965870
use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3274
diff
changeset
|
90 ${DCMTK_SOURCES_DIR}/dcmjpls/include |
dd10fe965870
use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3274
diff
changeset
|
91 ${DCMTK_SOURCES_DIR}/dcmjpls/libcharls |
dd10fe965870
use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3274
diff
changeset
|
92 ) |
dd10fe965870
use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3274
diff
changeset
|
93 list(APPEND DCMTK_SOURCES |
dd10fe965870
use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3274
diff
changeset
|
94 ${DCMTK_SOURCES_DIR}/dcmjpeg/libsrc/djrplol.cc |
dd10fe965870
use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3274
diff
changeset
|
95 ) |
3764
d55768319f8e
fix static build of dcmtk
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3719
diff
changeset
|
96 |
d55768319f8e
fix static build of dcmtk
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3719
diff
changeset
|
97 if (NOT ENABLE_DCMTK_TRANSCODING) |
d55768319f8e
fix static build of dcmtk
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3719
diff
changeset
|
98 list(REMOVE_ITEM DCMTK_SOURCES |
d55768319f8e
fix static build of dcmtk
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3719
diff
changeset
|
99 ${DCMTK_SOURCES_DIR}/dcmjpls/libsrc/djcodece.cc |
d55768319f8e
fix static build of dcmtk
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3719
diff
changeset
|
100 |
d55768319f8e
fix static build of dcmtk
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3719
diff
changeset
|
101 # Disable support for encoding JPEG-LS (modification in Orthanc 1.0.1) |
d55768319f8e
fix static build of dcmtk
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3719
diff
changeset
|
102 ${DCMTK_SOURCES_DIR}/dcmjpls/libsrc/djencode.cc |
d55768319f8e
fix static build of dcmtk
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3719
diff
changeset
|
103 ) |
d55768319f8e
fix static build of dcmtk
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3719
diff
changeset
|
104 endif() |
3279
dd10fe965870
use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3274
diff
changeset
|
105 endif() |
dd10fe965870
use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3274
diff
changeset
|
106 |
2344 | 107 |
929 | 108 # This fixes crashes related to the destruction of the DCMTK OFLogger |
109 # http://support.dcmtk.org/docs-snapshot/file_macros.html | |
110 add_definitions( | |
111 -DLOG4CPLUS_DISABLE_FATAL=1 | |
1634 | 112 -DDCMTK_VERSION_NUMBER=${DCMTK_VERSION_NUMBER} |
929 | 113 ) |
114 | |
3316
4b1017928fc4
Fix performance issue in DICOM protocol by disabling Nagle's algorithm
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3279
diff
changeset
|
115 |
2928
85999ed092c5
New CMake option "ENABLE_DCMTK_LOG" to disable logging internal to DCMTK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2546
diff
changeset
|
116 if (NOT ENABLE_DCMTK_LOG) |
85999ed092c5
New CMake option "ENABLE_DCMTK_LOG" to disable logging internal to DCMTK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2546
diff
changeset
|
117 # Disable logging internal to DCMTK |
85999ed092c5
New CMake option "ENABLE_DCMTK_LOG" to disable logging internal to DCMTK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2546
diff
changeset
|
118 # https://groups.google.com/d/msg/orthanc-users/v2SzzAmY948/VxT1QVGiBAAJ |
85999ed092c5
New CMake option "ENABLE_DCMTK_LOG" to disable logging internal to DCMTK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2546
diff
changeset
|
119 add_definitions( |
85999ed092c5
New CMake option "ENABLE_DCMTK_LOG" to disable logging internal to DCMTK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2546
diff
changeset
|
120 -DDCMTK_LOG4CPLUS_DISABLE_FATAL=1 |
85999ed092c5
New CMake option "ENABLE_DCMTK_LOG" to disable logging internal to DCMTK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2546
diff
changeset
|
121 -DDCMTK_LOG4CPLUS_DISABLE_ERROR=1 |
85999ed092c5
New CMake option "ENABLE_DCMTK_LOG" to disable logging internal to DCMTK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2546
diff
changeset
|
122 -DDCMTK_LOG4CPLUS_DISABLE_WARN=1 |
85999ed092c5
New CMake option "ENABLE_DCMTK_LOG" to disable logging internal to DCMTK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2546
diff
changeset
|
123 -DDCMTK_LOG4CPLUS_DISABLE_INFO=1 |
85999ed092c5
New CMake option "ENABLE_DCMTK_LOG" to disable logging internal to DCMTK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2546
diff
changeset
|
124 -DDCMTK_LOG4CPLUS_DISABLE_DEBUG=1 |
85999ed092c5
New CMake option "ENABLE_DCMTK_LOG" to disable logging internal to DCMTK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2546
diff
changeset
|
125 ) |
85999ed092c5
New CMake option "ENABLE_DCMTK_LOG" to disable logging internal to DCMTK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2546
diff
changeset
|
126 endif() |
85999ed092c5
New CMake option "ENABLE_DCMTK_LOG" to disable logging internal to DCMTK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2546
diff
changeset
|
127 |
929 | 128 include_directories( |
129 #${DCMTK_SOURCES_DIR} | |
130 ${DCMTK_SOURCES_DIR}/config/include | |
131 ${DCMTK_SOURCES_DIR}/ofstd/include | |
132 ${DCMTK_SOURCES_DIR}/oflog/include | |
133 ${DCMTK_SOURCES_DIR}/dcmdata/include | |
134 ) | |
135 | |
136 source_group(ThirdParty\\Dcmtk REGULAR_EXPRESSION ${DCMTK_SOURCES_DIR}/.*) | |
137 | |
138 if (STANDALONE_BUILD) | |
1770 | 139 set(DCMTK_USE_EMBEDDED_DICTIONARIES 1) |
140 set(DCMTK_DICTIONARIES | |
3274
95b0536be2c3
preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3133
diff
changeset
|
141 DICTIONARY_DICOM ${DCMTK_SOURCES_DIR}/dcmdata/data/dicom.dic |
1770 | 142 DICTIONARY_PRIVATE ${DCMTK_SOURCES_DIR}/dcmdata/data/private.dic |
143 DICTIONARY_DICONDE ${DCMTK_SOURCES_DIR}/dcmdata/data/diconde.dic | |
144 ) | |
929 | 145 else() |
1770 | 146 set(DCMTK_USE_EMBEDDED_DICTIONARIES 0) |
929 | 147 endif() |
148 | |
3274
95b0536be2c3
preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3133
diff
changeset
|
149 |
929 | 150 else() |
3833
a3e38994d95a
compilation on mips qemu
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3719
diff
changeset
|
151 if (CMAKE_CROSSCOMPILING AND |
a3e38994d95a
compilation on mips qemu
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3719
diff
changeset
|
152 "${CMAKE_SYSTEM_VERSION}" STREQUAL "CrossToolNg") |
a3e38994d95a
compilation on mips qemu
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3719
diff
changeset
|
153 |
a3e38994d95a
compilation on mips qemu
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3719
diff
changeset
|
154 CHECK_INCLUDE_FILE_CXX(dcmtk/dcmdata/dcfilefo.h HAVE_DCMTK_H) |
a3e38994d95a
compilation on mips qemu
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3719
diff
changeset
|
155 if (NOT HAVE_DCMTK_H) |
a3e38994d95a
compilation on mips qemu
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3719
diff
changeset
|
156 message(FATAL_ERROR "Please install the libdcmtk-dev package") |
a3e38994d95a
compilation on mips qemu
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3719
diff
changeset
|
157 endif() |
a3e38994d95a
compilation on mips qemu
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3719
diff
changeset
|
158 |
a3e38994d95a
compilation on mips qemu
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3719
diff
changeset
|
159 CHECK_LIBRARY_EXISTS(dcmdata "dcmDataDict" "" HAVE_DCMTK_LIB) |
a3e38994d95a
compilation on mips qemu
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3719
diff
changeset
|
160 if (NOT HAVE_DCMTK_LIB) |
a3e38994d95a
compilation on mips qemu
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3719
diff
changeset
|
161 message(FATAL_ERROR "Please install the libdcmtk package") |
a3e38994d95a
compilation on mips qemu
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3719
diff
changeset
|
162 endif() |
929 | 163 |
3833
a3e38994d95a
compilation on mips qemu
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3719
diff
changeset
|
164 find_path(DCMTK_INCLUDE_DIRS dcmtk/config/osconfig.h |
a3e38994d95a
compilation on mips qemu
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3719
diff
changeset
|
165 /usr/include |
a3e38994d95a
compilation on mips qemu
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3719
diff
changeset
|
166 ) |
a3e38994d95a
compilation on mips qemu
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3719
diff
changeset
|
167 |
a3e38994d95a
compilation on mips qemu
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3719
diff
changeset
|
168 link_libraries(dcmdata dcmnet dcmjpeg oflog ofstd) |
a3e38994d95a
compilation on mips qemu
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3719
diff
changeset
|
169 |
a3e38994d95a
compilation on mips qemu
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3719
diff
changeset
|
170 else() |
3973
d86bddb50972
fix spelling errors according to debian
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3839
diff
changeset
|
171 # The following line allows one to manually add libraries at the |
3833
a3e38994d95a
compilation on mips qemu
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3719
diff
changeset
|
172 # command-line, which is necessary for Ubuntu/Debian packages |
a3e38994d95a
compilation on mips qemu
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3719
diff
changeset
|
173 set(tmp "${DCMTK_LIBRARIES}") |
a3e38994d95a
compilation on mips qemu
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3719
diff
changeset
|
174 include(FindDCMTK) |
a3e38994d95a
compilation on mips qemu
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3719
diff
changeset
|
175 list(APPEND DCMTK_LIBRARIES "${tmp}") |
a3e38994d95a
compilation on mips qemu
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3719
diff
changeset
|
176 |
a3e38994d95a
compilation on mips qemu
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3719
diff
changeset
|
177 include_directories(${DCMTK_INCLUDE_DIRS}) |
a3e38994d95a
compilation on mips qemu
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3719
diff
changeset
|
178 endif() |
929 | 179 |
180 add_definitions( | |
181 -DHAVE_CONFIG_H=1 | |
182 ) | |
183 | |
1943
bc949ea71fe6
Fix of Debian bug #818512 ("FTBFS: Please install libdcmtk*-dev")
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1914
diff
changeset
|
184 if (EXISTS "${DCMTK_config_INCLUDE_DIR}/cfunix.h") |
bc949ea71fe6
Fix of Debian bug #818512 ("FTBFS: Please install libdcmtk*-dev")
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1914
diff
changeset
|
185 set(DCMTK_CONFIGURATION_FILE "${DCMTK_config_INCLUDE_DIR}/cfunix.h") |
bc949ea71fe6
Fix of Debian bug #818512 ("FTBFS: Please install libdcmtk*-dev")
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1914
diff
changeset
|
186 elseif (EXISTS "${DCMTK_config_INCLUDE_DIR}/osconfig.h") # This is for Arch Linux |
bc949ea71fe6
Fix of Debian bug #818512 ("FTBFS: Please install libdcmtk*-dev")
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1914
diff
changeset
|
187 set(DCMTK_CONFIGURATION_FILE "${DCMTK_config_INCLUDE_DIR}/osconfig.h") |
2287
9f3414878c02
Fix Debian #865606 (orthanc FTBFS with libdcmtk-dev 3.6.1~20170228-2)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2193
diff
changeset
|
188 elseif (EXISTS "${DCMTK_INCLUDE_DIRS}/dcmtk/config/osconfig.h") # This is for Debian Buster |
9f3414878c02
Fix Debian #865606 (orthanc FTBFS with libdcmtk-dev 3.6.1~20170228-2)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2193
diff
changeset
|
189 set(DCMTK_CONFIGURATION_FILE "${DCMTK_INCLUDE_DIRS}/dcmtk/config/osconfig.h") |
929 | 190 else() |
1883
71356f41ec2f
additional locations for dicom.dic
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1846
diff
changeset
|
191 message(FATAL_ERROR "Please install libdcmtk*-dev") |
929 | 192 endif() |
193 | |
2287
9f3414878c02
Fix Debian #865606 (orthanc FTBFS with libdcmtk-dev 3.6.1~20170228-2)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2193
diff
changeset
|
194 message("DCMTK configuration file: ${DCMTK_CONFIGURATION_FILE}") |
9f3414878c02
Fix Debian #865606 (orthanc FTBFS with libdcmtk-dev 3.6.1~20170228-2)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2193
diff
changeset
|
195 |
929 | 196 # Autodetection of the version of DCMTK |
197 file(STRINGS | |
198 "${DCMTK_CONFIGURATION_FILE}" | |
199 DCMTK_VERSION_NUMBER1 REGEX | |
200 ".*PACKAGE_VERSION .*") | |
201 | |
202 string(REGEX REPLACE | |
203 ".*PACKAGE_VERSION.*\"([0-9]*)\\.([0-9]*)\\.([0-9]*)\"$" | |
204 "\\1\\2\\3" | |
205 DCMTK_VERSION_NUMBER | |
206 ${DCMTK_VERSION_NUMBER1}) | |
207 | |
1770 | 208 set(DCMTK_USE_EMBEDDED_DICTIONARIES 0) |
209 endif() | |
929 | 210 |
211 | |
212 add_definitions(-DDCMTK_VERSION_NUMBER=${DCMTK_VERSION_NUMBER}) | |
213 message("DCMTK version: ${DCMTK_VERSION_NUMBER}") | |
1770 | 214 |
215 | |
216 add_definitions(-DDCMTK_USE_EMBEDDED_DICTIONARIES=${DCMTK_USE_EMBEDDED_DICTIONARIES}) | |
217 if (NOT DCMTK_USE_EMBEDDED_DICTIONARIES) | |
218 # Lookup for DICOM dictionaries, if none is specified by the user | |
219 if (DCMTK_DICTIONARY_DIR STREQUAL "") | |
220 find_path(DCMTK_DICTIONARY_DIR_AUTO dicom.dic | |
221 /usr/share/dcmtk | |
1883
71356f41ec2f
additional locations for dicom.dic
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1846
diff
changeset
|
222 /usr/share/libdcmtk1 |
1770 | 223 /usr/share/libdcmtk2 |
1883
71356f41ec2f
additional locations for dicom.dic
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1846
diff
changeset
|
224 /usr/share/libdcmtk3 |
1770 | 225 /usr/share/libdcmtk4 |
1883
71356f41ec2f
additional locations for dicom.dic
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1846
diff
changeset
|
226 /usr/share/libdcmtk5 |
71356f41ec2f
additional locations for dicom.dic
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1846
diff
changeset
|
227 /usr/share/libdcmtk6 |
2064
e92280e63d8d
fix Debian #829608
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1951
diff
changeset
|
228 /usr/share/libdcmtk7 |
e92280e63d8d
fix Debian #829608
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1951
diff
changeset
|
229 /usr/share/libdcmtk8 |
e92280e63d8d
fix Debian #829608
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1951
diff
changeset
|
230 /usr/share/libdcmtk9 |
2288
c6772af6dea3
fix to find DICOM dictionaries in Debian Butter
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2287
diff
changeset
|
231 /usr/share/libdcmtk10 |
c6772af6dea3
fix to find DICOM dictionaries in Debian Butter
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2287
diff
changeset
|
232 /usr/share/libdcmtk11 |
c6772af6dea3
fix to find DICOM dictionaries in Debian Butter
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2287
diff
changeset
|
233 /usr/share/libdcmtk12 |
c6772af6dea3
fix to find DICOM dictionaries in Debian Butter
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2287
diff
changeset
|
234 /usr/share/libdcmtk13 |
c6772af6dea3
fix to find DICOM dictionaries in Debian Butter
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2287
diff
changeset
|
235 /usr/share/libdcmtk14 |
c6772af6dea3
fix to find DICOM dictionaries in Debian Butter
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2287
diff
changeset
|
236 /usr/share/libdcmtk15 |
c6772af6dea3
fix to find DICOM dictionaries in Debian Butter
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2287
diff
changeset
|
237 /usr/share/libdcmtk16 |
2515
7c8a246e8652
fix WebAssembly build
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2513
diff
changeset
|
238 /usr/share/libdcmtk17 |
7c8a246e8652
fix WebAssembly build
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2513
diff
changeset
|
239 /usr/share/libdcmtk18 |
7c8a246e8652
fix WebAssembly build
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2513
diff
changeset
|
240 /usr/share/libdcmtk19 |
7c8a246e8652
fix WebAssembly build
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2513
diff
changeset
|
241 /usr/share/libdcmtk20 |
1770 | 242 /usr/local/share/dcmtk |
243 ) | |
244 | |
245 if (${DCMTK_DICTIONARY_DIR_AUTO} MATCHES "DCMTK_DICTIONARY_DIR_AUTO-NOTFOUND") | |
246 message(FATAL_ERROR "Cannot locate the DICOM dictionary on this system") | |
247 endif() | |
248 | |
3833
a3e38994d95a
compilation on mips qemu
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3719
diff
changeset
|
249 if (CMAKE_CROSSCOMPILING AND |
a3e38994d95a
compilation on mips qemu
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3719
diff
changeset
|
250 "${CMAKE_SYSTEM_VERSION}" STREQUAL "CrossToolNg") |
a3e38994d95a
compilation on mips qemu
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3719
diff
changeset
|
251 # Remove the sysroot prefix |
a3e38994d95a
compilation on mips qemu
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3719
diff
changeset
|
252 file(RELATIVE_PATH tmp ${CMAKE_FIND_ROOT_PATH} ${DCMTK_DICTIONARY_DIR_AUTO}) |
a3e38994d95a
compilation on mips qemu
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3719
diff
changeset
|
253 set(DCMTK_DICTIONARY_DIR_AUTO /${tmp} CACHE INTERNAL "") |
a3e38994d95a
compilation on mips qemu
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3719
diff
changeset
|
254 endif() |
a3e38994d95a
compilation on mips qemu
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3719
diff
changeset
|
255 |
1770 | 256 message("Autodetected path to the DICOM dictionaries: ${DCMTK_DICTIONARY_DIR_AUTO}") |
257 add_definitions(-DDCMTK_DICTIONARY_DIR="${DCMTK_DICTIONARY_DIR_AUTO}") | |
258 else() | |
259 add_definitions(-DDCMTK_DICTIONARY_DIR="${DCMTK_DICTIONARY_DIR}") | |
260 endif() | |
261 endif() |