ENH: Remove convenient library herited from jasper autotools, and replace by a more...

diff --git a/src/gdcmjasper/CMakeLists.txt b/src/gdcmjasper/CMakeLists.txt
index e7c2b92..e963377 100644 (file)
--- a/src/gdcmjasper/CMakeLists.txt
+++ b/src/gdcmjasper/CMakeLists.txt
@@ -1,3 +1,3 @@
-PROJECT(JASPER)
+PROJECT(GDCMJASPER C)
 
 SUBDIRS(src)

diff --git a/src/gdcmjasper/src/libjasper/CMakeLists.txt b/src/gdcmjasper/src/libjasper/CMakeLists.txt
index dd23f72..b775406 100644 (file)
--- a/src/gdcmjasper/src/libjasper/CMakeLists.txt
+++ b/src/gdcmjasper/src/libjasper/CMakeLists.txt
@@ -1,24 +1,37 @@
 
-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)
+
+GDCM_CONVENIENT_LIBRARY(base bmp jp2 jpc jpg mif pgx pnm ras) 
+
+#MESSAGE("src= ${GDCMJASPER_SOURCES}")
+ADD_LIBRARY(gdcmjasper ${GDCMJASPER_SOURCES})
+
 
-ADD_LIBRARY(gdcmjasper)
-TARGET_LINK_LIBRARIES(gdcmjasper
-  base
-  bmp
-  jp2
-  jpc
-  jpg
-  mif
-  pgx
-  pnm
-  ras)

diff --git a/src/gdcmjasper/src/libjasper/base/CMakeLists.txt b/src/gdcmjasper/src/libjasper/base/CMakeLists.txt
index 84b6b61..354a377 100644 (file)
--- a/src/gdcmjasper/src/libjasper/base/CMakeLists.txt
+++ b/src/gdcmjasper/src/libjasper/base/CMakeLists.txt
@@ -1,5 +1,5 @@
 # all the include are there:
