ENH: * Finished lossless transition, not only do we now read all lossless jpeg

[gdcm.git] / src / CMakeLists.txt

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index fc0272297983320c358c4a9e67340cbb6f535478..733c1d22f416a6c48d928dd9aa6b8c61cc9df1bf 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -4,9 +4,7 @@ SUBDIRS(jpeg)
 
 # "jpeglib.h" is defined here:
 INCLUDE_DIRECTORIES(
-  ${GDCM_SOURCE_DIR}/src/jpeg/libijg8
-  #${GDCM_SOURCE_DIR}/jpeg/libijg12 #all files have been renamed, appending 12
-  #${GDCM_SOURCE_DIR}/jpeg/ljpg     # JPEG lib from xmedcom 
+  ${GDCM_SOURCE_DIR}/
   ${GDCM_BINARY_DIR}/ #for gdcmConfigure.h
 )
 
@@ -34,12 +32,13 @@ SET(libgdcm_la_SOURCES
    gdcmGlobal.cxx
    gdcmHeader.cxx
    gdcmHeaderHelper.cxx
+   gdcmJPEGFragmentsInfo.cxx
+   gdcmJpeg8.cxx
    gdcmJpeg12.cxx
+   gdcmJpeg16.cxx
    gdcmJpeg2000.cxx
-   gdcmJpeg.cxx
    gdcmParsePixels.cxx
    gdcmPixelConvert.cxx
-   gdcmRLE.cxx
    gdcmRLEFramesInfo.cxx
    gdcmSeqEntry.cxx
    gdcmSQItem.cxx
@@ -54,13 +53,13 @@ IF(UNIX)
   TARGET_LINK_LIBRARIES(gdcm 
     gdcmijpeg8 
     gdcmijpeg12
-    gdcmljpeg     # JPEG lib from xmedcom 
+    gdcmijpeg16
   )
 ELSE(UNIX)
   TARGET_LINK_LIBRARIES(gdcm 
     gdcmijpeg8 
     gdcmijpeg12
-    gdcmljpeg
+    gdcmijpeg16
     Wsock32.lib   #doesn't exist on cygwin
   )
 ENDIF(UNIX)
@@ -68,7 +67,6 @@ ENDIF(UNIX)
 #The following is not working because when a header file is not found it tries 
 #to find one in the binary dir
 #INSTALL_FILES(/include .h ${libgdcm_la_SOURCES})
-#INSTALL_FILES(/include FILES gdcmIdo.h iddcmjpeg.h)
 INSTALL_FILES(/include "\\.h$")
 
 INSTALL_TARGETS(/lib/ gdcm)