X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2Fgdcmjasper%2Fsrc%2Flibjasper%2Finclude%2Fjasper%2FCMakeLists.txt;h=1799a161ad20cc6e0327ab4f23b1180ef50535ab;hb=87ac02b456a9c2044b3eab23aa5d9e8dbfd12f29;hp=54324011325e2c3150281c4c34fe7a83213526fe;hpb=f2892379e89dd5236abb60ea3c84c3fe9d5ef45f;p=gdcm.git

diff --git a/src/gdcmjasper/src/libjasper/include/jasper/CMakeLists.txt b/src/gdcmjasper/src/libjasper/include/jasper/CMakeLists.txt
index 54324011..1799a161 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 \
@@ -175,6 +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)
+    SET(JASPERDLL 1)
+  ELSE (BUILD_SHARED_LIBS)
+    SET(JASPERSTATIC 1)
+  ENDIF (BUILD_SHARED_LIBS)
+ENDIF (WIN32)
+
 CONFIGURE_FILE(
   "${GDCMJASPER_SOURCE_DIR}/src/libjasper/include/jasper/jas_config.h.in"
   "${GDCMJASPER_BINARY_DIR}/src/libjasper/include/jasper/jas_config.h"