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 b775406a1ded520d56257b25fd886956c5f64c35..3d1ccf43f963df8148544c2107cb442fff762204 100644 (file)
--- 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 bc6c0e8595f7c9ce9e6a29406de255f104593226..c3ee20b712fea455b406633ec1f5ccf48c5d9cf3 100644 (file)
--- 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})