COMP: trying to simplify the shared lib on win32... still a mess

[gdcm.git] / src / gdcmjasper / src / libjasper / include / jasper / CMakeLists.txt

diff --git a/src/gdcmjasper/src/libjasper/include/jasper/CMakeLists.txt b/src/gdcmjasper/src/libjasper/include/jasper/CMakeLists.txt
index 2db4468176efbf6388b4b47428bb9b2d6206e5fa..1799a161ad20cc6e0327ab4f23b1180ef50535ab 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 \
@@ -177,7 +176,8 @@ ENDIF(GDCM_SIZEOF___INT64)
 
 IF (WIN32)
   IF (BUILD_SHARED_LIBS)
-    ADD_DEFINITIONS(-DJASPERDLL)
+#    ADD_DEFINITIONS(-DJASPERDLL)
+    SET(JASPERDLL 1)
   ELSE (BUILD_SHARED_LIBS)
     SET(JASPERSTATIC 1)
   ENDIF (BUILD_SHARED_LIBS)