*ENH: Turn it into DOS file type to match libgdcmijpeg8.dsp file type

[gdcm.git] / src / CMakeLists.txt

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