Mercurial > hg > orthanc
comparison Resources/CMake/DcmtkConfiguration.cmake @ 100:27dc762e3dc8
getting rid of static dcmtk for debian
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Wed, 03 Oct 2012 09:33:25 +0200 |
parents | 10184c6eabc0 |
children | 428784e59dcd |
comparison
equal
deleted
inserted
replaced
99:52ed88d3096a | 100:27dc762e3dc8 |
---|---|
1 # We always statically link against DCMTK 3.6.0, as there are many | 1 # We always statically link against DCMTK 3.6.0, as there are many |
2 # differences wrt. DCMTK 3.5.x. | 2 # differences wrt. DCMTK 3.5.x. |
3 | 3 |
4 if (ON) ## ${STATIC_BUILD}) | 4 if (${STATIC_BUILD}) |
5 SET(DCMTK_SOURCES_DIR ${CMAKE_BINARY_DIR}/dcmtk-3.6.0) | 5 SET(DCMTK_SOURCES_DIR ${CMAKE_BINARY_DIR}/dcmtk-3.6.0) |
6 DownloadPackage("ftp://dicom.offis.de/pub/dicom/offis/software/dcmtk/dcmtk360/dcmtk-3.6.0.zip" "${DCMTK_SOURCES_DIR}" "" "") | 6 DownloadPackage("ftp://dicom.offis.de/pub/dicom/offis/software/dcmtk/dcmtk360/dcmtk-3.6.0.zip" "${DCMTK_SOURCES_DIR}" "" "") |
7 | 7 |
8 IF(CMAKE_CROSSCOMPILING) | 8 IF(CMAKE_CROSSCOMPILING) |
9 SET(C_CHAR_UNSIGNED 1 CACHE INTERNAL "Whether char is unsigned.") | 9 SET(C_CHAR_UNSIGNED 1 CACHE INTERNAL "Whether char is unsigned.") |
15 ${DCMTK_SOURCES_DIR}/config/include/dcmtk/config/osconfig.h) | 15 ${DCMTK_SOURCES_DIR}/config/include/dcmtk/config/osconfig.h) |
16 | 16 |
17 AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmnet/libsrc THIRD_PARTY_SOURCES) | 17 AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmnet/libsrc THIRD_PARTY_SOURCES) |
18 AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmdata/libsrc THIRD_PARTY_SOURCES) | 18 AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmdata/libsrc THIRD_PARTY_SOURCES) |
19 AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/ofstd/libsrc THIRD_PARTY_SOURCES) | 19 AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/ofstd/libsrc THIRD_PARTY_SOURCES) |
20 | |
21 # Source for the logging facility of DCMTK | |
20 AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/oflog/libsrc THIRD_PARTY_SOURCES) | 22 AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/oflog/libsrc THIRD_PARTY_SOURCES) |
21 | |
22 if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux") | 23 if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux") |
23 list(REMOVE_ITEM THIRD_PARTY_SOURCES | 24 list(REMOVE_ITEM THIRD_PARTY_SOURCES |
24 ${DCMTK_SOURCES_DIR}/oflog/libsrc/windebap.cc | 25 ${DCMTK_SOURCES_DIR}/oflog/libsrc/windebap.cc |
25 ${DCMTK_SOURCES_DIR}/oflog/libsrc/winsock.cc | 26 ${DCMTK_SOURCES_DIR}/oflog/libsrc/winsock.cc |
26 ) | 27 ) |
36 ${DCMTK_SOURCES_DIR}/dcmdata/libsrc/dcdictbi.cc | 37 ${DCMTK_SOURCES_DIR}/dcmdata/libsrc/dcdictbi.cc |
37 ) | 38 ) |
38 | 39 |
39 # This fixes crashes related to the destruction of the DCMTK OFLogger | 40 # This fixes crashes related to the destruction of the DCMTK OFLogger |
40 # http://support.dcmtk.org/docs-snapshot/file_macros.html | 41 # http://support.dcmtk.org/docs-snapshot/file_macros.html |
41 add_definitions(-DLOG4CPLUS_DISABLE_FATAL=1) | 42 #add_definitions(-DLOG4CPLUS_DISABLE_FATAL=1) |
42 | 43 |
43 include_directories( | 44 include_directories( |
44 #${DCMTK_SOURCES_DIR} | 45 #${DCMTK_SOURCES_DIR} |
45 ${DCMTK_SOURCES_DIR}/config/include | 46 ${DCMTK_SOURCES_DIR}/config/include |
46 ${DCMTK_SOURCES_DIR}/dcmnet/include | 47 ${DCMTK_SOURCES_DIR}/dcmnet/include |
48 ${DCMTK_SOURCES_DIR}/oflog/include | 49 ${DCMTK_SOURCES_DIR}/oflog/include |
49 ${DCMTK_SOURCES_DIR}/dcmdata/include | 50 ${DCMTK_SOURCES_DIR}/dcmdata/include |
50 ) | 51 ) |
51 | 52 |
52 source_group(ThirdParty\\Dcmtk REGULAR_EXPRESSION ${DCMTK_SOURCES_DIR}/.*) | 53 source_group(ThirdParty\\Dcmtk REGULAR_EXPRESSION ${DCMTK_SOURCES_DIR}/.*) |
54 | |
55 set(DCMTK_BUNDLES_LOG4CPLUS 1) | |
56 | |
53 else() | 57 else() |
54 include(FindDCMTK) | 58 include(FindDCMTK) |
55 | 59 |
56 include_directories(${DCMTK_INCLUDE_DIR}) | 60 include_directories(${DCMTK_INCLUDE_DIR}) |
57 link_libraries(${DCMTK_LIBRARIES} oflog ofstd wrap) | 61 link_libraries(${DCMTK_LIBRARIES} oflog ofstd wrap) |
58 | 62 |
59 add_definitions( | 63 add_definitions( |
60 -DHAVE_CONFIG_H=1 | 64 -DHAVE_CONFIG_H=1 |
61 ) | 65 ) |
66 | |
67 message("${DCMTK_DIR}/oflog") | |
68 | |
69 IF (EXISTS "${DCMTK_DIR}/oflog") | |
70 set(DCMTK_BUNDLES_LOG4CPLUS 1) | |
71 else() | |
72 set(DCMTK_BUNDLES_LOG4CPLUS 0) | |
73 endif() | |
62 endif() | 74 endif() |
75 | |
76 message("DCMTK includes its own copy of Log4Cplus: ${DCMTK_BUNDLES_LOG4CPLUS}") |