X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FCMakeLists.txt;h=66af57a44d183ab0442725a33e803341879ff036;hb=97945d8b11b86924800fe1d78dcbf8a54be75927;hp=bd4a11bac59e38e562cbea2158df1807b6bb82ba;hpb=5379c1db8387b8f8625b4fa02df82d243ea9471d;p=gdcm.git

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index bd4a11ba..66af57a4 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -2,31 +2,25 @@
 # Rebuild gdcm whenever a file starting with gdcm* is modified
 INCLUDE_REGULAR_EXPRESSION("^gdcm.*$")
 
-# Build jpeg lib first:
-IF (WIN32)
-  IF (BUILD_SHARED_LIBS)
-    ADD_DEFINITIONS(-DJPEGDLL)
-  ELSE (BUILD_SHARED_LIBS)
-    ADD_DEFINITIONS(-DJPEGSTATIC)
-  ENDIF (BUILD_SHARED_LIBS)
-ENDIF (WIN32)
 SUBDIRS(
   gdcmjpeg
-  #  gdcmmpeg2
-  #  gdcmjasper
+  #gdcmmpeg2
+  gdcmjasper
+  gdcmjpegls
   )
 
 # "jpeglib.h" is defined here:
 INCLUDE_DIRECTORIES(
   ${GDCM_SOURCE_DIR}/src
   ${GDCM_SOURCE_DIR}/src/gdcmmpeg2/src/mpeg2dec
-  ${GDCM_BINARY_DIR}/ #for gdcmConfigure.h
+  ${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
+   gdcmArgMgr.cxx
    gdcmBase.cxx
    gdcmBinEntry.cxx
    gdcmContentEntry.cxx
@@ -37,6 +31,7 @@ SET(libgdcm_la_SOURCES
    gdcmDicomDirMeta.cxx
    gdcmDicomDirObject.cxx
    gdcmDicomDirPatient.cxx
+   gdcmDicomDirVisit.cxx
    gdcmDicomDirSerie.cxx
    gdcmDicomDirStudy.cxx
    gdcmDict.cxx
@@ -58,8 +53,9 @@ SET(libgdcm_la_SOURCES
    gdcmJpeg8.cxx
    gdcmJpeg12.cxx
    gdcmJpeg16.cxx
-   #   gdcmJpeg2000.cxx
+   gdcmJpeg2000.cxx
    #   gdcmMpeg.cxx
+   gdcmOrientation.cxx
    gdcmPixelReadConvert.cxx
    gdcmPixelWriteConvert.cxx
    gdcmRLEFrame.cxx
@@ -70,17 +66,18 @@ SET(libgdcm_la_SOURCES
    gdcmTS.cxx
    gdcmUtil.cxx
    gdcmValEntry.cxx   
+   gdcmValidator.cxx
    gdcmVR.cxx
    ${GDCM_BINARY_DIR}/src/gdcmDefaultDicts.cxx
    )
 
-ADD_LIBRARY(gdcm ${libgdcm_la_SOURCES} )
+ADD_LIBRARY(gdcm ${libgdcm_la_SOURCES})
 TARGET_LINK_LIBRARIES(gdcm 
   gdcmjpeg8 
   gdcmjpeg12
   gdcmjpeg16
   #  gdcmmpeg2
-  #  gdcmjasper
+  gdcmjasper
 )
 IF(WIN32)
   IF(NOT BORLAND)