comparison Resources/CMake/DcmtkConfiguration.cmake @ 2380:96b3ec054b69

reorganization in macros
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 29 Aug 2017 16:49:44 +0200
parents c33ff8a7ffa9
children 741bb76634d3
comparison
equal deleted inserted replaced
2379:4900688827a8 2380:96b3ec054b69
149 include_directories( 149 include_directories(
150 ${DCMTK_SOURCES_DIR}/dcmnet/include 150 ${DCMTK_SOURCES_DIR}/dcmnet/include
151 ) 151 )
152 endif() 152 endif()
153 153
154 if (ENABLE_JPEG) 154 if (ENABLE_DCMTK_JPEG)
155 AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmjpeg/libsrc DCMTK_SOURCES) 155 AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmjpeg/libsrc DCMTK_SOURCES)
156 AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmjpeg/libijg8 DCMTK_SOURCES) 156 AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmjpeg/libijg8 DCMTK_SOURCES)
157 AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmjpeg/libijg12 DCMTK_SOURCES) 157 AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmjpeg/libijg12 DCMTK_SOURCES)
158 AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmjpeg/libijg16 DCMTK_SOURCES) 158 AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmjpeg/libijg16 DCMTK_SOURCES)
159 include_directories( 159 include_directories(
177 ${DCMTK_SOURCES_DIR}/dcmjpeg/libsrc/djencsps.cc 177 ${DCMTK_SOURCES_DIR}/dcmjpeg/libsrc/djencsps.cc
178 ) 178 )
179 endif() 179 endif()
180 180
181 181
182 if (ENABLE_JPEG_LOSSLESS) 182 if (ENABLE_DCMTK_JPEG_LOSSLESS)
183 AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmjpls/libsrc DCMTK_SOURCES) 183 AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmjpls/libsrc DCMTK_SOURCES)
184 AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmjpls/libcharls DCMTK_SOURCES) 184 AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmjpls/libcharls DCMTK_SOURCES)
185 include_directories( 185 include_directories(
186 ${DCMTK_SOURCES_DIR}/dcmjpeg/include 186 ${DCMTK_SOURCES_DIR}/dcmjpeg/include
187 ${DCMTK_SOURCES_DIR}/dcmjpls/include 187 ${DCMTK_SOURCES_DIR}/dcmjpls/include