X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FCMakeLists.txt;h=e6c9907c3cdd345d5dec5558004fa5ff938b327d;hb=f8b873378e1f3f9eb7c28c797e67fce574003a8e;hp=6bbca0d25468f9d15f53c2d0ba873701816df291;hpb=b210d595b2f550c43faf9b65d7102e5aa15fe8cd;p=gdcm.git diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 6bbca0d2..e6c9907c 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: @@ -72,6 +72,7 @@ SET(libgdcm_la_SOURCES gdcmUtil.cxx gdcmValEntry.cxx gdcmVR.cxx + gdcmArgMgr.cxx ${GDCM_BINARY_DIR}/src/gdcmDefaultDicts.cxx )