X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=src%2FCMakeLists.txt;h=d3980849d4a5f90fd8edd47ca5ef5ff9f786b422;hb=e9a711266d34e33b482edbe241b2e40db7d9915a;hp=3b1710f743d6f89ad5f46294d7aa678cc9d8bb22;hpb=9aa702d6397e3e490263a0791dd6c8ed2f3d1e83;p=gdcm.git

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 3b1710f7..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
@@ -54,10 +53,11 @@ SET(libgdcm_la_SOURCES
    gdcmJpeg12.cxx
    gdcmJpeg16.cxx
    gdcmJpeg2000.cxx
-   #   gdcmMpeg.cxx
+   gdcmMpeg.cxx
    gdcmOrientation.cxx
    gdcmPixelReadConvert.cxx
    gdcmPixelWriteConvert.cxx
+   gdcmRefCounter.cxx
    gdcmRLEFrame.cxx
    gdcmRLEFramesInfo.cxx
    gdcmSeqEntry.cxx
@@ -75,8 +75,8 @@ TARGET_LINK_LIBRARIES(gdcm
   gdcmjpeg8 
   gdcmjpeg12
   gdcmjpeg16
-  #  gdcmmpeg2
-  gdcmjasper
+  gdcmmpeg2
+  gdcmopenjpeg
 )
 IF(WIN32)
   IF(NOT BORLAND)