X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FCMakeLists.txt;h=ef6f8fe138e54f029682c59d66798c503aa5d308;hb=4c0fe0142482ede7dd8f5408f9303d78c213435b;hp=51109483437adbe271f0bb57b407707c2a92b685;hpb=6a7c2fbcb5bfc240a3b9875ad4836f5dc058e069;p=gdcm.git

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 51109483..ef6f8fe1 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -5,8 +5,8 @@ INCLUDE_REGULAR_EXPRESSION("^gdcm.*$")
 SUBDIRS(
   gdcmjpeg
   #gdcmmpeg2
-  gdcmjasper
-  gdcmjpegls
+  #gdcmjpegls
+  gdcmopenjpeg
   )
 
 # "jpeglib.h" is defined here:
@@ -15,13 +15,15 @@ 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
+   gdcmCallbackCommand.cxx
+   gdcmCommand.cxx
+   gdcmCommandManager.cxx
    gdcmDataEntry.cxx
    gdcmDebug.cxx
    gdcmDicomDir.cxx
@@ -33,7 +35,6 @@ SET(libgdcm_la_SOURCES
    gdcmDicomDirVisit.cxx
    gdcmDicomDirSerie.cxx
    gdcmDicomDirStudy.cxx
-   gdcmDicomEntry.cxx
    gdcmDict.cxx
    gdcmDictEntry.cxx
    gdcmDictGroupName.cxx
@@ -54,7 +55,7 @@ SET(libgdcm_la_SOURCES
    gdcmJpeg12.cxx
    gdcmJpeg16.cxx
    gdcmJpeg2000.cxx
-   #   gdcmMpeg.cxx
+   #gdcmMpeg.cxx
    gdcmOrientation.cxx
    gdcmPixelReadConvert.cxx
    gdcmPixelWriteConvert.cxx
@@ -76,8 +77,8 @@ TARGET_LINK_LIBRARIES(gdcm
   gdcmjpeg8 
   gdcmjpeg12
   gdcmjpeg16
-  #  gdcmmpeg2
-  gdcmjasper
+  #gdcmmpeg2
+  gdcmopenjpeg
 )
 IF(WIN32)
   IF(NOT BORLAND)