-INCLUDE_DIRECTORIES(${JASPER_SOURCE_DIR}/src/libjasper/include)
+#INCLUDE_DIRECTORIES(${JASPER_SOURCE_DIR}/src/libjasper/include)
 
 SET(libbase_la_SOURCES
   jas_cm.c
@@ -16,4 +16,4 @@ SET(libbase_la_SOURCES
   jas_tvp.c
   jas_version.c
   )
-ADD_LIBRARY(base ${libbase_la_SOURCES} )
+#ADD_LIBRARY(base ${libbase_la_SOURCES} )

diff --git a/src/gdcmjasper/src/libjasper/bmp/CMakeLists.txt b/src/gdcmjasper/src/libjasper/bmp/CMakeLists.txt
index 93cc94a..8ad66f0 100644 (file)
--- a/src/gdcmjasper/src/libjasper/bmp/CMakeLists.txt
+++ b/src/gdcmjasper/src/libjasper/bmp/CMakeLists.txt
@@ -1,5 +1,5 @@
 # all the include are there:
-INCLUDE_DIRECTORIES(${JASPER_SOURCE_DIR}/src/libjasper/include)
+#INCLUDE_DIRECTORIES(${JASPER_SOURCE_DIR}/src/libjasper/include)
 
 SET(libbmp_la_SOURCES
   #  bmp_cod.h
@@ -9,4 +9,4 @@ SET(libbmp_la_SOURCES
   bmp_enc.c
   )
 
-ADD_LIBRARY(bmp ${libbmp_la_SOURCES})
+#ADD_LIBRARY(bmp ${libbmp_la_SOURCES})

diff --git a/src/gdcmjasper/src/libjasper/jp2/CMakeLists.txt b/src/gdcmjasper/src/libjasper/jp2/CMakeLists.txt
index 185e112..6317df4 100644 (file)
--- a/src/gdcmjasper/src/libjasper/jp2/CMakeLists.txt
+++ b/src/gdcmjasper/src/libjasper/jp2/CMakeLists.txt
@@ -1,5 +1,5 @@
 # all the include are there:
-INCLUDE_DIRECTORIES(${JASPER_SOURCE_DIR}/src/libjasper/include)
+#INCLUDE_DIRECTORIES(${JASPER_SOURCE_DIR}/src/libjasper/include)
 
 SET(libjp2_la_SOURCES
   #  jp2_cod.h
@@ -8,5 +8,5 @@ SET(libjp2_la_SOURCES
   jp2_dec.c
   jp2_enc.c
   )
-ADD_LIBRARY(jp2 ${libjp2_la_SOURCES})
+#ADD_LIBRARY(jp2 ${libjp2_la_SOURCES})
 

diff --git a/src/gdcmjasper/src/libjasper/jpc/CMakeLists.txt b/src/gdcmjasper/src/libjasper/jpc/CMakeLists.txt
index 34c04ae..57768c2 100644 (file)
--- a/src/gdcmjasper/src/libjasper/jpc/CMakeLists.txt
+++ b/src/gdcmjasper/src/libjasper/jpc/CMakeLists.txt
@@ -1,5 +1,5 @@
 # all the include are there:
-INCLUDE_DIRECTORIES(${JASPER_SOURCE_DIR}/src/libjasper/include)
+#INCLUDE_DIRECTORIES(${JASPER_SOURCE_DIR}/src/libjasper/include)
 
 SET(libjpc_la_SOURCES
   #  jpc_bs.h
@@ -45,4 +45,4 @@ SET(libjpc_la_SOURCES
   jpc_util.c
   )
 
-ADD_LIBRARY(jpc ${libjpc_la_SOURCES})
+#ADD_LIBRARY(jpc ${libjpc_la_SOURCES})

diff --git a/src/gdcmjasper/src/libjasper/jpg/CMakeLists.txt b/src/gdcmjasper/src/libjasper/jpg/CMakeLists.txt
index 971001c..77ac4bf 100644 (file)
--- a/src/gdcmjasper/src/libjasper/jpg/CMakeLists.txt
+++ b/src/gdcmjasper/src/libjasper/jpg/CMakeLists.txt
@@ -1,5 +1,5 @@
 # all the include are there:
-INCLUDE_DIRECTORIES(${JASPER_SOURCE_DIR}/src/libjasper/include)
+#INCLUDE_DIRECTORIES(${JASPER_SOURCE_DIR}/src/libjasper/include)
 
 #EXTRA_DIST = README
 
@@ -15,12 +15,12 @@ SET(libjpg_la_SOURCES
   #  jpg_jpeglib.h
   #  $(MISCSOURCES)
   jpg_val.c
-  )
-SET(EXTRA_libjpg_la_SOURCES
+  #  )
+  #SET(EXTRA_libjpg_la_SOURCES
   #  jpg_dec.c
   #  jpg_enc.c
   jpg_dummy.c
   )
 
-ADD_LIBRARY(jpg ${libjpg_la_SOURCES} ${EXTRA_libjpg_la_SOURCES})
+#ADD_LIBRARY(jpg ${libjpg_la_SOURCES} ${EXTRA_libjpg_la_SOURCES})
 

diff --git a/src/gdcmjasper/src/libjasper/mif/CMakeLists.txt b/src/gdcmjasper/src/libjasper/mif/CMakeLists.txt
index 5b5e1de..84effe4 100644 (file)
--- a/src/gdcmjasper/src/libjasper/mif/CMakeLists.txt
+++ b/src/gdcmjasper/src/libjasper/mif/CMakeLists.txt
@@ -1,5 +1,5 @@
 # all the include are there:
-INCLUDE_DIRECTORIES(${JASPER_SOURCE_DIR}/src/libjasper/include)
+#INCLUDE_DIRECTORIES(${JASPER_SOURCE_DIR}/src/libjasper/include)
 
 #EXTRA_DIST = README
 
@@ -8,4 +8,4 @@ SET(libmif_la_SOURCES
   mif_cod.c
   )
 
-ADD_LIBRARY(mif ${libmif_la_SOURCES})
+#ADD_LIBRARY(mif ${libmif_la_SOURCES})

diff --git a/src/gdcmjasper/src/libjasper/pgx/CMakeLists.txt b/src/gdcmjasper/src/libjasper/pgx/CMakeLists.txt
index a014d87..5f9d8e1 100644 (file)
--- a/src/gdcmjasper/src/libjasper/pgx/CMakeLists.txt
+++ b/src/gdcmjasper/src/libjasper/pgx/CMakeLists.txt
@@ -1,5 +1,5 @@
 # all the include are there:
-INCLUDE_DIRECTORIES(${JASPER_SOURCE_DIR}/src/libjasper/include)
+#INCLUDE_DIRECTORIES(${JASPER_SOURCE_DIR}/src/libjasper/include)
 
 SET(libpgx_la_SOURCES
   #  pgx_cod.h
@@ -9,4 +9,4 @@ SET(libpgx_la_SOURCES
   pgx_enc.c
   )
 
-ADD_LIBRARY(pgx ${libpgx_la_SOURCES})
+#ADD_LIBRARY(pgx ${libpgx_la_SOURCES})

diff --git a/src/gdcmjasper/src/libjasper/pnm/CMakeLists.txt b/src/gdcmjasper/src/libjasper/pnm/CMakeLists.txt
index 8125236..02035eb 100644 (file)
--- a/src/gdcmjasper/src/libjasper/pnm/CMakeLists.txt
+++ b/src/gdcmjasper/src/libjasper/pnm/CMakeLists.txt
@@ -1,5 +1,5 @@
 # all the include are there:
-INCLUDE_DIRECTORIES(${JASPER_SOURCE_DIR}/src/libjasper/include)
+#INCLUDE_DIRECTORIES(${JASPER_SOURCE_DIR}/src/libjasper/include)
 
 SET(libpnm_la_SOURCES
   #  pnm_cod.h
@@ -9,4 +9,4 @@ SET(libpnm_la_SOURCES
   pnm_enc.c
   )
 
-ADD_LIBRARY(pnm ${libpnm_la_SOURCES})
+#ADD_LIBRARY(pnm ${libpnm_la_SOURCES})

diff --git a/src/gdcmjasper/src/libjasper/ras/CMakeLists.txt b/src/gdcmjasper/src/libjasper/ras/CMakeLists.txt
index 574429b..0d6a3bc 100644 (file)
--- a/src/gdcmjasper/src/libjasper/ras/CMakeLists.txt
+++ b/src/gdcmjasper/src/libjasper/ras/CMakeLists.txt
@@ -1,5 +1,5 @@
 # all the include are there:
-INCLUDE_DIRECTORIES(${JASPER_SOURCE_DIR}/src/libjasper/include)
+#INCLUDE_DIRECTORIES(${JASPER_SOURCE_DIR}/src/libjasper/include)
 
 SET(libras_la_SOURCES
   #  ras_cod.h
@@ -9,4 +9,4 @@ SET(libras_la_SOURCES
   ras_enc.c
   )
 
-ADD_LIBRARY(ras ${libras_la_SOURCES})
+#ADD_LIBRARY(ras ${libras_la_SOURCES})