X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FCMakeLists.txt;h=d3980849d4a5f90fd8edd47ca5ef5ff9f786b422;hb=ba355c8e668e9da685de102607f7001aa8504d7d;hp=84d3df6e89b7229fb7ea4247c5d9e5d9fb14486e;hpb=bc69950a406d06c50f0fb75a96572784965cb534;p=gdcm.git

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 84d3df6e..d3980849 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -4,9 +4,9 @@ INCLUDE_REGULAR_EXPRESSION("^gdcm.*$")
 
 SUBDIRS(
   gdcmjpeg
-  #gdcmmpeg2
-  gdcmjasper
-  gdcmjpegls
+  gdcmmpeg2
+  #gdcmjpegls
+  gdcmopenjpeg
   )
 
 # "jpeglib.h" is defined here:
@@ -15,8 +15,7 @@ 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
@@ -33,6 +32,7 @@ SET(libgdcm_la_SOURCES
    gdcmDicomDirVisit.cxx
    gdcmDicomDirSerie.cxx
    gdcmDicomDirStudy.cxx
+   gdcmDicomEntry.cxx
    gdcmDict.cxx
    gdcmDictEntry.cxx
    gdcmDictGroupName.cxx
@@ -44,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
@@ -74,8 +75,8 @@ TARGET_LINK_LIBRARIES(gdcm
   gdcmjpeg8 
   gdcmjpeg12
   gdcmjpeg16
-  #  gdcmmpeg2
-  gdcmjasper
+  gdcmmpeg2
+  gdcmopenjpeg
 )
 IF(WIN32)
   IF(NOT BORLAND)