ENH: Adding the subdir option commented out for now because of the tons of warnings

[gdcm.git] / src / CMakeLists.txt

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 20d433f4a22c67cc2c7a071dac96dc7ee255b3a2..6bbca0d25468f9d15f53c2d0ba873701816df291 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -12,8 +12,9 @@ IF (WIN32)
 ENDIF (WIN32)
 SUBDIRS(
   gdcmjpeg
-  gdcmmpeg2
+  #gdcmmpeg2
   gdcmjasper
+  #gdcmjpegls
   )
 
 # "jpeglib.h" is defined here:
@@ -22,6 +23,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 +60,7 @@ SET(libgdcm_la_SOURCES
    gdcmJpeg12.cxx
    gdcmJpeg16.cxx
    gdcmJpeg2000.cxx
-   gdcmMpeg.cxx
+   #   gdcmMpeg.cxx
    gdcmPixelReadConvert.cxx
    gdcmPixelWriteConvert.cxx
    gdcmRLEFrame.cxx
@@ -77,7 +80,7 @@ TARGET_LINK_LIBRARIES(gdcm
   gdcmjpeg8 
   gdcmjpeg12
   gdcmjpeg16
-  gdcmmpeg2
+  #  gdcmmpeg2
   gdcmjasper
 )
 IF(WIN32)