X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FCMakeLists.txt;h=999a933eeba640ee824b247ca8ce26b22a5b4d62;hb=75fe55c7b72932dac378a24e7315071bc0ac9af6;hp=d3dbfdf72f915f80158b727ac2cff4064d64cf4b;hpb=9f274230cc36f77f784729031fbe3e7d576f13ea;p=gdcm.git

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index d3dbfdf7..999a933e 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,13 +1,15 @@
 #-----------------------------------------------------------------------------
+# Rebuild gdcm whenever a file starting with gdcm* is modified
+INCLUDE_REGULAR_EXPRESSION("^gdcm.*$")
+
 # Build jpeg lib first:
-SUBDIRS(jpeg)
+SUBDIRS(gdcmjpeg)
 
 # "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
+  ${GDCM_BINARY_DIR}/src #for gdcmjpeg 8, 12 and 16 
 )
 
 SET(libgdcm_la_SOURCES
@@ -26,6 +28,7 @@ SET(libgdcm_la_SOURCES
    gdcmDictSet.cxx
    gdcmDirList.cxx
    gdcmDocEntry.cxx
+   gdcmDocEntryArchive.cxx
    gdcmDocEntrySet.cxx
    gdcmDocument.cxx
    gdcmElementSet.cxx
@@ -33,42 +36,40 @@ SET(libgdcm_la_SOURCES
    gdcmFile.cxx
    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
+   gdcmSerieHeader.cxx
    gdcmSQItem.cxx
    gdcmTS.cxx
    gdcmUtil.cxx
    gdcmValEntry.cxx   
    gdcmVR.cxx
+   ${GDCM_BINARY_DIR}/src/gdcmDefaultDicts.cxx
    )
 
 ADD_LIBRARY(gdcm ${libgdcm_la_SOURCES} )
-IF(UNIX)
-  TARGET_LINK_LIBRARIES(gdcm 
-    gdcmijpeg8 
-    gdcmijpeg12
-    gdcmljpeg     # JPEG lib from xmedcom 
-  )
-ELSE(UNIX)
-  TARGET_LINK_LIBRARIES(gdcm 
-    gdcmijpeg8 
-    gdcmijpeg12
-    gdcmljpeg
-    Wsock32.lib   #doesn't exist on cygwin
-  )
-ENDIF(UNIX)
+TARGET_LINK_LIBRARIES(gdcm 
+  gdcmjpeg8 
+  gdcmjpeg12
+  gdcmjpeg16
+)
+IF(WIN32)
+  IF(NOT BORLAND)
+    TARGET_LINK_LIBRARIES(gdcm Wsock32)
+  ENDIF(NOT BORLAND)
+ENDIF(WIN32)
 
 #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)