From: malaterre <malaterre>
Date: Tue, 7 Jun 2005 19:04:38 +0000 (+0000)
Subject: ENH: Properly link jasper against (default) jpeg 8bits lossy.
X-Git-Tag: Version1.2.bp~584
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=89fb0d91460d40fb4072f83ce35c2002789f8091;p=gdcm.git

ENH: Properly link jasper against (default) jpeg 8bits lossy.
---

diff --git a/src/gdcmjasper/src/libjasper/CMakeLists.txt b/src/gdcmjasper/src/libjasper/CMakeLists.txt
index b775406a..3d1ccf43 100644
--- a/src/gdcmjasper/src/libjasper/CMakeLists.txt
+++ b/src/gdcmjasper/src/libjasper/CMakeLists.txt
@@ -29,9 +29,14 @@ MACRO(GDCM_CONVENIENT_LIBRARY)
   ENDFOREACH(SUBDIR)
 ENDMACRO(GDCM_CONVENIENT_LIBRARY)
 
+# Yeah ! I know how come I only did jpeg 8bits... bla bla
+# I'll wait until I actually such beast of jpeg2000 + some
+# crazy 16bits lossless jpeg...
+INCLUDE_DIRECTORIES(${GDCM_BINARY_DIR}/src/gdcmjpeg/8)
 GDCM_CONVENIENT_LIBRARY(base bmp jp2 jpc jpg mif pgx pnm ras) 
 
 #MESSAGE("src= ${GDCMJASPER_SOURCES}")
 ADD_LIBRARY(gdcmjasper ${GDCMJASPER_SOURCES})
+TARGET_LINK_LIBRARIES(gdcmjasper gdcmjpeg8)
 
 
diff --git a/src/gdcmjasper/src/libjasper/jpg/CMakeLists.txt b/src/gdcmjasper/src/libjasper/jpg/CMakeLists.txt
index bc6c0e85..c3ee20b7 100644
--- a/src/gdcmjasper/src/libjasper/jpg/CMakeLists.txt
+++ b/src/gdcmjasper/src/libjasper/jpg/CMakeLists.txt
@@ -19,9 +19,9 @@ SET(libjpg_la_SOURCES
   jpg_val.c
   #  )
   #SET(EXTRA_libjpg_la_SOURCES
-  #  jpg_dec.c
-  #  jpg_enc.c
-  jpg_dummy.c
+  jpg_dec.c
+  jpg_enc.c
+  #jpg_dummy.c
   )
 
 #ADD_LIBRARY(jpg ${libjpg_la_SOURCES} ${EXTRA_libjpg_la_SOURCES})