X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FCMakeLists.txt;h=67156e45de6f97065c4c5ae683f0725c9fd639fa;hb=985954a7af00b467b183bb3f5db9dc11f89fcaf5;hp=69c3e2f8ded8410dbc615ffba8f9a1b3ef291a7d;hpb=bbfa3cf89fc2ede7c43259e945f021044b56069f;p=gdcm.git

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 69c3e2f8..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:
@@ -27,6 +34,7 @@ SET(libgdcm_la_SOURCES
    gdcmDicomDirStudy.cxx
    gdcmDict.cxx
    gdcmDictEntry.cxx
+   gdcmDictGroupName.cxx
    gdcmDictSet.cxx
    gdcmDirList.cxx
    gdcmDocEntry.cxx
@@ -66,7 +74,7 @@ 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)