X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=src%2FCMakeLists.txt;h=67156e45de6f97065c4c5ae683f0725c9fd639fa;hb=de5fc413dc579fc61f7e04397efd1dc1087fe3cf;hp=fff6249448f2318d9754fca3fb0636fb20d3ae5f;hpb=b4750ec0ee79bf5d2456cea586516dc9f1bd8413;p=gdcm.git

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index fff62494..67156e45 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -3,6 +3,13 @@
 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)
 
 # "jpeglib.h" is defined here:
@@ -15,6 +22,7 @@ INCLUDE_DIRECTORIES(
 SET(libgdcm_la_SOURCES
    gdcmBase.cxx
    gdcmBinEntry.cxx
+   gdcmContentEntry.cxx
    gdcmDebug.cxx
    gdcmDicomDir.cxx
    gdcmDicomDirElement.cxx
@@ -26,6 +34,7 @@ SET(libgdcm_la_SOURCES
    gdcmDicomDirStudy.cxx
    gdcmDict.cxx
    gdcmDictEntry.cxx
+   gdcmDictGroupName.cxx
    gdcmDictSet.cxx
    gdcmDirList.cxx
    gdcmDocEntry.cxx
@@ -34,9 +43,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 +57,7 @@ SET(libgdcm_la_SOURCES
    gdcmRLEFrame.cxx
    gdcmRLEFramesInfo.cxx
    gdcmSeqEntry.cxx
-   gdcmSerieHeader.cxx
+   gdcmSerieHelper.cxx
    gdcmSQItem.cxx
    gdcmTS.cxx
    gdcmUtil.cxx
@@ -65,13 +74,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)
 
-#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 "\\.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_FILES(/include "\\.h$")
 INSTALL_TARGETS(/lib/ gdcm)