X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=src%2FCMakeLists.txt;h=f8848c8c88a647f3dafa998e650d85bdd2b15e70;hb=4c9f7341da74192d6a293a0b04ebda4ce5211996;hp=a2afadc264a9890819548f1d7c570fa758f7f301;hpb=63f579ada04b47069e977c900e89b433e1aae95b;p=gdcm.git

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a2afadc2..f8848c8c 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -2,8 +2,11 @@
 # Build jpeg lib first:
 SUBDIRS(jpeg)
 
+# "jpeglib.h" is defined here:
 INCLUDE_DIRECTORIES(
-  ${GDCM_SOURCE_DIR}/jpeg/
+  ${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
@@ -25,7 +28,6 @@ SET(libgdcm_la_SOURCES
 	gdcmJpeg2000.cxx
 	gdcmRLE.cxx
 	gdcmParse.cxx
-	gdcmJpegIdo.cxx
 )
 #-----------------------------------------------------------------------------
 # Why one should not use ADD_DEFINITIONS
@@ -38,7 +40,7 @@ SET(libgdcm_la_SOURCES
 
 SET_SOURCE_FILES_PROPERTIES(${libgdcm_la_SOURCES}
   PROPERTIES
-  COMPILE_FLAGS "-D__STDC_LIMIT_MACROS -DPUB_DICT_PATH=\\\"${CMAKE_INSTALL_PREFIX}${GDCM_DATA_DIR}\\\""
+  COMPILE_FLAGS "-D__STDC_LIMIT_MACROS  -DPUB_DICT_PATH=\\\"${CMAKE_INSTALL_PREFIX}${GDCM_DATA_DIR}\\\""
 )
 
 ADD_LIBRARY(gdcm ${libgdcm_la_SOURCES} )
@@ -47,19 +49,22 @@ 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)
 INSTALL_FILES(/include "\\.h$")
 
-INSTALL_TARGETS(/lib/ gdcm)
\ No newline at end of file
+INSTALL_TARGETS(/lib/ gdcm)
+#INSTALL_FILES(/include/vtk .h ${Kit_SRCS})
\ No newline at end of file