Mercurial > hg > orthanc
annotate Resources/CMake/DcmtkConfiguration.cmake @ 2169:d15de5685ad8
ServeFolders: "Extensions" configuration option
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Tue, 22 Nov 2016 15:03:14 +0100 |
parents | f75611abd407 |
children | 8b51b133bb8b |
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) |
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
|
2 set(ENABLE_DCMTK_NETWORKING ON) |
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) |
1951
01de36d949c3
Possibility to use forthcoming DCMTK 3.6.1 in static builds (instead of 3.6.0)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1943
diff
changeset
|
6 if (USE_DCMTK_361) |
01de36d949c3
Possibility to use forthcoming DCMTK 3.6.1 in static builds (instead of 3.6.0)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1943
diff
changeset
|
7 SET(DCMTK_VERSION_NUMBER 361) |
01de36d949c3
Possibility to use forthcoming DCMTK 3.6.1 in static builds (instead of 3.6.0)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1943
diff
changeset
|
8 SET(DCMTK_PACKAGE_VERSION "3.6.1") |
01de36d949c3
Possibility to use forthcoming DCMTK 3.6.1 in static builds (instead of 3.6.0)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1943
diff
changeset
|
9 SET(DCMTK_SOURCES_DIR ${CMAKE_BINARY_DIR}/dcmtk-3.6.1_20160216) |
01de36d949c3
Possibility to use forthcoming DCMTK 3.6.1 in static builds (instead of 3.6.0)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1943
diff
changeset
|
10 SET(DCMTK_URL "http://www.montefiore.ulg.ac.be/~jodogne/Orthanc/ThirdPartyDownloads/dcmtk-3.6.1_20160216.tar.gz") |
01de36d949c3
Possibility to use forthcoming DCMTK 3.6.1 in static builds (instead of 3.6.0)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1943
diff
changeset
|
11 SET(DCMTK_MD5 "273c8a544b9fe09b8a4fb4eb51df8e52") |
01de36d949c3
Possibility to use forthcoming DCMTK 3.6.1 in static builds (instead of 3.6.0)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1943
diff
changeset
|
12 SET(DCMTK_PATCH_SPEED "${ORTHANC_ROOT}/Resources/Patches/dcmtk-3.6.1-speed.patch") |
01de36d949c3
Possibility to use forthcoming DCMTK 3.6.1 in static builds (instead of 3.6.0)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1943
diff
changeset
|
13 |
01de36d949c3
Possibility to use forthcoming DCMTK 3.6.1 in static builds (instead of 3.6.0)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1943
diff
changeset
|
14 macro(DCMTK_UNSET) |
01de36d949c3
Possibility to use forthcoming DCMTK 3.6.1 in static builds (instead of 3.6.0)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1943
diff
changeset
|
15 endmacro() |
01de36d949c3
Possibility to use forthcoming DCMTK 3.6.1 in static builds (instead of 3.6.0)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1943
diff
changeset
|
16 |
01de36d949c3
Possibility to use forthcoming DCMTK 3.6.1 in static builds (instead of 3.6.0)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1943
diff
changeset
|
17 set(DCMTK_BINARY_DIR ${DCMTK_SOURCES_DIR}/) |
01de36d949c3
Possibility to use forthcoming DCMTK 3.6.1 in static builds (instead of 3.6.0)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1943
diff
changeset
|
18 set(DCMTK_CMAKE_INCLUDE ${DCMTK_SOURCES_DIR}/) |
01de36d949c3
Possibility to use forthcoming DCMTK 3.6.1 in static builds (instead of 3.6.0)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1943
diff
changeset
|
19 add_definitions(-DDCMTK_INSIDE_LOG4CPLUS=1) |
01de36d949c3
Possibility to use forthcoming DCMTK 3.6.1 in static builds (instead of 3.6.0)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1943
diff
changeset
|
20 else() |
01de36d949c3
Possibility to use forthcoming DCMTK 3.6.1 in static builds (instead of 3.6.0)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1943
diff
changeset
|
21 SET(DCMTK_VERSION_NUMBER 360) |
01de36d949c3
Possibility to use forthcoming DCMTK 3.6.1 in static builds (instead of 3.6.0)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1943
diff
changeset
|
22 SET(DCMTK_PACKAGE_VERSION "3.6.0") |
01de36d949c3
Possibility to use forthcoming DCMTK 3.6.1 in static builds (instead of 3.6.0)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1943
diff
changeset
|
23 SET(DCMTK_SOURCES_DIR ${CMAKE_BINARY_DIR}/dcmtk-3.6.0) |
01de36d949c3
Possibility to use forthcoming DCMTK 3.6.1 in static builds (instead of 3.6.0)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1943
diff
changeset
|
24 SET(DCMTK_URL "http://www.montefiore.ulg.ac.be/~jodogne/Orthanc/ThirdPartyDownloads/dcmtk-3.6.0.zip") |
01de36d949c3
Possibility to use forthcoming DCMTK 3.6.1 in static builds (instead of 3.6.0)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1943
diff
changeset
|
25 SET(DCMTK_MD5 "219ad631b82031806147e4abbfba4fa4") |
01de36d949c3
Possibility to use forthcoming DCMTK 3.6.1 in static builds (instead of 3.6.0)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1943
diff
changeset
|
26 SET(DCMTK_PATCH_SPEED "${ORTHANC_ROOT}/Resources/Patches/dcmtk-3.6.0-speed.patch") |
01de36d949c3
Possibility to use forthcoming DCMTK 3.6.1 in static builds (instead of 3.6.0)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1943
diff
changeset
|
27 SET(DCMTK_PATCH_MINGW64 "${ORTHANC_ROOT}/Resources/Patches/dcmtk-3.6.0-mingw64.patch") |
01de36d949c3
Possibility to use forthcoming DCMTK 3.6.1 in static builds (instead of 3.6.0)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1943
diff
changeset
|
28 endif() |
1537
fbf763bb1fa3
error detection in patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1415
diff
changeset
|
29 |
fbf763bb1fa3
error detection in patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1415
diff
changeset
|
30 if (IS_DIRECTORY "${DCMTK_SOURCES_DIR}") |
fbf763bb1fa3
error detection in patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1415
diff
changeset
|
31 set(FirstRun OFF) |
fbf763bb1fa3
error detection in patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1415
diff
changeset
|
32 else() |
fbf763bb1fa3
error detection in patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1415
diff
changeset
|
33 set(FirstRun ON) |
fbf763bb1fa3
error detection in patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1415
diff
changeset
|
34 endif() |
fbf763bb1fa3
error detection in patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1415
diff
changeset
|
35 |
fbf763bb1fa3
error detection in patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1415
diff
changeset
|
36 DownloadPackage(${DCMTK_MD5} ${DCMTK_URL} "${DCMTK_SOURCES_DIR}") |
929 | 37 |
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
|
38 |
2157
f75611abd407
cmake option USE_DCMTK_361_PRIVATE_DIC
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2152
diff
changeset
|
39 if (FirstRun AND |
f75611abd407
cmake option USE_DCMTK_361_PRIVATE_DIC
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2152
diff
changeset
|
40 NOT USE_DCMTK_361) |
f75611abd407
cmake option USE_DCMTK_361_PRIVATE_DIC
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2152
diff
changeset
|
41 if (USE_DCMTK_361_PRIVATE_DIC) |
f75611abd407
cmake option USE_DCMTK_361_PRIVATE_DIC
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2152
diff
changeset
|
42 # If using DCMTK 3.6.0, backport the "private.dic" file from DCMTK |
f75611abd407
cmake option USE_DCMTK_361_PRIVATE_DIC
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2152
diff
changeset
|
43 # 3.6.1 snapshot. This adds support for more private tags, and |
f75611abd407
cmake option USE_DCMTK_361_PRIVATE_DIC
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2152
diff
changeset
|
44 # fixes some import problems with Philips MRI Achieva. |
f75611abd407
cmake option USE_DCMTK_361_PRIVATE_DIC
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2152
diff
changeset
|
45 message("Using the dictionary of private tags from DCMTK 3.6.1") |
f75611abd407
cmake option USE_DCMTK_361_PRIVATE_DIC
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2152
diff
changeset
|
46 configure_file( |
f75611abd407
cmake option USE_DCMTK_361_PRIVATE_DIC
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2152
diff
changeset
|
47 ${ORTHANC_ROOT}/Resources/Patches/dcmtk-3.6.1-private.dic |
f75611abd407
cmake option USE_DCMTK_361_PRIVATE_DIC
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2152
diff
changeset
|
48 ${DCMTK_SOURCES_DIR}/dcmdata/data/private.dic |
f75611abd407
cmake option USE_DCMTK_361_PRIVATE_DIC
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2152
diff
changeset
|
49 COPYONLY) |
f75611abd407
cmake option USE_DCMTK_361_PRIVATE_DIC
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2152
diff
changeset
|
50 else() |
f75611abd407
cmake option USE_DCMTK_361_PRIVATE_DIC
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2152
diff
changeset
|
51 message("Using the dictionary of private tags from DCMTK 3.6.0") |
f75611abd407
cmake option USE_DCMTK_361_PRIVATE_DIC
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2152
diff
changeset
|
52 endif() |
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
|
53 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
|
54 |
cbebc5d072b0
Use of DCMTK 3.6.1 dictionary of private tags in standalone builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2150
diff
changeset
|
55 |
1414 | 56 IF (CMAKE_CROSSCOMPILING) |
929 | 57 SET(C_CHAR_UNSIGNED 1 CACHE INTERNAL "Whether char is unsigned.") |
58 ENDIF() | |
1634 | 59 SET(DCMTK_SOURCE_DIR ${DCMTK_SOURCES_DIR}) |
929 | 60 include(${DCMTK_SOURCES_DIR}/CMake/CheckFunctionWithHeaderExists.cmake) |
61 include(${DCMTK_SOURCES_DIR}/CMake/GenerateDCMTKConfigure.cmake) | |
62 | |
63 if ("${CMAKE_SYSTEM_VERSION}" STREQUAL "LinuxStandardBase") | |
64 set(HAVE_SSTREAM 1) | |
65 set(HAVE_PROTOTYPE_BZERO 1) | |
66 set(HAVE_PROTOTYPE_GETHOSTNAME 1) | |
67 set(HAVE_PROTOTYPE_GETSOCKOPT 1) | |
68 set(HAVE_PROTOTYPE_SETSOCKOPT 1) | |
69 set(HAVE_PROTOTYPE_CONNECT 1) | |
70 set(HAVE_PROTOTYPE_BIND 1) | |
71 set(HAVE_PROTOTYPE_ACCEPT 1) | |
72 set(HAVE_PROTOTYPE_SETSOCKNAME 1) | |
73 set(HAVE_PROTOTYPE_GETSOCKNAME 1) | |
74 endif() | |
75 | |
1149
dd6d7fd82da9
fix version of dcmtk
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1057
diff
changeset
|
76 set(DCMTK_PACKAGE_VERSION_SUFFIX "") |
1634 | 77 set(DCMTK_PACKAGE_VERSION_NUMBER ${DCMTK_VERSION_NUMBER}) |
1149
dd6d7fd82da9
fix version of dcmtk
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1057
diff
changeset
|
78 |
929 | 79 CONFIGURE_FILE( |
80 ${DCMTK_SOURCES_DIR}/CMake/osconfig.h.in | |
81 ${DCMTK_SOURCES_DIR}/config/include/dcmtk/config/osconfig.h) | |
82 | |
1951
01de36d949c3
Possibility to use forthcoming DCMTK 3.6.1 in static builds (instead of 3.6.0)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1943
diff
changeset
|
83 if (USE_DCMTK_361) |
01de36d949c3
Possibility to use forthcoming DCMTK 3.6.1 in static builds (instead of 3.6.0)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1943
diff
changeset
|
84 # This step must be after the generation of "osconfig.h" |
01de36d949c3
Possibility to use forthcoming DCMTK 3.6.1 in static builds (instead of 3.6.0)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1943
diff
changeset
|
85 INSPECT_FUNDAMENTAL_ARITHMETIC_TYPES() |
01de36d949c3
Possibility to use forthcoming DCMTK 3.6.1 in static builds (instead of 3.6.0)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1943
diff
changeset
|
86 endif() |
01de36d949c3
Possibility to use forthcoming DCMTK 3.6.1 in static builds (instead of 3.6.0)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1943
diff
changeset
|
87 |
929 | 88 AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmdata/libsrc DCMTK_SOURCES) |
89 AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/ofstd/libsrc DCMTK_SOURCES) | |
90 | |
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
|
91 if (ENABLE_DCMTK_NETWORKING) |
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
|
92 AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmnet/libsrc DCMTK_SOURCES) |
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
|
93 include_directories( |
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
|
94 ${DCMTK_SOURCES_DIR}/dcmnet/include |
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
|
95 ) |
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
|
96 endif() |
929 | 97 |
98 if (ENABLE_JPEG) | |
99 AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmjpeg/libsrc DCMTK_SOURCES) | |
100 AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmjpeg/libijg8 DCMTK_SOURCES) | |
101 AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmjpeg/libijg12 DCMTK_SOURCES) | |
102 AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmjpeg/libijg16 DCMTK_SOURCES) | |
103 include_directories( | |
104 ${DCMTK_SOURCES_DIR}/dcmjpeg/include | |
105 ${DCMTK_SOURCES_DIR}/dcmjpeg/libijg8 | |
106 ${DCMTK_SOURCES_DIR}/dcmjpeg/libijg12 | |
107 ${DCMTK_SOURCES_DIR}/dcmjpeg/libijg16 | |
108 ${DCMTK_SOURCES_DIR}/dcmimgle/include | |
109 ) | |
110 list(REMOVE_ITEM DCMTK_SOURCES | |
111 ${DCMTK_SOURCES_DIR}/dcmjpeg/libsrc/ddpiimpl.cc | |
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
|
112 |
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
|
113 # Disable support for encoding JPEG (modification in Orthanc 1.0.1) |
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
|
114 ${DCMTK_SOURCES_DIR}/dcmjpeg/libsrc/djcodece.cc |
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
|
115 ${DCMTK_SOURCES_DIR}/dcmjpeg/libsrc/djencsv1.cc |
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
|
116 ${DCMTK_SOURCES_DIR}/dcmjpeg/libsrc/djencbas.cc |
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
|
117 ${DCMTK_SOURCES_DIR}/dcmjpeg/libsrc/djencpro.cc |
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
|
118 ${DCMTK_SOURCES_DIR}/dcmjpeg/libsrc/djenclol.cc |
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
|
119 ${DCMTK_SOURCES_DIR}/dcmjpeg/libsrc/djencode.cc |
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
|
120 ${DCMTK_SOURCES_DIR}/dcmjpeg/libsrc/djencext.cc |
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
|
121 ${DCMTK_SOURCES_DIR}/dcmjpeg/libsrc/djencsps.cc |
929 | 122 ) |
123 endif() | |
124 | |
125 | |
126 if (ENABLE_JPEG_LOSSLESS) | |
127 AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmjpls/libsrc DCMTK_SOURCES) | |
128 AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmjpls/libcharls DCMTK_SOURCES) | |
129 include_directories( | |
130 ${DCMTK_SOURCES_DIR}/dcmjpeg/include | |
131 ${DCMTK_SOURCES_DIR}/dcmjpls/include | |
132 ${DCMTK_SOURCES_DIR}/dcmjpls/libcharls | |
133 ) | |
134 list(REMOVE_ITEM DCMTK_SOURCES | |
135 ${DCMTK_SOURCES_DIR}/dcmjpls/libsrc/djcodece.cc | |
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
|
136 |
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
|
137 # Disable support for encoding JPEG-LS (modification in Orthanc 1.0.1) |
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
|
138 ${DCMTK_SOURCES_DIR}/dcmjpls/libsrc/djencode.cc |
929 | 139 ) |
140 list(APPEND DCMTK_SOURCES | |
141 ${DCMTK_SOURCES_DIR}/dcmjpeg/libsrc/djrplol.cc | |
142 ) | |
143 endif() | |
144 | |
145 | |
146 # Source for the logging facility of DCMTK | |
147 AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/oflog/libsrc DCMTK_SOURCES) | |
148 if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux" OR | |
930 | 149 ${CMAKE_SYSTEM_NAME} STREQUAL "Darwin" OR |
1337 | 150 ${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD" OR |
929 | 151 ${CMAKE_SYSTEM_NAME} STREQUAL "kFreeBSD") |
152 list(REMOVE_ITEM DCMTK_SOURCES | |
1951
01de36d949c3
Possibility to use forthcoming DCMTK 3.6.1 in static builds (instead of 3.6.0)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1943
diff
changeset
|
153 ${DCMTK_SOURCES_DIR}/oflog/libsrc/clfsap.cc |
929 | 154 ${DCMTK_SOURCES_DIR}/oflog/libsrc/windebap.cc |
155 ${DCMTK_SOURCES_DIR}/oflog/libsrc/winsock.cc | |
156 ) | |
1361
94ffb597d297
refactoring of C-Find SCP
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1337
diff
changeset
|
157 |
1362
bf6db7d2f8b1
fix slow DCMTK problem
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1361
diff
changeset
|
158 execute_process( |
1951
01de36d949c3
Possibility to use forthcoming DCMTK 3.6.1 in static builds (instead of 3.6.0)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1943
diff
changeset
|
159 COMMAND ${PATCH_EXECUTABLE} -p0 -N -i ${DCMTK_PATCH_SPEED} |
1362
bf6db7d2f8b1
fix slow DCMTK problem
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1361
diff
changeset
|
160 WORKING_DIRECTORY ${CMAKE_BINARY_DIR} |
1537
fbf763bb1fa3
error detection in patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1415
diff
changeset
|
161 RESULT_VARIABLE Failure |
1362
bf6db7d2f8b1
fix slow DCMTK problem
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1361
diff
changeset
|
162 ) |
bf6db7d2f8b1
fix slow DCMTK problem
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1361
diff
changeset
|
163 |
1537
fbf763bb1fa3
error detection in patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1415
diff
changeset
|
164 if (Failure AND FirstRun) |
fbf763bb1fa3
error detection in patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1415
diff
changeset
|
165 message(FATAL_ERROR "Error while patching a file") |
fbf763bb1fa3
error detection in patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1415
diff
changeset
|
166 endif() |
fbf763bb1fa3
error detection in patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1415
diff
changeset
|
167 |
929 | 168 elseif (${CMAKE_SYSTEM_NAME} STREQUAL "Windows") |
169 list(REMOVE_ITEM DCMTK_SOURCES | |
170 ${DCMTK_SOURCES_DIR}/oflog/libsrc/unixsock.cc | |
171 ) | |
172 | |
1951
01de36d949c3
Possibility to use forthcoming DCMTK 3.6.1 in static builds (instead of 3.6.0)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1943
diff
changeset
|
173 if (CMAKE_COMPILER_IS_GNUCXX AND DCMTK_PATCH_MINGW64) |
929 | 174 # This is a patch for MinGW64 |
175 execute_process( | |
1951
01de36d949c3
Possibility to use forthcoming DCMTK 3.6.1 in static builds (instead of 3.6.0)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1943
diff
changeset
|
176 COMMAND ${PATCH_EXECUTABLE} -p0 -N -i ${DCMTK_PATCH_MINGW64} |
929 | 177 WORKING_DIRECTORY ${CMAKE_BINARY_DIR} |
1537
fbf763bb1fa3
error detection in patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1415
diff
changeset
|
178 RESULT_VARIABLE Failure |
929 | 179 ) |
1537
fbf763bb1fa3
error detection in patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1415
diff
changeset
|
180 |
fbf763bb1fa3
error detection in patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1415
diff
changeset
|
181 if (Failure AND FirstRun) |
fbf763bb1fa3
error detection in patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1415
diff
changeset
|
182 message(FATAL_ERROR "Error while patching a file") |
fbf763bb1fa3
error detection in patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1415
diff
changeset
|
183 endif() |
929 | 184 endif() |
185 | |
1377
601d34afdab9
patch for recent versions of MinGW
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1362
diff
changeset
|
186 # This patch improves speed, even for Windows |
601d34afdab9
patch for recent versions of MinGW
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1362
diff
changeset
|
187 execute_process( |
1546 | 188 COMMAND ${PATCH_EXECUTABLE} -p0 -N |
1951
01de36d949c3
Possibility to use forthcoming DCMTK 3.6.1 in static builds (instead of 3.6.0)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1943
diff
changeset
|
189 INPUT_FILE ${DCMTK_PATCH_SPEED} |
1377
601d34afdab9
patch for recent versions of MinGW
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1362
diff
changeset
|
190 WORKING_DIRECTORY ${CMAKE_BINARY_DIR} |
1537
fbf763bb1fa3
error detection in patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1415
diff
changeset
|
191 RESULT_VARIABLE Failure |
1377
601d34afdab9
patch for recent versions of MinGW
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1362
diff
changeset
|
192 ) |
601d34afdab9
patch for recent versions of MinGW
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1362
diff
changeset
|
193 |
1537
fbf763bb1fa3
error detection in patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1415
diff
changeset
|
194 if (Failure AND FirstRun) |
fbf763bb1fa3
error detection in patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1415
diff
changeset
|
195 message(FATAL_ERROR "Error while patching a file") |
fbf763bb1fa3
error detection in patches
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1415
diff
changeset
|
196 endif() |
929 | 197 endif() |
198 | |
199 list(REMOVE_ITEM DCMTK_SOURCES | |
200 ${DCMTK_SOURCES_DIR}/dcmdata/libsrc/mkdictbi.cc | |
201 ${DCMTK_SOURCES_DIR}/dcmdata/libsrc/mkdeftag.cc | |
202 ) | |
203 | |
2150 | 204 if (NOT USE_DCMTK_361) |
205 # Removing this file is required with DCMTK 3.6.0 | |
206 list(REMOVE_ITEM DCMTK_SOURCES | |
207 ${DCMTK_SOURCES_DIR}/dcmdata/libsrc/dcdictbi.cc | |
208 ) | |
209 endif() | |
210 | |
1149
dd6d7fd82da9
fix version of dcmtk
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1057
diff
changeset
|
211 #set_source_files_properties(${DCMTK_SOURCES} |
dd6d7fd82da9
fix version of dcmtk
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1057
diff
changeset
|
212 # PROPERTIES COMPILE_DEFINITIONS |
1636 | 213 # "PACKAGE_VERSION=\"${DCMTK_PACKAGE_VERSION}\";PACKAGE_VERSION_NUMBER=\"${DCMTK_VERSION_NUMBER}\"") |
1149
dd6d7fd82da9
fix version of dcmtk
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1057
diff
changeset
|
214 |
929 | 215 # This fixes crashes related to the destruction of the DCMTK OFLogger |
216 # http://support.dcmtk.org/docs-snapshot/file_macros.html | |
217 add_definitions( | |
218 -DLOG4CPLUS_DISABLE_FATAL=1 | |
1634 | 219 -DDCMTK_VERSION_NUMBER=${DCMTK_VERSION_NUMBER} |
929 | 220 ) |
221 | |
222 include_directories( | |
223 #${DCMTK_SOURCES_DIR} | |
224 ${DCMTK_SOURCES_DIR}/config/include | |
225 ${DCMTK_SOURCES_DIR}/ofstd/include | |
226 ${DCMTK_SOURCES_DIR}/oflog/include | |
227 ${DCMTK_SOURCES_DIR}/dcmdata/include | |
228 ) | |
229 | |
230 source_group(ThirdParty\\Dcmtk REGULAR_EXPRESSION ${DCMTK_SOURCES_DIR}/.*) | |
231 | |
232 set(DCMTK_BUNDLES_LOG4CPLUS 1) | |
233 | |
234 if (STANDALONE_BUILD) | |
1770 | 235 set(DCMTK_USE_EMBEDDED_DICTIONARIES 1) |
236 set(DCMTK_DICTIONARIES | |
237 DICTIONARY_DICOM ${DCMTK_SOURCES_DIR}/dcmdata/data/dicom.dic | |
238 DICTIONARY_PRIVATE ${DCMTK_SOURCES_DIR}/dcmdata/data/private.dic | |
239 DICTIONARY_DICONDE ${DCMTK_SOURCES_DIR}/dcmdata/data/diconde.dic | |
240 ) | |
929 | 241 else() |
1770 | 242 set(DCMTK_USE_EMBEDDED_DICTIONARIES 0) |
929 | 243 endif() |
244 | |
245 else() | |
246 # The following line allows to manually add libraries at the | |
247 # command-line, which is necessary for Ubuntu/Debian packages | |
248 set(tmp "${DCMTK_LIBRARIES}") | |
249 include(FindDCMTK) | |
250 list(APPEND DCMTK_LIBRARIES "${tmp}") | |
251 | |
1943
bc949ea71fe6
Fix of Debian bug #818512 ("FTBFS: Please install libdcmtk*-dev")
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1914
diff
changeset
|
252 include_directories(${DCMTK_INCLUDE_DIRS}) |
929 | 253 |
254 add_definitions( | |
255 -DHAVE_CONFIG_H=1 | |
256 ) | |
257 | |
1943
bc949ea71fe6
Fix of Debian bug #818512 ("FTBFS: Please install libdcmtk*-dev")
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1914
diff
changeset
|
258 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
|
259 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
|
260 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
|
261 set(DCMTK_CONFIGURATION_FILE "${DCMTK_config_INCLUDE_DIR}/osconfig.h") |
929 | 262 else() |
1883
71356f41ec2f
additional locations for dicom.dic
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1846
diff
changeset
|
263 message(FATAL_ERROR "Please install libdcmtk*-dev") |
929 | 264 endif() |
265 | |
266 # Autodetection of the version of DCMTK | |
267 file(STRINGS | |
268 "${DCMTK_CONFIGURATION_FILE}" | |
269 DCMTK_VERSION_NUMBER1 REGEX | |
270 ".*PACKAGE_VERSION .*") | |
271 | |
272 string(REGEX REPLACE | |
273 ".*PACKAGE_VERSION.*\"([0-9]*)\\.([0-9]*)\\.([0-9]*)\"$" | |
274 "\\1\\2\\3" | |
275 DCMTK_VERSION_NUMBER | |
276 ${DCMTK_VERSION_NUMBER1}) | |
277 | |
1770 | 278 set(DCMTK_USE_EMBEDDED_DICTIONARIES 0) |
279 endif() | |
929 | 280 |
281 | |
282 add_definitions(-DDCMTK_VERSION_NUMBER=${DCMTK_VERSION_NUMBER}) | |
283 message("DCMTK version: ${DCMTK_VERSION_NUMBER}") | |
1770 | 284 |
285 | |
286 add_definitions(-DDCMTK_USE_EMBEDDED_DICTIONARIES=${DCMTK_USE_EMBEDDED_DICTIONARIES}) | |
287 if (NOT DCMTK_USE_EMBEDDED_DICTIONARIES) | |
288 # Lookup for DICOM dictionaries, if none is specified by the user | |
289 if (DCMTK_DICTIONARY_DIR STREQUAL "") | |
290 find_path(DCMTK_DICTIONARY_DIR_AUTO dicom.dic | |
291 /usr/share/dcmtk | |
1883
71356f41ec2f
additional locations for dicom.dic
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1846
diff
changeset
|
292 /usr/share/libdcmtk1 |
1770 | 293 /usr/share/libdcmtk2 |
1883
71356f41ec2f
additional locations for dicom.dic
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1846
diff
changeset
|
294 /usr/share/libdcmtk3 |
1770 | 295 /usr/share/libdcmtk4 |
1883
71356f41ec2f
additional locations for dicom.dic
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1846
diff
changeset
|
296 /usr/share/libdcmtk5 |
71356f41ec2f
additional locations for dicom.dic
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1846
diff
changeset
|
297 /usr/share/libdcmtk6 |
2064
e92280e63d8d
fix Debian #829608
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1951
diff
changeset
|
298 /usr/share/libdcmtk7 |
e92280e63d8d
fix Debian #829608
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1951
diff
changeset
|
299 /usr/share/libdcmtk8 |
e92280e63d8d
fix Debian #829608
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1951
diff
changeset
|
300 /usr/share/libdcmtk9 |
1770 | 301 /usr/local/share/dcmtk |
302 ) | |
303 | |
304 if (${DCMTK_DICTIONARY_DIR_AUTO} MATCHES "DCMTK_DICTIONARY_DIR_AUTO-NOTFOUND") | |
305 message(FATAL_ERROR "Cannot locate the DICOM dictionary on this system") | |
306 endif() | |
307 | |
308 message("Autodetected path to the DICOM dictionaries: ${DCMTK_DICTIONARY_DIR_AUTO}") | |
309 add_definitions(-DDCMTK_DICTIONARY_DIR="${DCMTK_DICTIONARY_DIR_AUTO}") | |
310 else() | |
311 add_definitions(-DDCMTK_DICTIONARY_DIR="${DCMTK_DICTIONARY_DIR}") | |
312 endif() | |
313 endif() |