X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FCMakeLists.txt;h=f13d7f09ac7968fb3ec1cb8b98489f38064d3ad4;hb=6516a88a1e363868706f0fb443fbc7ad9641a9b9;hp=6d49beb27c8105338478d21572389c75f02e3d77;hpb=8709cb41d6f450b58bd94eee2f00a8e5dea29581;p=gdcm.git

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 6d49beb2..f13d7f09 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -3,17 +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
   )
 
 # "jpeglib.h" is defined here:
@@ -27,6 +28,7 @@ INCLUDE_DIRECTORIES(
 )
 
 SET(libgdcm_la_SOURCES
+   gdcmArgMgr.cxx
    gdcmBase.cxx
    gdcmBinEntry.cxx
    gdcmContentEntry.cxx
@@ -70,6 +72,7 @@ SET(libgdcm_la_SOURCES
    gdcmTS.cxx
    gdcmUtil.cxx
    gdcmValEntry.cxx   
+   gdcmValidator.cxx
    gdcmVR.cxx
    ${GDCM_BINARY_DIR}/src/gdcmDefaultDicts.cxx
    )