ENH: Properly recompile jasper if a header/file is modified. Also fixed a compilation...

diff --git a/src/gdcmjasper/src/libjasper/base/CMakeLists.txt b/src/gdcmjasper/src/libjasper/base/CMakeLists.txt
index 354a377..5aa25bd 100644 (file)
--- a/src/gdcmjasper/src/libjasper/base/CMakeLists.txt
+++ b/src/gdcmjasper/src/libjasper/base/CMakeLists.txt
@@ -1,3 +1,5 @@
+INCLUDE_REGULAR_EXPRESSION("^.*$")
+
 # all the include are there:
 #INCLUDE_DIRECTORIES(${JASPER_SOURCE_DIR}/src/libjasper/include)
 

diff --git a/src/gdcmjasper/src/libjasper/bmp/CMakeLists.txt b/src/gdcmjasper/src/libjasper/bmp/CMakeLists.txt
index 8ad66f0..105939a 100644 (file)
--- a/src/gdcmjasper/src/libjasper/bmp/CMakeLists.txt
+++ b/src/gdcmjasper/src/libjasper/bmp/CMakeLists.txt
@@ -1,3 +1,5 @@
+INCLUDE_REGULAR_EXPRESSION("^.*$")
+
 # all the include are there:
 #INCLUDE_DIRECTORIES(${JASPER_SOURCE_DIR}/src/libjasper/include)
 

diff --git a/src/gdcmjasper/src/libjasper/include/jasper/CMakeLists.txt b/src/gdcmjasper/src/libjasper/include/jasper/CMakeLists.txt
index 2db4468..e18032d 100644 (file)
--- a/src/gdcmjasper/src/libjasper/include/jasper/CMakeLists.txt
+++ b/src/gdcmjasper/src/libjasper/include/jasper/CMakeLists.txt
@@ -1,5 +1,4 @@
-#INCLUDE_REGULAR_EXPRESSION("^(jas).*$")
-
+INCLUDE_REGULAR_EXPRESSION("^.*$") 
 
 #libjasperinclude_HEADERS = \
 #  jasper.h \

diff --git a/src/gdcmjasper/src/libjasper/jp2/CMakeLists.txt b/src/gdcmjasper/src/libjasper/jp2/CMakeLists.txt
index 6317df4..9bc565e 100644 (file)
--- a/src/gdcmjasper/src/libjasper/jp2/CMakeLists.txt
+++ b/src/gdcmjasper/src/libjasper/jp2/CMakeLists.txt
@@ -1,3 +1,5 @@
+INCLUDE_REGULAR_EXPRESSION("^.*$")
+
 # all the include are there:
 #INCLUDE_DIRECTORIES(${JASPER_SOURCE_DIR}/src/libjasper/include)
 

diff --git a/src/gdcmjasper/src/libjasper/jpc/CMakeLists.txt b/src/gdcmjasper/src/libjasper/jpc/CMakeLists.txt
index 57768c2..a43d44d 100644 (file)
--- a/src/gdcmjasper/src/libjasper/jpc/CMakeLists.txt
+++ b/src/gdcmjasper/src/libjasper/jpc/CMakeLists.txt
@@ -1,3 +1,5 @@
+INCLUDE_REGULAR_EXPRESSION("^.*$")
+
 # all the include are there:
 #INCLUDE_DIRECTORIES(${JASPER_SOURCE_DIR}/src/libjasper/include)
 

diff --git a/src/gdcmjasper/src/libjasper/jpg/CMakeLists.txt b/src/gdcmjasper/src/libjasper/jpg/CMakeLists.txt
index 77ac4bf..bc6c0e8 100644 (file)
--- a/src/gdcmjasper/src/libjasper/jpg/CMakeLists.txt
+++ b/src/gdcmjasper/src/libjasper/jpg/CMakeLists.txt
@@ -1,3 +1,5 @@
+INCLUDE_REGULAR_EXPRESSION("^.*$")
+
 # all the include are there:
 #INCLUDE_DIRECTORIES(${JASPER_SOURCE_DIR}/src/libjasper/include)
 

diff --git a/src/gdcmjasper/src/libjasper/mif/CMakeLists.txt b/src/gdcmjasper/src/libjasper/mif/CMakeLists.txt
index 84effe4..ac42351 100644 (file)
--- a/src/gdcmjasper/src/libjasper/mif/CMakeLists.txt
+++ b/src/gdcmjasper/src/libjasper/mif/CMakeLists.txt
@@ -1,3 +1,5 @@
+INCLUDE_REGULAR_EXPRESSION("^.*$")
+
 # all the include are there:
 #INCLUDE_DIRECTORIES(${JASPER_SOURCE_DIR}/src/libjasper/include)
 

diff --git a/src/gdcmjasper/src/libjasper/pgx/CMakeLists.txt b/src/gdcmjasper/src/libjasper/pgx/CMakeLists.txt
index 5f9d8e1..4135767 100644 (file)
--- a/src/gdcmjasper/src/libjasper/pgx/CMakeLists.txt
+++ b/src/gdcmjasper/src/libjasper/pgx/CMakeLists.txt
@@ -1,3 +1,5 @@
+INCLUDE_REGULAR_EXPRESSION("^.*$")
+
 # all the include are there:
 #INCLUDE_DIRECTORIES(${JASPER_SOURCE_DIR}/src/libjasper/include)
 

diff --git a/src/gdcmjasper/src/libjasper/pnm/CMakeLists.txt b/src/gdcmjasper/src/libjasper/pnm/CMakeLists.txt
index 02035eb..ba959ae 100644 (file)
--- a/src/gdcmjasper/src/libjasper/pnm/CMakeLists.txt
+++ b/src/gdcmjasper/src/libjasper/pnm/CMakeLists.txt
@@ -1,3 +1,5 @@
+INCLUDE_REGULAR_EXPRESSION("^.*$")
+
 # all the include are there:
 #INCLUDE_DIRECTORIES(${JASPER_SOURCE_DIR}/src/libjasper/include)
 

diff --git a/src/gdcmjasper/src/libjasper/ras/CMakeLists.txt b/src/gdcmjasper/src/libjasper/ras/CMakeLists.txt
index 0d6a3bc..958f757 100644 (file)
--- a/src/gdcmjasper/src/libjasper/ras/CMakeLists.txt
+++ b/src/gdcmjasper/src/libjasper/ras/CMakeLists.txt
@@ -1,3 +1,5 @@
+INCLUDE_REGULAR_EXPRESSION("^.*$")
+
 # all the include are there:
 #INCLUDE_DIRECTORIES(${JASPER_SOURCE_DIR}/src/libjasper/include)
 

diff --git a/src/gdcmjasper/src/libjasper/ras/ras_cod.c b/src/gdcmjasper/src/libjasper/ras/ras_cod.c
index d2bd0c4..be654d8 100644 (file)
--- a/src/gdcmjasper/src/libjasper/ras/ras_cod.c
+++ b/src/gdcmjasper/src/libjasper/ras/ras_cod.c
@@ -64,11 +64,11 @@
 /*
  * Sun Rasterfile Library
  *
- * $Id: ras_cod.c,v 1.1 2005/05/22 18:33:10 malaterre Exp $
+ * $Id: ras_cod.c,v 1.2 2005/06/07 17:20:35 malaterre Exp $
  */
 
 /* Note: There is not currently any code common to both the encoder and
   decoder. */
 
 /* Keep picky compilers happy. */
-int ras_dummy;
+int ras_dummy = 0;