Mercurial > hg > orthanc
comparison Resources/CMake/DcmtkConfiguration.cmake @ 857:f53358c70c05 jpeg
fix
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Fri, 06 Jun 2014 15:01:19 +0200 |
parents | 6944fc00962e |
children | 816dccaeb7cf |
comparison
equal
deleted
inserted
replaced
856:6944fc00962e | 857:f53358c70c05 |
---|---|
48 AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmnet/libsrc DCMTK_SOURCES) | 48 AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmnet/libsrc DCMTK_SOURCES) |
49 AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmdata/libsrc DCMTK_SOURCES) | 49 AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmdata/libsrc DCMTK_SOURCES) |
50 AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/ofstd/libsrc DCMTK_SOURCES) | 50 AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/ofstd/libsrc DCMTK_SOURCES) |
51 | 51 |
52 | 52 |
53 if (ENABLE_JPEG_LOSSLESS) | 53 if (ENABLE_JPEG) |
54 AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmjpeg/libsrc DCMTK_SOURCES) | 54 AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmjpeg/libsrc DCMTK_SOURCES) |
55 AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmjpeg/libijg8 DCMTK_SOURCES) | 55 AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmjpeg/libijg8 DCMTK_SOURCES) |
56 AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmjpeg/libijg12 DCMTK_SOURCES) | 56 AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmjpeg/libijg12 DCMTK_SOURCES) |
57 AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmjpeg/libijg16 DCMTK_SOURCES) | 57 AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmjpeg/libijg16 DCMTK_SOURCES) |
58 include_directories( | 58 include_directories( |
59 ${DCMTK_SOURCES_DIR}/dcmjpeg/include | 59 ${DCMTK_SOURCES_DIR}/dcmjpeg/include |
60 ${DCMTK_SOURCES_DIR}/dcmjpeg/libijg8 | 60 ${DCMTK_SOURCES_DIR}/dcmjpeg/libijg8 |
61 ${DCMTK_SOURCES_DIR}/dcmjpeg/libijg12 | 61 ${DCMTK_SOURCES_DIR}/dcmjpeg/libijg12 |
62 ${DCMTK_SOURCES_DIR}/dcmjpeg/libijg16 | 62 ${DCMTK_SOURCES_DIR}/dcmjpeg/libijg16 |
63 ${DCMTK_SOURCES_DIR}/dcmimgle/include | 63 ${DCMTK_SOURCES_DIR}/dcmimgle/include |
64 ) | |
65 list(REMOVE_ITEM DCMTK_SOURCES | |
66 ${DCMTK_SOURCES_DIR}/dcmjpeg/libsrc/ddpiimpl.cc | |
64 ) | 67 ) |
65 endif() | 68 endif() |
66 | 69 |
67 | 70 |
68 if (ENABLE_JPEG_LOSSLESS) | 71 if (ENABLE_JPEG_LOSSLESS) |
72 ${DCMTK_SOURCES_DIR}/dcmjpeg/include | 75 ${DCMTK_SOURCES_DIR}/dcmjpeg/include |
73 ${DCMTK_SOURCES_DIR}/dcmjpls/include | 76 ${DCMTK_SOURCES_DIR}/dcmjpls/include |
74 ${DCMTK_SOURCES_DIR}/dcmjpls/libcharls | 77 ${DCMTK_SOURCES_DIR}/dcmjpls/libcharls |
75 ) | 78 ) |
76 list(REMOVE_ITEM DCMTK_SOURCES | 79 list(REMOVE_ITEM DCMTK_SOURCES |
77 ${DCMTK_SOURCES_DIR}/dcmjpls/libsrc/djcodece.cc) | 80 ${DCMTK_SOURCES_DIR}/dcmjpls/libsrc/djcodece.cc |
81 ) | |
78 list(APPEND DCMTK_SOURCES | 82 list(APPEND DCMTK_SOURCES |
79 ${DCMTK_SOURCES_DIR}/dcmjpeg/libsrc/djrplol.cc) | 83 ${DCMTK_SOURCES_DIR}/dcmjpeg/libsrc/djrplol.cc |
84 ) | |
80 endif() | 85 endif() |
81 | 86 |
82 | 87 |
83 # Source for the logging facility of DCMTK | 88 # Source for the logging facility of DCMTK |
84 AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/oflog/libsrc DCMTK_SOURCES) | 89 AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/oflog/libsrc DCMTK_SOURCES) |