X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=src%2FCMakeLists.txt;h=d3980849d4a5f90fd8edd47ca5ef5ff9f786b422;hb=0b9694d267e7eab6b1b8fb25d59fde201ccb1000;hp=8b6b078f6c703829240e5d98641a486f93096064;hpb=fb3bc19d96ec0bf38de3a466208a891a799f4797;p=gdcm.git

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 8b6b078f..d3980849 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -2,19 +2,11 @@
 # Rebuild gdcm whenever a file starting with gdcm* is modified
 INCLUDE_REGULAR_EXPRESSION("^gdcm.*$")
 
-# Build jpeg lib first:
-#IF (WIN32)
-#  IF (BUILD_SHARED_LIBS)
-#    ADD_DEFINITIONS(-DJPEGDLL)
-#  ELSE (BUILD_SHARED_LIBS)
-#    ADD_DEFINITIONS(-DJPEGSTATIC)
-#  ENDIF (BUILD_SHARED_LIBS)
-#ENDIF (WIN32)
 SUBDIRS(
   gdcmjpeg
-  #gdcmmpeg2
-  gdcmjasper
-  gdcmjpegls
+  gdcmmpeg2
+  #gdcmjpegls
+  gdcmopenjpeg
   )
 
 # "jpeglib.h" is defined here:
@@ -23,15 +15,13 @@ INCLUDE_DIRECTORIES(
   ${GDCM_SOURCE_DIR}/src/gdcmmpeg2/src/mpeg2dec
   ${GDCM_BINARY_DIR} #for gdcmConfigure.h
   ${GDCM_BINARY_DIR}/src #for gdcmjpeg 8, 12 and 16 
-  ${GDCM_BINARY_DIR}/src/gdcmjasper/src/libjasper/include
-  ${GDCM_SOURCE_DIR}/src/gdcmjasper/src/libjasper/include
+  ${GDCM_SOURCE_DIR}/src/gdcmopenjpeg/libopenjpeg
 )
 
 SET(libgdcm_la_SOURCES
    gdcmArgMgr.cxx
    gdcmBase.cxx
-   gdcmBinEntry.cxx
-   gdcmContentEntry.cxx
+   gdcmDataEntry.cxx
    gdcmDebug.cxx
    gdcmDicomDir.cxx
    gdcmDicomDirElement.cxx
@@ -42,6 +32,7 @@ SET(libgdcm_la_SOURCES
    gdcmDicomDirVisit.cxx
    gdcmDicomDirSerie.cxx
    gdcmDicomDirStudy.cxx
+   gdcmDicomEntry.cxx
    gdcmDict.cxx
    gdcmDictEntry.cxx
    gdcmDictGroupName.cxx
@@ -53,19 +44,20 @@ SET(libgdcm_la_SOURCES
    gdcmDocument.cxx
    gdcmElementSet.cxx
    gdcmException.cxx
+   gdcmFile.cxx
    gdcmFileHelper.cxx
    gdcmGlobal.cxx
-   gdcmFile.cxx
    gdcmJPEGFragment.cxx
    gdcmJPEGFragmentsInfo.cxx
    gdcmJpeg8.cxx
    gdcmJpeg12.cxx
    gdcmJpeg16.cxx
    gdcmJpeg2000.cxx
-   #   gdcmMpeg.cxx
+   gdcmMpeg.cxx
    gdcmOrientation.cxx
    gdcmPixelReadConvert.cxx
    gdcmPixelWriteConvert.cxx
+   gdcmRefCounter.cxx
    gdcmRLEFrame.cxx
    gdcmRLEFramesInfo.cxx
    gdcmSeqEntry.cxx
@@ -73,19 +65,18 @@ SET(libgdcm_la_SOURCES
    gdcmSQItem.cxx
    gdcmTS.cxx
    gdcmUtil.cxx
-   gdcmValEntry.cxx   
    gdcmValidator.cxx
    gdcmVR.cxx
    ${GDCM_BINARY_DIR}/src/gdcmDefaultDicts.cxx
    )
 
-ADD_LIBRARY(gdcm ${libgdcm_la_SOURCES} )
+ADD_LIBRARY(gdcm ${libgdcm_la_SOURCES})
 TARGET_LINK_LIBRARIES(gdcm 
   gdcmjpeg8 
   gdcmjpeg12
   gdcmjpeg16
-  #  gdcmmpeg2
-  gdcmjasper
+  gdcmmpeg2
+  gdcmopenjpeg
 )
 IF(WIN32)
   IF(NOT BORLAND)