X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FCMakeLists.txt;h=b989b979923c2c5f3991891acfe6d22e858f4d38;hb=6341da2794180b415f64bba60fe66ea676a9de4e;hp=57a810889cceb7d32e38b86694e890cf67b7078c;hpb=6474eb43314673bb16c021c1af05e26c31403e50;p=gdcm.git

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 57a81088..b989b979 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -3,7 +3,17 @@
 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
+  )
 
 # "jpeglib.h" is defined here:
 INCLUDE_DIRECTORIES(
@@ -15,6 +25,7 @@ INCLUDE_DIRECTORIES(
 SET(libgdcm_la_SOURCES
    gdcmBase.cxx
    gdcmBinEntry.cxx
+   gdcmContentEntry.cxx
    gdcmDebug.cxx
    gdcmDicomDir.cxx
    gdcmDicomDirElement.cxx
@@ -26,6 +37,7 @@ SET(libgdcm_la_SOURCES
    gdcmDicomDirStudy.cxx
    gdcmDict.cxx
    gdcmDictEntry.cxx
+   gdcmDictGroupName.cxx
    gdcmDictSet.cxx
    gdcmDirList.cxx
    gdcmDocEntry.cxx
@@ -34,9 +46,9 @@ SET(libgdcm_la_SOURCES
    gdcmDocument.cxx
    gdcmElementSet.cxx
    gdcmException.cxx
-   gdcmFile.cxx
+   gdcmFileHelper.cxx
    gdcmGlobal.cxx
-   gdcmHeader.cxx
+   gdcmFile.cxx
    gdcmJPEGFragment.cxx
    gdcmJPEGFragmentsInfo.cxx
    gdcmJpeg8.cxx
@@ -48,7 +60,7 @@ SET(libgdcm_la_SOURCES
    gdcmRLEFrame.cxx
    gdcmRLEFramesInfo.cxx
    gdcmSeqEntry.cxx
-   gdcmSerieHeader.cxx
+   gdcmSerieHelper.cxx
    gdcmSQItem.cxx
    gdcmTS.cxx
    gdcmUtil.cxx
@@ -65,21 +77,15 @@ TARGET_LINK_LIBRARIES(gdcm
 )
 IF(WIN32)
   IF(NOT BORLAND)
-    TARGET_LINK_LIBRARIES(gdcm Wsock32 Snmpapi)
+    TARGET_LINK_LIBRARIES(gdcm wsock32 snmpapi)
   ENDIF(NOT BORLAND)
 ENDIF(WIN32)
 
-#Need additional library for the MacAddress code in gdcmUtil.cxx
-IF(APPLE)
-  TARGET_LINK_LIBRARIES(gdcm "-framework IOKit" "-framework CoreFoundation")
-ENDIF(APPLE)
-
-# Need nsl to resolve gethostbyname on SunOS-5.8 CC
+# Need nsl to resolve gethostbyname on SunOS-5.8
+# and socket also
 IF(CMAKE_SYSTEM MATCHES "SunOS.*")
-  IF(NOT CMAKE_COMPILER_IS_GNUCXX)
-    TARGET_LINK_LIBRARIES(gdcm nsl)
-  ENDIF(NOT CMAKE_COMPILER_IS_GNUCXX)
+  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)