# 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
- gdcmjasper
gdcmjpegls
+ gdcmopenjpeg
)
# "jpeglib.h" is defined here:
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
+ ${GDCM_SOURCE_DIR}/src/gdcmopenjpeg/libopenjpeg
)
SET(libgdcm_la_SOURCES
gdcmArgMgr.cxx
gdcmBase.cxx
- gdcmBinEntry.cxx
- gdcmContentEntry.cxx
+ gdcmDataEntry.cxx
gdcmDebug.cxx
gdcmDicomDir.cxx
gdcmDicomDirElement.cxx
gdcmDicomDirVisit.cxx
gdcmDicomDirSerie.cxx
gdcmDicomDirStudy.cxx
+ gdcmDicomEntry.cxx
gdcmDict.cxx
gdcmDictEntry.cxx
gdcmDictGroupName.cxx
gdcmDocument.cxx
gdcmElementSet.cxx
gdcmException.cxx
+ gdcmFile.cxx
gdcmFileHelper.cxx
gdcmGlobal.cxx
- gdcmFile.cxx
gdcmJPEGFragment.cxx
gdcmJPEGFragmentsInfo.cxx
gdcmJpeg8.cxx
gdcmJpeg16.cxx
gdcmJpeg2000.cxx
# gdcmMpeg.cxx
+ gdcmOrientation.cxx
gdcmPixelReadConvert.cxx
gdcmPixelWriteConvert.cxx
+ gdcmRefCounter.cxx
gdcmRLEFrame.cxx
gdcmRLEFramesInfo.cxx
gdcmSeqEntry.cxx
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
gdcmjpeg16
# gdcmmpeg2
- gdcmjasper
+ gdcmopenjpeg
)
IF(WIN32)
IF(NOT BORLAND)