ENH: Now the dictionary is compiled into gdcm lib. This is a default behavior, thus...

[gdcm.git] / src / CMakeLists.txt

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index d3dbfdf72f915f80158b727ac2cff4064d64cf4b..5cfd632fcdcf20216c7de9a6903bf901fcf64579 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -4,10 +4,8 @@ SUBDIRS(jpeg)
 
 # "jpeglib.h" is defined here:
 INCLUDE_DIRECTORIES(
-  ${GDCM_SOURCE_DIR}/
+  ${GDCM_SOURCE_DIR}/src
   ${GDCM_BINARY_DIR}/ #for gdcmConfigure.h
-#  ${GDCM_BINARY_DIR}/src/jpeg/libijg8  #created a build time
-#  ${GDCM_BINARY_DIR}/src/jpeg/libijg12 #created a build time
 )
 
 SET(libgdcm_la_SOURCES
@@ -34,12 +32,14 @@ SET(libgdcm_la_SOURCES
    gdcmGlobal.cxx
    gdcmHeader.cxx
    gdcmHeaderHelper.cxx
+   gdcmJPEGFragment.cxx
+   gdcmJPEGFragmentsInfo.cxx
+   gdcmJpeg8.cxx
    gdcmJpeg12.cxx
+   gdcmJpeg16.cxx
    gdcmJpeg2000.cxx
-   gdcmJpeg.cxx
-   gdcmParsePixels.cxx
    gdcmPixelConvert.cxx
-   gdcmRLE.cxx
+   gdcmRLEFrame.cxx
    gdcmRLEFramesInfo.cxx
    gdcmSeqEntry.cxx
    gdcmSQItem.cxx
@@ -47,6 +47,7 @@ SET(libgdcm_la_SOURCES
    gdcmUtil.cxx
    gdcmValEntry.cxx   
    gdcmVR.cxx
+   ${GDCM_BINARY_DIR}/src/gdcmDefaultDicts.cxx
    )
 
 ADD_LIBRARY(gdcm ${libgdcm_la_SOURCES} )
@@ -54,13 +55,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 +69,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)