X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FCMakeLists.txt;h=f8848c8c88a647f3dafa998e650d85bdd2b15e70;hb=d3710448e1a6c462d762a10b9f02ca051bf090e3;hp=97b8086ffa129b6882a74f081fa06e1b3441fecd;hpb=83fb7ba2632adcb140889c5f71da6ccd53ecffa2;p=gdcm.git

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 97b8086f..f8848c8c 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -6,6 +6,7 @@ SUBDIRS(jpeg)
 INCLUDE_DIRECTORIES(
   ${GDCM_SOURCE_DIR}/jpeg/libijg8
   #${GDCM_SOURCE_DIR}/jpeg/libijg12 #all files have been renamed, appending 12
+  #${GDCM_SOURCE_DIR}/jpeg/ljpg     # JPEG lib from xmedcom 
 )
 
 SET(libgdcm_la_SOURCES
@@ -27,7 +28,6 @@ SET(libgdcm_la_SOURCES
 	gdcmJpeg2000.cxx
 	gdcmRLE.cxx
 	gdcmParse.cxx
-	gdcmJpegIdo.cxx
 )
 #-----------------------------------------------------------------------------
 # Why one should not use ADD_DEFINITIONS
@@ -49,16 +49,18 @@ IF(UNIX)
   TARGET_LINK_LIBRARIES(gdcm 
     gdcmijpeg8 
     gdcmijpeg12
+    gdcmjpeg     # JPEG lib from xmedcom 
   )
 ELSE(UNIX)
   TARGET_LINK_LIBRARIES(gdcm 
     gdcmijpeg8 
     gdcmijpeg12
+    gdcmjpeg
     Wsock32.lib   #doesn't exist on cygwin
   )
 ENDIF(UNIX)
 
-#The following is not wroking because when a header file is not found it tries 
+#The following is not working because when a header file is not found it tries 
 #to find one in the binary dir
 #INSTALL_FILES(/include .h ${libgdcm_la_SOURCES})
 #INSTALL_FILES(/include FILES gdcmIdo.h iddcmjpeg.h)