#-----------------------------------------------------------------------------
# Build jpeg lib first:
-SUBDIRS(jpeg)
+SUBDIRS(gdcmjpeg)
# "jpeglib.h" is defined here:
INCLUDE_DIRECTORIES(
- ${GDCM_SOURCE_DIR}/
+ ${GDCM_SOURCE_DIR}/src
${GDCM_BINARY_DIR}/ #for gdcmConfigure.h
+ ${GDCM_BINARY_DIR}/src #for gdcmjpeg 8, 12 and 16
)
SET(libgdcm_la_SOURCES
gdcmDictSet.cxx
gdcmDirList.cxx
gdcmDocEntry.cxx
+ gdcmDocEntryArchive.cxx
gdcmDocEntrySet.cxx
gdcmDocument.cxx
gdcmElementSet.cxx
gdcmFile.cxx
gdcmGlobal.cxx
gdcmHeader.cxx
- gdcmHeaderHelper.cxx
gdcmJPEGFragment.cxx
gdcmJPEGFragmentsInfo.cxx
gdcmJpeg8.cxx
gdcmRLEFrame.cxx
gdcmRLEFramesInfo.cxx
gdcmSeqEntry.cxx
+ gdcmSerieHeader.cxx
gdcmSQItem.cxx
gdcmTS.cxx
gdcmUtil.cxx
gdcmValEntry.cxx
gdcmVR.cxx
+ ${GDCM_BINARY_DIR}/src/gdcmDefaultDicts.cxx
)
ADD_LIBRARY(gdcm ${libgdcm_la_SOURCES} )
-IF(UNIX)
- TARGET_LINK_LIBRARIES(gdcm
- gdcmijpeg8
- gdcmijpeg12
- gdcmijpeg16
- )
-ELSE(UNIX)
- TARGET_LINK_LIBRARIES(gdcm
- gdcmijpeg8
- gdcmijpeg12
- gdcmijpeg16
- Wsock32.lib #doesn't exist on cygwin
- )
-ENDIF(UNIX)
+TARGET_LINK_LIBRARIES(gdcm
+ gdcmjpeg8
+ gdcmjpeg12
+ gdcmjpeg16
+)
+IF(WIN32)
+ IF(NOT BORLAND)
+ TARGET_LINK_LIBRARIES(gdcm Wsock32)
+ ENDIF(NOT BORLAND)
+ENDIF(WIN32)
#The following is not working because when a header file is not found it tries
#to find one in the binary dir