* Remove useless constructor of gdcm::Document

[gdcm.git] / src / CMakeLists.txt

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 6a271f7995796bb2bdceafaaca2a7447425026d9..84d3df6e89b7229fb7ea4247c5d9e5d9fb14486e 100644 (file)
--- 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
@@ -21,7 +13,7 @@ SUBDIRS(
 INCLUDE_DIRECTORIES(
   ${GDCM_SOURCE_DIR}/src
   ${GDCM_SOURCE_DIR}/src/gdcmmpeg2/src/mpeg2dec
-  ${GDCM_BINARY_DIR}/ #for gdcmConfigure.h
+  ${GDCM_BINARY_DIR} #for gdcmConfigure.h
   ${GDCM_BINARY_DIR}/src #for gdcmjpeg 8, 12 and 16 
   ${GDCM_BINARY_DIR}/src/gdcmjasper/src/libjasper/include
   ${GDCM_SOURCE_DIR}/src/gdcmjasper/src/libjasper/include
@@ -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
@@ -63,6 +54,7 @@ SET(libgdcm_la_SOURCES
    gdcmJpeg16.cxx
    gdcmJpeg2000.cxx
    #   gdcmMpeg.cxx
+   gdcmOrientation.cxx
    gdcmPixelReadConvert.cxx
    gdcmPixelWriteConvert.cxx
    gdcmRLEFrame.cxx
@@ -72,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