X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=src%2FCMakeLists.txt;h=f13d7f09ac7968fb3ec1cb8b98489f38064d3ad4;hb=fec6b180f2002f8fbeb80edeee57511c0b33a0d0;hp=428c38986e10631ebc319012f52ca336748874d9;hpb=d660de8252252f981699115eac611a8ec0b3ad5f;p=gdcm.git diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 428c3898..f13d7f09 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -3,18 +3,18 @@ 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) +#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 + gdcmjpegls ) # "jpeglib.h" is defined here: @@ -28,6 +28,7 @@ INCLUDE_DIRECTORIES( ) SET(libgdcm_la_SOURCES + gdcmArgMgr.cxx gdcmBase.cxx gdcmBinEntry.cxx gdcmContentEntry.cxx @@ -71,8 +72,8 @@ SET(libgdcm_la_SOURCES gdcmTS.cxx gdcmUtil.cxx gdcmValEntry.cxx + gdcmValidator.cxx gdcmVR.cxx - gdcmArgMgr.cxx ${GDCM_BINARY_DIR}/src/gdcmDefaultDicts.cxx )