Mercurial > hg > orthanc

diff Resources/CMake/DcmtkConfiguration.cmake @ 857:f53358c70c05 jpeg

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix
author Sebastien Jodogne <s.jodogne@gmail.com>
date Fri, 06 Jun 2014 15:01:19 +0200
parents 6944fc00962e
children 816dccaeb7cf
line wrap: on
line diff
--- a/Resources/CMake/DcmtkConfiguration.cmake	Fri Jun 06 13:15:47 2014 +0200
+++ b/Resources/CMake/DcmtkConfiguration.cmake	Fri Jun 06 15:01:19 2014 +0200
@@ -50,7 +50,7 @@
   AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/ofstd/libsrc DCMTK_SOURCES)
 
 
-  if (ENABLE_JPEG_LOSSLESS)
+  if (ENABLE_JPEG)
     AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmjpeg/libsrc DCMTK_SOURCES)
     AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmjpeg/libijg8 DCMTK_SOURCES)
     AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmjpeg/libijg12 DCMTK_SOURCES)
@@ -62,6 +62,9 @@
       ${DCMTK_SOURCES_DIR}/dcmjpeg/libijg16
       ${DCMTK_SOURCES_DIR}/dcmimgle/include
       )
+    list(REMOVE_ITEM DCMTK_SOURCES 
+      ${DCMTK_SOURCES_DIR}/dcmjpeg/libsrc/ddpiimpl.cc
+      )
   endif()
 
 
@@ -74,9 +77,11 @@
       ${DCMTK_SOURCES_DIR}/dcmjpls/libcharls
       )
     list(REMOVE_ITEM DCMTK_SOURCES 
-      ${DCMTK_SOURCES_DIR}/dcmjpls/libsrc/djcodece.cc)
+      ${DCMTK_SOURCES_DIR}/dcmjpls/libsrc/djcodece.cc
+      )
     list(APPEND DCMTK_SOURCES 
-      ${DCMTK_SOURCES_DIR}/dcmjpeg/libsrc/djrplol.cc)
+      ${DCMTK_SOURCES_DIR}/dcmjpeg/libsrc/djrplol.cc
+      )
   endif()