X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FCMakeLists.txt;h=e6c9907c3cdd345d5dec5558004fa5ff938b327d;hb=150a817f80ca315498073d4fae9ff0adda3643df;hp=af714e85cca162c3b4f73f10e192856968693eb7;hpb=bfc89bbbac631c3271dd5b628610b06d30845f41;p=gdcm.git

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index af714e85..e6c9907c 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -3,13 +3,28 @@
 INCLUDE_REGULAR_EXPRESSION("^gdcm.*$")
 
 # Build jpeg lib first:
-SUBDIRS(gdcmjpeg)
+#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
+  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}/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
@@ -27,6 +42,7 @@ SET(libgdcm_la_SOURCES
    gdcmDicomDirStudy.cxx
    gdcmDict.cxx
    gdcmDictEntry.cxx
+   gdcmDictGroupName.cxx
    gdcmDictSet.cxx
    gdcmDirList.cxx
    gdcmDocEntry.cxx
@@ -44,6 +60,7 @@ SET(libgdcm_la_SOURCES
    gdcmJpeg12.cxx
    gdcmJpeg16.cxx
    gdcmJpeg2000.cxx
+   #   gdcmMpeg.cxx
    gdcmPixelReadConvert.cxx
    gdcmPixelWriteConvert.cxx
    gdcmRLEFrame.cxx
@@ -55,6 +72,7 @@ SET(libgdcm_la_SOURCES
    gdcmUtil.cxx
    gdcmValEntry.cxx   
    gdcmVR.cxx
+   gdcmArgMgr.cxx
    ${GDCM_BINARY_DIR}/src/gdcmDefaultDicts.cxx
    )
 
@@ -63,6 +81,8 @@ TARGET_LINK_LIBRARIES(gdcm
   gdcmjpeg8 
   gdcmjpeg12
   gdcmjpeg16
+  #  gdcmmpeg2
+  gdcmjasper
 )
 IF(WIN32)
   IF(NOT BORLAND)
@@ -76,5 +96,5 @@ IF(CMAKE_SYSTEM MATCHES "SunOS.*")
   TARGET_LINK_LIBRARIES(gdcm socket nsl)
 ENDIF(CMAKE_SYSTEM MATCHES "SunOS.*")
 
-INSTALL_FILES(/include "\\.h$")
-INSTALL_TARGETS(/lib/ gdcm)
+INSTALL_FILES(/include/gdcm "\\.h$")
+INSTALL_TARGETS(/lib/gdcm/ gdcm)