X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FCMakeLists.txt;h=6d49beb27c8105338478d21572389c75f02e3d77;hb=45445e6cca75418b05b42dffd8a313237f112539;hp=20d433f4a22c67cc2c7a071dac96dc7ee255b3a2;hpb=2329c3cbf7cc86aa2c8410756927f0dcf3941441;p=gdcm.git

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 20d433f4..6d49beb2 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -12,7 +12,7 @@ IF (WIN32)
 ENDIF (WIN32)
 SUBDIRS(
   gdcmjpeg
-  gdcmmpeg2
+  #gdcmmpeg2
   gdcmjasper
   )
 
@@ -22,6 +22,8 @@ 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
 )
 
 SET(libgdcm_la_SOURCES
@@ -57,7 +59,7 @@ SET(libgdcm_la_SOURCES
    gdcmJpeg12.cxx
    gdcmJpeg16.cxx
    gdcmJpeg2000.cxx
-   gdcmMpeg.cxx
+   #   gdcmMpeg.cxx
    gdcmPixelReadConvert.cxx
    gdcmPixelWriteConvert.cxx
    gdcmRLEFrame.cxx
@@ -77,7 +79,7 @@ TARGET_LINK_LIBRARIES(gdcm
   gdcmjpeg8 
   gdcmjpeg12
   gdcmjpeg16
-  gdcmmpeg2
+  #  gdcmmpeg2
   gdcmjasper
 )
 IF(WIN32)