X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FCMakeLists.txt;h=84d3df6e89b7229fb7ea4247c5d9e5d9fb14486e;hb=1b14200990537794a9f66d43c89b030459237edc;hp=8b6b078f6c703829240e5d98641a486f93096064;hpb=fb3bc19d96ec0bf38de3a466208a891a799f4797;p=gdcm.git

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 8b6b078f..84d3df6e 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -2,14 +2,6 @@
 # Rebuild gdcm whenever a file starting with gdcm* is modified
 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
   #gdcmmpeg2
@@ -30,8 +22,7 @@ INCLUDE_DIRECTORIES(
 SET(libgdcm_la_SOURCES
    gdcmArgMgr.cxx
    gdcmBase.cxx
-   gdcmBinEntry.cxx
-   gdcmContentEntry.cxx
+   gdcmDataEntry.cxx
    gdcmDebug.cxx
    gdcmDicomDir.cxx
    gdcmDicomDirElement.cxx
@@ -73,13 +64,12 @@ SET(libgdcm_la_SOURCES
    gdcmSQItem.cxx
    gdcmTS.cxx
    gdcmUtil.cxx
-   gdcmValEntry.cxx   
    gdcmValidator.cxx
    gdcmVR.cxx
    ${GDCM_BINARY_DIR}/src/gdcmDefaultDicts.cxx
    )
 
-ADD_LIBRARY(gdcm ${libgdcm_la_SOURCES} )
+ADD_LIBRARY(gdcm ${libgdcm_la_SOURCES})
 TARGET_LINK_LIBRARIES(gdcm 
   gdcmjpeg8 
   gdcmjpeg12