X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FCMakeLists.txt;h=6a271f7995796bb2bdceafaaca2a7447425026d9;hb=44f77c590dae9d3ba7da64eb30e0236a019020a8;hp=ef844c44e65c7553436cfa8385400fc3124c0824;hpb=3a9e9df62b3198c4f93d1768074b6be828ac7308;p=gdcm.git diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index ef844c44..6a271f79 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -3,16 +3,32 @@ 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 + gdcmjasper + gdcmjpegls + ) # "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}/src #for gdcmjpeg 8, 12 and 16 + ${GDCM_BINARY_DIR}/src/gdcmjasper/src/libjasper/include + ${GDCM_SOURCE_DIR}/src/gdcmjasper/src/libjasper/include ) SET(libgdcm_la_SOURCES + gdcmArgMgr.cxx gdcmBase.cxx gdcmBinEntry.cxx gdcmContentEntry.cxx @@ -23,6 +39,7 @@ SET(libgdcm_la_SOURCES gdcmDicomDirMeta.cxx gdcmDicomDirObject.cxx gdcmDicomDirPatient.cxx + gdcmDicomDirVisit.cxx gdcmDicomDirSerie.cxx gdcmDicomDirStudy.cxx gdcmDict.cxx @@ -45,6 +62,7 @@ SET(libgdcm_la_SOURCES gdcmJpeg12.cxx gdcmJpeg16.cxx gdcmJpeg2000.cxx + # gdcmMpeg.cxx gdcmPixelReadConvert.cxx gdcmPixelWriteConvert.cxx gdcmRLEFrame.cxx @@ -55,6 +73,7 @@ SET(libgdcm_la_SOURCES gdcmTS.cxx gdcmUtil.cxx gdcmValEntry.cxx + gdcmValidator.cxx gdcmVR.cxx ${GDCM_BINARY_DIR}/src/gdcmDefaultDicts.cxx ) @@ -64,6 +83,8 @@ TARGET_LINK_LIBRARIES(gdcm gdcmjpeg8 gdcmjpeg12 gdcmjpeg16 + # gdcmmpeg2 + gdcmjasper ) IF(WIN32) IF(NOT BORLAND) @@ -77,5 +98,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)