X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=src%2FCMakeLists.txt;h=5cfd632fcdcf20216c7de9a6903bf901fcf64579;hb=616fe6757e5e27ce6ebb48e9e3bf3b42ab15be1c;hp=f007aca0d262a92f679ab410ad81918838651b15;hpb=689f929ff0f35aabd30d81ffa75eb66fdf1a3c16;p=gdcm.git

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index f007aca0..5cfd632f 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -4,48 +4,50 @@ 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}/src
   ${GDCM_BINARY_DIR}/ #for gdcmConfigure.h
 )
 
 SET(libgdcm_la_SOURCES
-   gdcmDirList.cxx
+   gdcmBinEntry.cxx
    gdcmDebug.cxx
+   gdcmDicomDir.cxx
+   gdcmDicomDirElement.cxx
+   gdcmDicomDirImage.cxx
+   gdcmDicomDirMeta.cxx
+   gdcmDicomDirObject.cxx
+   gdcmDicomDirPatient.cxx
+   gdcmDicomDirSerie.cxx
+   gdcmDicomDirStudy.cxx
    gdcmDict.cxx
    gdcmDictEntry.cxx
    gdcmDictSet.cxx
+   gdcmDirList.cxx
+   gdcmDocEntry.cxx
+   gdcmDocEntrySet.cxx
+   gdcmDocument.cxx
+   gdcmElementSet.cxx
    gdcmException.cxx
-   gdcmGlobal.cxx
-   gdcmJpeg12.cxx
-   gdcmJpeg2000.cxx
-   gdcmJpeg.cxx
-   gdcmTS.cxx
-   gdcmUtil.cxx
-   gdcmVR.cxx
    gdcmFile.cxx
+   gdcmGlobal.cxx
    gdcmHeader.cxx
    gdcmHeaderHelper.cxx
-   gdcmParsePixels.cxx
-   gdcmRLE.cxx
-   gdcmDocEntry.cxx
-   gdcmDocEntrySet.cxx
-   gdcmBinEntry.cxx
+   gdcmJPEGFragment.cxx
+   gdcmJPEGFragmentsInfo.cxx
+   gdcmJpeg8.cxx
+   gdcmJpeg12.cxx
+   gdcmJpeg16.cxx
+   gdcmJpeg2000.cxx
+   gdcmPixelConvert.cxx
+   gdcmRLEFrame.cxx
+   gdcmRLEFramesInfo.cxx
    gdcmSeqEntry.cxx
    gdcmSQItem.cxx
-   gdcmElementSet.cxx
+   gdcmTS.cxx
+   gdcmUtil.cxx
    gdcmValEntry.cxx   
-   gdcmDicomDirElement.cxx
-   gdcmDocument.cxx
-   gdcmDicomDir.cxx
-   gdcmDicomDirMeta.cxx
-   gdcmDicomDirPatient.cxx
-   gdcmDicomDirStudy.cxx
-   gdcmDicomDirSerie.cxx
-   gdcmDicomDirImage.cxx
-   gdcmDicomDirObject.cxx
-   gdcmPixelConvert.cxx
+   gdcmVR.cxx
+   ${GDCM_BINARY_DIR}/src/gdcmDefaultDicts.cxx
    )
 
 ADD_LIBRARY(gdcm ${libgdcm_la_SOURCES} )
@@ -53,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)
@@ -67,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)