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 354a377982069ecd0a0989b9b21cb26e94df3a84..5aa25bd49a996dcba1b54f0d5fe60f9ffaa33ef8 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 8ad66f0a15eff256f4e69eccaf967c490b3119fa..105939a95c21525abe604dfa54d425d324e502ea 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 2db4468176efbf6388b4b47428bb9b2d6206e5fa..e18032d9b56bf97149544599b006bd3b97ee02f5 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 6317df45a54473a294da82a1cf1b27ed67d75518..9bc565eefbb8e4eae55df0cd3f7ec9814e0fc75a 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 57768c22aa649c2123a4047d5306070497506d0a..a43d44daadd39a379cdf1d45aa141eb251bf33bf 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 77ac4bfeb08972eefeebaaa8153f262025d9a116..bc6c0e8595f7c9ce9e6a29406de255f104593226 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 84effe4589322e4330850f7b31bfc9c542147a66..ac42351edd36d1f32ff247528f084addab7292d8 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 5f9d8e16c5d7bc4655ece0a4efb6d3eb6bc4047d..41357670e8e50a624e566ea31dabc4bd24b88eb5 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 02035ebb2b74fe9291a66009ac46cff4062fbbf2..ba959aed4e8e8685ed4283eaa29c42a8f1a273cf 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 0d6a3bcc4d17a2c82912daa7b181116843b1fc93..958f757a35033c0cac039e89f3983bc0f22f31bc 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 d2bd0c46cbfbbda314a9779c4429c4dcb4b02f0b..be654d855f4f877bcc433eca902cd46006b0e575 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;