X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2Fgdcmjasper%2Fsrc%2Flibjasper%2Finclude%2Fjasper%2FCMakeLists.txt;h=e18032d9b56bf97149544599b006bd3b97ee02f5;hb=6b17eb062f567984bf36876ddbb980731b603855;hp=79865a5a236ca781ae224fe34fddd6fc027610ec;hpb=2a60a42fe25ca59708d6311d0828e96540e6db9a;p=gdcm.git

diff --git a/src/gdcmjasper/src/libjasper/include/jasper/CMakeLists.txt b/src/gdcmjasper/src/libjasper/include/jasper/CMakeLists.txt
index 79865a5a..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 \
@@ -25,24 +24,24 @@
 
 SET(JAS_VERSION "1.701.0")
 
-CHECK_INCLUDE_FILE("dlfcn.h"       HAVE_DLFCN_H)
-CHECK_INCLUDE_FILE("fcntl.h" HAVE_FCNTL_H)
+CHECK_INCLUDE_FILE("dlfcn.h"    HAVE_DLFCN_H)
+CHECK_INCLUDE_FILE("fcntl.h"    HAVE_FCNTL_H)
 CHECK_INCLUDE_FILE("inttypes.h" HAVE_INTTYPES_H)
-CHECK_INCLUDE_FILE("io.h" HAVE_IO_H)
+CHECK_INCLUDE_FILE("io.h"       HAVE_IO_H)
 #/* Define to 1 if you have the `m' library (-lm). */
 ##define HAVE_LIBM 1
 
-CHECK_INCLUDE_FILE("limits.h" HAVE_LIMITS_H)
-CHECK_INCLUDE_FILE("memory.h" HAVE_MEMORY_H)
-CHECK_INCLUDE_FILE("stdbool.h" HAVE_STDBOOL_H)
-CHECK_INCLUDE_FILE("stddef.h" HAVE_STDDEF_H)
-CHECK_INCLUDE_FILE("stdint.h" HAVE_STDINT_H)
-CHECK_INCLUDE_FILE("stdlib.h" HAVE_STDLIB_H)
-CHECK_INCLUDE_FILE("strings.h" HAVE_STRINGS_H)
-CHECK_INCLUDE_FILE("string.h" HAVE_STRING_H)
-CHECK_INCLUDE_FILE("sys/stat.h" HAVE_SYS_STAT_H)
+CHECK_INCLUDE_FILE("limits.h"    HAVE_LIMITS_H)
+CHECK_INCLUDE_FILE("memory.h"    HAVE_MEMORY_H)
+CHECK_INCLUDE_FILE("stdbool.h"   HAVE_STDBOOL_H)
+CHECK_INCLUDE_FILE("stddef.h"    HAVE_STDDEF_H)
+CHECK_INCLUDE_FILE("stdint.h"    HAVE_STDINT_H)
+CHECK_INCLUDE_FILE("stdlib.h"    HAVE_STDLIB_H)
+CHECK_INCLUDE_FILE("strings.h"   HAVE_STRINGS_H)
+CHECK_INCLUDE_FILE("string.h"    HAVE_STRING_H)
+CHECK_INCLUDE_FILE("sys/stat.h"  HAVE_SYS_STAT_H)
 CHECK_INCLUDE_FILE("sys/types.h" HAVE_SYS_TYPES_H)
-CHECK_INCLUDE_FILE("unistd.h" HAVE_UNISTD_H)
+CHECK_INCLUDE_FILE("unistd.h"    HAVE_UNISTD_H)
 
 #/* Have variable length arrays */
 ##define HAVE_VLA 1
@@ -64,6 +63,10 @@ CHECK_TYPE_SIZE("long"   GDCM_SIZEOF_LONG)
 CHECK_TYPE_SIZE("float"  GDCM_SIZEOF_FLOAT)
 CHECK_TYPE_SIZE("double" GDCM_SIZEOF_DOUBLE)
 
+CHECK_TYPE_SIZE("uint"   GDCM_SIZEOF_UINT)
+CHECK_TYPE_SIZE("ushort" GDCM_SIZEOF_USHORT)
+CHECK_TYPE_SIZE("ulong"  GDCM_SIZEOF_ULONG)
+
 CHECK_TYPE_SIZE("long long" GDCM_SIZEOF_LONG_LONG)
 CHECK_TYPE_SIZE("__int64"   GDCM_SIZEOF___INT64)
 
@@ -171,7 +174,15 @@ IF(GDCM_SIZEOF___INT64)
   ENDIF(NOT GDCM_TYPE_SAME_LONG_AND___INT64)
 ENDIF(GDCM_SIZEOF___INT64)
 
+IF (WIN32)
+  IF (BUILD_SHARED_LIBS)
+    ADD_DEFINITIONS(-DJASPERDLL)
+  ELSE (BUILD_SHARED_LIBS)
+    SET(JASPERSTATIC 1)
+  ENDIF (BUILD_SHARED_LIBS)
+ENDIF (WIN32)
+
 CONFIGURE_FILE(
-  "${JASPER_SOURCE_DIR}/src/libjasper/include/jasper/jas_config.h.in"
-  "${JASPER_BINARY_DIR}/src/libjasper/include/jasper/jas_config.h"
+  "${GDCMJASPER_SOURCE_DIR}/src/libjasper/include/jasper/jas_config.h.in"
+  "${GDCMJASPER_BINARY_DIR}/src/libjasper/include/jasper/jas_config.h"
   @ONLY IMMEDIATE)