From e8c87727ddbb1fa8733593036ae2408680c34c25 Mon Sep 17 00:00:00 2001 From: malaterre Date: Tue, 7 Jun 2005 17:20:23 +0000 Subject: [PATCH] ENH: Properly recompile jasper if a header/file is modified. Also fixed a compilation issue on MacOSX and multi lib module thing --- src/gdcmjasper/src/libjasper/base/CMakeLists.txt | 2 ++ src/gdcmjasper/src/libjasper/bmp/CMakeLists.txt | 2 ++ src/gdcmjasper/src/libjasper/include/jasper/CMakeLists.txt | 3 +-- src/gdcmjasper/src/libjasper/jp2/CMakeLists.txt | 2 ++ src/gdcmjasper/src/libjasper/jpc/CMakeLists.txt | 2 ++ src/gdcmjasper/src/libjasper/jpg/CMakeLists.txt | 2 ++ src/gdcmjasper/src/libjasper/mif/CMakeLists.txt | 2 ++ src/gdcmjasper/src/libjasper/pgx/CMakeLists.txt | 2 ++ src/gdcmjasper/src/libjasper/pnm/CMakeLists.txt | 2 ++ src/gdcmjasper/src/libjasper/ras/CMakeLists.txt | 2 ++ src/gdcmjasper/src/libjasper/ras/ras_cod.c | 4 ++-- 11 files changed, 21 insertions(+), 4 deletions(-) diff --git a/src/gdcmjasper/src/libjasper/base/CMakeLists.txt b/src/gdcmjasper/src/libjasper/base/CMakeLists.txt index 354a3779..5aa25bd4 100644 --- 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 8ad66f0a..105939a9 100644 --- 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 2db44681..e18032d9 100644 --- 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 6317df45..9bc565ee 100644 --- 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 57768c22..a43d44da 100644 --- 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 77ac4bfe..bc6c0e85 100644 --- 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 84effe45..ac42351e 100644 --- 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 5f9d8e16..41357670 100644 --- 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 02035ebb..ba959aed 100644 --- 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 0d6a3bcc..958f757a 100644 --- 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 d2bd0c46..be654d85 100644 --- 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; -- 2.45.1