X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=src%2Fgdcmjasper%2Fsrc%2Flibjasper%2FCMakeLists.txt;h=3d1ccf43f963df8148544c2107cb442fff762204;hb=87ac02b456a9c2044b3eab23aa5d9e8dbfd12f29;hp=dd23f7276ae4f676af7ef7330c8dfc557c18a36b;hpb=9cf7f445f68828d6c529692c69aacf90ba1a0403;p=gdcm.git

diff --git a/src/gdcmjasper/src/libjasper/CMakeLists.txt b/src/gdcmjasper/src/libjasper/CMakeLists.txt
index dd23f727..3d1ccf43 100644
--- a/src/gdcmjasper/src/libjasper/CMakeLists.txt
+++ b/src/gdcmjasper/src/libjasper/CMakeLists.txt
@@ -1,24 +1,42 @@
 
-SUBDIRS(base
-  bmp
-  include/jasper
-  jp2  
-  jpc  
-  jpg  
-  mif  
-  pgx  
-  pnm  
-  ras
-  )
+# Convenient library are not portable (at least does not work on Win32). 
+# Therefore instead of doing a SUBDIRS, let's do an INCLUDE of the subdirs
+# and build the global library here...
+SUBDIRS(include/jasper) # This is one can stay here
+
+MACRO(GDCM_CONVENIENT_LIBRARY)
+  #MESSAGE("ARGC=${ARGC}")
+  #MESSAGE("ARGV=${ARGV}")
+  SET(GDCMJASPER_SOURCES)
+  FOREACH(SUBDIR ${ARGV})
+    INCLUDE("${GDCMJASPER_SOURCE_DIR}/src/libjasper/${SUBDIR}/CMakeLists.txt")
+    #MESSAGE("FILES=${lib${SUBDIR}_la_SOURCES}")
+    #SET(convenient_lib${SUBDIR}_la_SOURCES)
+    FOREACH(file ${lib${SUBDIR}_la_SOURCES})
+      #MESSAGE("${SUBDIR}/${file}")
+      #MESSAGE("BAR ${convenient_lib${SUBDIR}_la_SOURCES}")
+      #MESSAGE("${GDCMJASPER_SOURCE_DIR}/src/libjasper/${SUBDIR}/${file}")
+      #SET(convenient_lib${SUBDIR}_la_SOURCES
+      #  "${GDCMJASPER_SOURCE_DIR}/src/libjasper/${SUBDIR}/${file}"
+      #  "${convenient_lib${SUBDIR}_la_SOURCES}"
+      #  )
+      SET(GDCMJASPER_SOURCES
+        ${GDCMJASPER_SOURCE_DIR}/src/libjasper/${SUBDIR}/${file}
+        ${GDCMJASPER_SOURCES}
+        )
+    ENDFOREACH(file)
+    #MESSAGE("R= ${convenient_lib${SUBDIR}_la_SOURCES}")
+  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)
+
 
-ADD_LIBRARY(gdcmjasper)
-TARGET_LINK_LIBRARIES(gdcmjasper
-  base
-  bmp
-  jp2
-  jpc
-  jpg
-  mif
-  pgx
-  pnm
-  ras)