X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FCMakeLists.txt;h=428c38986e10631ebc319012f52ca336748874d9;hb=998aa4a03f2f7e299226e84fbc7c0c02143f863e;hp=bc7a730a7dc29a530e85d72aad7dc686f7b94590;hpb=67845c7dc1241480f5c5fcfa0cfc2e86918dad1e;p=gdcm.git

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index bc7a730a..428c3898 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,17 +1,36 @@
 #-----------------------------------------------------------------------------
+# Rebuild gdcm whenever a file starting with gdcm* is modified
+INCLUDE_REGULAR_EXPRESSION("^gdcm.*$")
+
 # Build jpeg lib first:
-SUBDIRS(jpeg)
+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}/
+  ${GDCM_SOURCE_DIR}/src
+  ${GDCM_SOURCE_DIR}/src/gdcmmpeg2/src/mpeg2dec
   ${GDCM_BINARY_DIR}/ #for gdcmConfigure.h
-#  ${GDCM_BINARY_DIR}/src/jpeg/libijg8  #created a build time
-#  ${GDCM_BINARY_DIR}/src/jpeg/libijg12 #created a build time
+  ${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
+   gdcmBase.cxx
    gdcmBinEntry.cxx
+   gdcmContentEntry.cxx
    gdcmDebug.cxx
    gdcmDicomDir.cxx
    gdcmDicomDirElement.cxx
@@ -23,51 +42,59 @@ SET(libgdcm_la_SOURCES
    gdcmDicomDirStudy.cxx
    gdcmDict.cxx
    gdcmDictEntry.cxx
+   gdcmDictGroupName.cxx
    gdcmDictSet.cxx
    gdcmDirList.cxx
    gdcmDocEntry.cxx
+   gdcmDocEntryArchive.cxx
    gdcmDocEntrySet.cxx
    gdcmDocument.cxx
    gdcmElementSet.cxx
    gdcmException.cxx
-   gdcmFile.cxx
+   gdcmFileHelper.cxx
    gdcmGlobal.cxx
-   gdcmHeader.cxx
-   gdcmHeaderHelper.cxx
+   gdcmFile.cxx
+   gdcmJPEGFragment.cxx
+   gdcmJPEGFragmentsInfo.cxx
    gdcmJpeg8.cxx
    gdcmJpeg12.cxx
+   gdcmJpeg16.cxx
    gdcmJpeg2000.cxx
-   gdcmParsePixels.cxx
-   gdcmPixelConvert.cxx
+   #   gdcmMpeg.cxx
+   gdcmPixelReadConvert.cxx
+   gdcmPixelWriteConvert.cxx
+   gdcmRLEFrame.cxx
    gdcmRLEFramesInfo.cxx
    gdcmSeqEntry.cxx
+   gdcmSerieHelper.cxx
    gdcmSQItem.cxx
    gdcmTS.cxx
    gdcmUtil.cxx
    gdcmValEntry.cxx   
    gdcmVR.cxx
+   gdcmArgMgr.cxx
+   ${GDCM_BINARY_DIR}/src/gdcmDefaultDicts.cxx
    )
 
 ADD_LIBRARY(gdcm ${libgdcm_la_SOURCES} )
-IF(UNIX)
-  TARGET_LINK_LIBRARIES(gdcm 
-    gdcmijpeg8 
-    gdcmijpeg12
-    gdcmljpeg     # JPEG lib from xmedcom 
-  )
-ELSE(UNIX)
-  TARGET_LINK_LIBRARIES(gdcm 
-    gdcmijpeg8 
-    gdcmijpeg12
-    gdcmljpeg
-    Wsock32.lib   #doesn't exist on cygwin
-  )
-ENDIF(UNIX)
+TARGET_LINK_LIBRARIES(gdcm 
+  gdcmjpeg8 
+  gdcmjpeg12
+  gdcmjpeg16
+  #  gdcmmpeg2
+  gdcmjasper
+)
+IF(WIN32)
+  IF(NOT BORLAND)
+    TARGET_LINK_LIBRARIES(gdcm wsock32 snmpapi)
+  ENDIF(NOT BORLAND)
+ENDIF(WIN32)
 
-#The following is not working because when a header file is not found it tries 
-#to find one in the binary dir
-#INSTALL_FILES(/include .h ${libgdcm_la_SOURCES})
-#INSTALL_FILES(/include FILES gdcmIdo.h iddcmjpeg.h)
-INSTALL_FILES(/include "\\.h$")
+# Need nsl to resolve gethostbyname on SunOS-5.8
+# and socket also
+IF(CMAKE_SYSTEM MATCHES "SunOS.*")
+  TARGET_LINK_LIBRARIES(gdcm socket nsl)
+ENDIF(CMAKE_SYSTEM MATCHES "SunOS.*")
 
-INSTALL_TARGETS(/lib/ gdcm)
+INSTALL_FILES(/include/gdcm "\\.h$")
+INSTALL_TARGETS(/lib/gdcm/ gdcm)