Mercurial > hg > orthanc

comparison Resources/CMake/DcmtkConfiguration.cmake @ 930:27d256e0b458 mac

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
integration mainline -> mac
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 24 Jun 2014 16:47:18 +0200
parents 882833632b1f 401a8273fd71
children 3a26bc6e4867
comparison
equal deleted inserted replaced
928:882833632b1f 930:27d256e0b458
46 46
47 AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmnet/libsrc DCMTK_SOURCES) 47 AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmnet/libsrc DCMTK_SOURCES)
48 AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmdata/libsrc DCMTK_SOURCES) 48 AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmdata/libsrc DCMTK_SOURCES)
49 AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/ofstd/libsrc DCMTK_SOURCES) 49 AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/ofstd/libsrc DCMTK_SOURCES)
50 50
51
52 if (ENABLE_JPEG)
53 AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmjpeg/libsrc DCMTK_SOURCES)
54 AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmjpeg/libijg8 DCMTK_SOURCES)
55 AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmjpeg/libijg12 DCMTK_SOURCES)
56 AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmjpeg/libijg16 DCMTK_SOURCES)
57 include_directories(
58 ${DCMTK_SOURCES_DIR}/dcmjpeg/include
59 ${DCMTK_SOURCES_DIR}/dcmjpeg/libijg8
60 ${DCMTK_SOURCES_DIR}/dcmjpeg/libijg12
61 ${DCMTK_SOURCES_DIR}/dcmjpeg/libijg16
62 ${DCMTK_SOURCES_DIR}/dcmimgle/include
63 )
64 list(REMOVE_ITEM DCMTK_SOURCES
65 ${DCMTK_SOURCES_DIR}/dcmjpeg/libsrc/ddpiimpl.cc
66 )
67 endif()
68
69
70 if (ENABLE_JPEG_LOSSLESS)
71 AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmjpls/libsrc DCMTK_SOURCES)
72 AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmjpls/libcharls DCMTK_SOURCES)
73 include_directories(
74 ${DCMTK_SOURCES_DIR}/dcmjpeg/include
75 ${DCMTK_SOURCES_DIR}/dcmjpls/include
76 ${DCMTK_SOURCES_DIR}/dcmjpls/libcharls
77 )
78 list(REMOVE_ITEM DCMTK_SOURCES
79 ${DCMTK_SOURCES_DIR}/dcmjpls/libsrc/djcodece.cc
80 )
81 list(APPEND DCMTK_SOURCES
82 ${DCMTK_SOURCES_DIR}/dcmjpeg/libsrc/djrplol.cc
83 )
84 endif()
85
86
51 # Source for the logging facility of DCMTK 87 # Source for the logging facility of DCMTK
52 AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/oflog/libsrc DCMTK_SOURCES) 88 AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/oflog/libsrc DCMTK_SOURCES)
53 if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux" OR 89 if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux" OR
54 ${CMAKE_SYSTEM_NAME} STREQUAL "Darwin") 90 ${CMAKE_SYSTEM_NAME} STREQUAL "Darwin" OR
91 ${CMAKE_SYSTEM_NAME} STREQUAL "kFreeBSD")
55 list(REMOVE_ITEM DCMTK_SOURCES 92 list(REMOVE_ITEM DCMTK_SOURCES
56 ${DCMTK_SOURCES_DIR}/oflog/libsrc/windebap.cc 93 ${DCMTK_SOURCES_DIR}/oflog/libsrc/windebap.cc
57 ${DCMTK_SOURCES_DIR}/oflog/libsrc/winsock.cc 94 ${DCMTK_SOURCES_DIR}/oflog/libsrc/winsock.cc
58 ) 95 )
59 elseif (${CMAKE_SYSTEM_NAME} STREQUAL "Windows") 96 elseif (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")