X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2Fgdcmjasper%2Fsrc%2Flibjasper%2Fjpg%2FCMakeLists.txt;h=b96f0a38c3b2c7a005337187fd4102533a2231b0;hb=1b14200990537794a9f66d43c89b030459237edc;hp=77ac4bfeb08972eefeebaaa8153f262025d9a116;hpb=b384f98908abe0173cad0745c34b7d8cf2cdd715;p=gdcm.git

diff --git a/src/gdcmjasper/src/libjasper/jpg/CMakeLists.txt b/src/gdcmjasper/src/libjasper/jpg/CMakeLists.txt
index 77ac4bfe..b96f0a38 100644
--- a/src/gdcmjasper/src/libjasper/jpg/CMakeLists.txt
+++ b/src/gdcmjasper/src/libjasper/jpg/CMakeLists.txt
@@ -1,26 +1,21 @@
-# all the include are there:
-#INCLUDE_DIRECTORIES(${JASPER_SOURCE_DIR}/src/libjasper/include)
+INCLUDE_REGULAR_EXPRESSION("^.*$")
 
 #EXTRA_DIST = README
 
-#if HAVE_LIBJPEG
-#MISCSOURCES = jpg_dec.c jpg_enc.c
-#else
-#MISCSOURCES = jpg_dummy.c
-#endif
+IF(HAVE_LIBJPEG)
+  SET(MISCSOURCES
+    jpg_dec.c
+    jpg_enc.c)
+ELSE(HAVE_LIBJPEG)
+  SET(MISCSOURCES
+    jpg_dummy.c)
+ENDIF(HAVE_LIBJPEG)
 
 SET(libjpg_la_SOURCES
   #  jpg_cod.h
   #  jpg_enc.h
   #  jpg_jpeglib.h
-  #  $(MISCSOURCES)
   jpg_val.c
-  #  )
-  #SET(EXTRA_libjpg_la_SOURCES
-  #  jpg_dec.c
-  #  jpg_enc.c
-  jpg_dummy.c
+  ${MISCSOURCES}
   )
 
-#ADD_LIBRARY(jpg ${libjpg_la_SOURCES} ${EXTRA_libjpg_la_SOURCES})
-