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

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index af714e85..c3fd98ce 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(
@@ -27,6 +37,7 @@ SET(libgdcm_la_SOURCES
    gdcmDicomDirStudy.cxx
    gdcmDict.cxx
    gdcmDictEntry.cxx
+   gdcmDictGroupName.cxx
    gdcmDictSet.cxx
    gdcmDirList.cxx
    gdcmDocEntry.cxx
@@ -76,5 +87,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)