Mercurial > hg > orthanc
annotate Resources/CMake/DcmtkConfiguration.cmake @ 3617:afdda32d89e6 storage-commitment
integration mainline->storage-commitment
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Thu, 23 Jan 2020 12:58:38 +0100 |
parents | e01900f913e7 |
children | d737173197e1 |
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) |
2356
7b3b82d426ed
removal of unneeded patch for speed in DCMTK 3.6.2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2344
diff
changeset
|
12 else() |
3274
95b0536be2c3
preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3133
diff
changeset
|
13 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
|
14 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
|
15 |
2515
7c8a246e8652
fix WebAssembly build
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2513
diff
changeset
|
16 |
3274
95b0536be2c3
preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3133
diff
changeset
|
17 ## |
95b0536be2c3
preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3133
diff
changeset
|
18 ## Commands shared by all versions of DCMTK |
95b0536be2c3
preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3133
diff
changeset
|
19 ## |
3279
dd10fe965870
use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3274
diff
changeset
|
20 |
dd10fe965870
use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3274
diff
changeset
|
21 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
|
22 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
|
23 |
dd10fe965870
use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3274
diff
changeset
|
24 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
|
25 ${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
|
26 ${DCMTK_SOURCES_DIR}/dcmdata/libsrc/mkdeftag.cc |
3597 | 27 ${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
|
28 ) |
dd10fe965870
use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3274
diff
changeset
|
29 |
dd10fe965870
use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3274
diff
changeset
|
30 if (ENABLE_DCMTK_NETWORKING) |
dd10fe965870
use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3274
diff
changeset
|
31 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
|
32 include_directories( |
dd10fe965870
use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3274
diff
changeset
|
33 ${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
|
34 ) |
dd10fe965870
use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3274
diff
changeset
|
35 endif() |
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 if (ENABLE_DCMTK_JPEG) |
dd10fe965870
use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3274
diff
changeset
|
38 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
|
39 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
|
40 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
|
41 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
|
42 include_directories( |
dd10fe965870
use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3274
diff
changeset
|
43 ${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
|
44 ${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
|
45 ${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
|
46 ${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
|
47 ${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
|
48 ) |
dd10fe965870
use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3274
diff
changeset
|
49 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
|
50 ${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
|
51 |
3599
e01900f913e7
fix duplicate symbol "jaritab" in wasm
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3597
diff
changeset
|
52 # 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
|
53 # 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
|
54 ${DCMTK_SOURCES_DIR}/dcmjpeg/libijg8/jaricom.c |
e01900f913e7
fix duplicate symbol "jaritab" in wasm
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3597
diff
changeset
|
55 ${DCMTK_SOURCES_DIR}/dcmjpeg/libijg12/jaricom.c |
e01900f913e7
fix duplicate symbol "jaritab" in wasm
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3597
diff
changeset
|
56 ${DCMTK_SOURCES_DIR}/dcmjpeg/libijg24/jaricom.c |
e01900f913e7
fix duplicate symbol "jaritab" in wasm
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3597
diff
changeset
|
57 |
3279
dd10fe965870
use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3274
diff
changeset
|
58 # Disable support for encoding JPEG (modification in Orthanc 1.0.1) |
dd10fe965870
use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3274
diff
changeset
|
59 ${DCMTK_SOURCES_DIR}/dcmjpeg/libsrc/djcodece.cc |
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/djencsv1.cc |
dd10fe965870
use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3274
diff
changeset
|
61 ${DCMTK_SOURCES_DIR}/dcmjpeg/libsrc/djencbas.cc |
dd10fe965870
use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3274
diff
changeset
|
62 ${DCMTK_SOURCES_DIR}/dcmjpeg/libsrc/djencpro.cc |
dd10fe965870
use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3274
diff
changeset
|
63 ${DCMTK_SOURCES_DIR}/dcmjpeg/libsrc/djenclol.cc |
dd10fe965870
use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3274
diff
changeset
|
64 ${DCMTK_SOURCES_DIR}/dcmjpeg/libsrc/djencode.cc |
dd10fe965870
use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3274
diff
changeset
|
65 ${DCMTK_SOURCES_DIR}/dcmjpeg/libsrc/djencext.cc |
dd10fe965870
use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3274
diff
changeset
|
66 ${DCMTK_SOURCES_DIR}/dcmjpeg/libsrc/djencsps.cc |
dd10fe965870
use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3274
diff
changeset
|
67 ) |
dd10fe965870
use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3274
diff
changeset
|
68 endif() |
dd10fe965870
use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3274
diff
changeset
|
69 |
dd10fe965870
use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3274
diff
changeset
|
70 |
dd10fe965870
use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3274
diff
changeset
|
71 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
|
72 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
|
73 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
|
74 include_directories( |
dd10fe965870
use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3274
diff
changeset
|
75 ${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
|
76 ${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
|
77 ${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
|
78 ) |
dd10fe965870
use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3274
diff
changeset
|
79 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
|
80 ${DCMTK_SOURCES_DIR}/dcmjpls/libsrc/djcodece.cc |
dd10fe965870
use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3274
diff
changeset
|
81 |
dd10fe965870
use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3274
diff
changeset
|
82 # Disable support for encoding JPEG-LS (modification in Orthanc 1.0.1) |
dd10fe965870
use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3274
diff
changeset
|
83 ${DCMTK_SOURCES_DIR}/dcmjpls/libsrc/djencode.cc |
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 list(APPEND DCMTK_SOURCES |
dd10fe965870
use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3274
diff
changeset
|
86 ${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
|
87 ) |
dd10fe965870
use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3274
diff
changeset
|
88 endif() |
dd10fe965870
use of DCMTK 3.6.4 in static builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3274
diff
changeset
|
89 |
2344 | 90 |
929 | 91 # This fixes crashes related to the destruction of the DCMTK OFLogger |
92 # http://support.dcmtk.org/docs-snapshot/file_macros.html | |
93 add_definitions( | |
94 -DLOG4CPLUS_DISABLE_FATAL=1 | |
1634 | 95 -DDCMTK_VERSION_NUMBER=${DCMTK_VERSION_NUMBER} |
929 | 96 ) |
97 | |
3316
4b1017928fc4
Fix performance issue in DICOM protocol by disabling Nagle's algorithm
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3279
diff
changeset
|
98 |
2928
85999ed092c5
New CMake option "ENABLE_DCMTK_LOG" to disable logging internal to DCMTK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2546
diff
changeset
|
99 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
|
100 # 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
|
101 # 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
|
102 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
|
103 -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
|
104 -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
|
105 -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
|
106 -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
|
107 -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
|
108 ) |
85999ed092c5
New CMake option "ENABLE_DCMTK_LOG" to disable logging internal to DCMTK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2546
diff
changeset
|
109 endif() |
85999ed092c5
New CMake option "ENABLE_DCMTK_LOG" to disable logging internal to DCMTK
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2546
diff
changeset
|
110 |
929 | 111 include_directories( |
112 #${DCMTK_SOURCES_DIR} | |
113 ${DCMTK_SOURCES_DIR}/config/include | |
114 ${DCMTK_SOURCES_DIR}/ofstd/include | |
115 ${DCMTK_SOURCES_DIR}/oflog/include | |
116 ${DCMTK_SOURCES_DIR}/dcmdata/include | |
117 ) | |
118 | |
119 source_group(ThirdParty\\Dcmtk REGULAR_EXPRESSION ${DCMTK_SOURCES_DIR}/.*) | |
120 | |
121 if (STANDALONE_BUILD) | |
1770 | 122 set(DCMTK_USE_EMBEDDED_DICTIONARIES 1) |
123 set(DCMTK_DICTIONARIES | |
3274
95b0536be2c3
preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3133
diff
changeset
|
124 DICTIONARY_DICOM ${DCMTK_SOURCES_DIR}/dcmdata/data/dicom.dic |
1770 | 125 DICTIONARY_PRIVATE ${DCMTK_SOURCES_DIR}/dcmdata/data/private.dic |
126 DICTIONARY_DICONDE ${DCMTK_SOURCES_DIR}/dcmdata/data/diconde.dic | |
127 ) | |
929 | 128 else() |
1770 | 129 set(DCMTK_USE_EMBEDDED_DICTIONARIES 0) |
929 | 130 endif() |
131 | |
3274
95b0536be2c3
preparing for dcmtk 3.6.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3133
diff
changeset
|
132 |
929 | 133 else() |
134 # The following line allows to manually add libraries at the | |
135 # command-line, which is necessary for Ubuntu/Debian packages | |
136 set(tmp "${DCMTK_LIBRARIES}") | |
137 include(FindDCMTK) | |
138 list(APPEND DCMTK_LIBRARIES "${tmp}") | |
139 | |
1943
bc949ea71fe6
Fix of Debian bug #818512 ("FTBFS: Please install libdcmtk*-dev")
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1914
diff
changeset
|
140 include_directories(${DCMTK_INCLUDE_DIRS}) |
929 | 141 |
142 add_definitions( | |
143 -DHAVE_CONFIG_H=1 | |
144 ) | |
145 | |
1943
bc949ea71fe6
Fix of Debian bug #818512 ("FTBFS: Please install libdcmtk*-dev")
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1914
diff
changeset
|
146 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
|
147 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
|
148 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
|
149 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
|
150 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
|
151 set(DCMTK_CONFIGURATION_FILE "${DCMTK_INCLUDE_DIRS}/dcmtk/config/osconfig.h") |
929 | 152 else() |
1883
71356f41ec2f
additional locations for dicom.dic
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1846
diff
changeset
|
153 message(FATAL_ERROR "Please install libdcmtk*-dev") |
929 | 154 endif() |
155 | |
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
|
156 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
|
157 |
929 | 158 # Autodetection of the version of DCMTK |
159 file(STRINGS | |
160 "${DCMTK_CONFIGURATION_FILE}" | |
161 DCMTK_VERSION_NUMBER1 REGEX | |
162 ".*PACKAGE_VERSION .*") | |
163 | |
164 string(REGEX REPLACE | |
165 ".*PACKAGE_VERSION.*\"([0-9]*)\\.([0-9]*)\\.([0-9]*)\"$" | |
166 "\\1\\2\\3" | |
167 DCMTK_VERSION_NUMBER | |
168 ${DCMTK_VERSION_NUMBER1}) | |
169 | |
1770 | 170 set(DCMTK_USE_EMBEDDED_DICTIONARIES 0) |
171 endif() | |
929 | 172 |
173 | |
174 add_definitions(-DDCMTK_VERSION_NUMBER=${DCMTK_VERSION_NUMBER}) | |
175 message("DCMTK version: ${DCMTK_VERSION_NUMBER}") | |
1770 | 176 |
177 | |
178 add_definitions(-DDCMTK_USE_EMBEDDED_DICTIONARIES=${DCMTK_USE_EMBEDDED_DICTIONARIES}) | |
179 if (NOT DCMTK_USE_EMBEDDED_DICTIONARIES) | |
180 # Lookup for DICOM dictionaries, if none is specified by the user | |
181 if (DCMTK_DICTIONARY_DIR STREQUAL "") | |
182 find_path(DCMTK_DICTIONARY_DIR_AUTO dicom.dic | |
183 /usr/share/dcmtk | |
1883
71356f41ec2f
additional locations for dicom.dic
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1846
diff
changeset
|
184 /usr/share/libdcmtk1 |
1770 | 185 /usr/share/libdcmtk2 |
1883
71356f41ec2f
additional locations for dicom.dic
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1846
diff
changeset
|
186 /usr/share/libdcmtk3 |
1770 | 187 /usr/share/libdcmtk4 |
1883
71356f41ec2f
additional locations for dicom.dic
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1846
diff
changeset
|
188 /usr/share/libdcmtk5 |
71356f41ec2f
additional locations for dicom.dic
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1846
diff
changeset
|
189 /usr/share/libdcmtk6 |
2064
e92280e63d8d
fix Debian #829608
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1951
diff
changeset
|
190 /usr/share/libdcmtk7 |
e92280e63d8d
fix Debian #829608
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1951
diff
changeset
|
191 /usr/share/libdcmtk8 |
e92280e63d8d
fix Debian #829608
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1951
diff
changeset
|
192 /usr/share/libdcmtk9 |
2288
c6772af6dea3
fix to find DICOM dictionaries in Debian Butter
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2287
diff
changeset
|
193 /usr/share/libdcmtk10 |
c6772af6dea3
fix to find DICOM dictionaries in Debian Butter
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2287
diff
changeset
|
194 /usr/share/libdcmtk11 |
c6772af6dea3
fix to find DICOM dictionaries in Debian Butter
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2287
diff
changeset
|
195 /usr/share/libdcmtk12 |
c6772af6dea3
fix to find DICOM dictionaries in Debian Butter
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2287
diff
changeset
|
196 /usr/share/libdcmtk13 |
c6772af6dea3
fix to find DICOM dictionaries in Debian Butter
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2287
diff
changeset
|
197 /usr/share/libdcmtk14 |
c6772af6dea3
fix to find DICOM dictionaries in Debian Butter
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2287
diff
changeset
|
198 /usr/share/libdcmtk15 |
c6772af6dea3
fix to find DICOM dictionaries in Debian Butter
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2287
diff
changeset
|
199 /usr/share/libdcmtk16 |
2515
7c8a246e8652
fix WebAssembly build
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2513
diff
changeset
|
200 /usr/share/libdcmtk17 |
7c8a246e8652
fix WebAssembly build
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2513
diff
changeset
|
201 /usr/share/libdcmtk18 |
7c8a246e8652
fix WebAssembly build
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2513
diff
changeset
|
202 /usr/share/libdcmtk19 |
7c8a246e8652
fix WebAssembly build
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2513
diff
changeset
|
203 /usr/share/libdcmtk20 |
1770 | 204 /usr/local/share/dcmtk |
205 ) | |
206 | |
207 if (${DCMTK_DICTIONARY_DIR_AUTO} MATCHES "DCMTK_DICTIONARY_DIR_AUTO-NOTFOUND") | |
208 message(FATAL_ERROR "Cannot locate the DICOM dictionary on this system") | |
209 endif() | |
210 | |
211 message("Autodetected path to the DICOM dictionaries: ${DCMTK_DICTIONARY_DIR_AUTO}") | |
212 add_definitions(-DDCMTK_DICTIONARY_DIR="${DCMTK_DICTIONARY_DIR_AUTO}") | |
213 else() | |
214 add_definitions(-DDCMTK_DICTIONARY_DIR="${DCMTK_DICTIONARY_DIR}") | |
215 endif() | |
216 endif() |