From: malaterre <malaterre>
Date: Wed, 8 Jun 2005 18:42:18 +0000 (+0000)
Subject: COMP: trying to simplify the shared lib on win32... still a mess
X-Git-Tag: Version1.2.bp~556
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=87ac02b456a9c2044b3eab23aa5d9e8dbfd12f29;p=gdcm.git

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

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 428c3898..e6c9907c 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -3,18 +3,18 @@
 INCLUDE_REGULAR_EXPRESSION("^gdcm.*$")
 
 # Build jpeg lib first:
-IF (WIN32)
-  IF (BUILD_SHARED_LIBS)
-    ADD_DEFINITIONS(-DJPEGDLL)
-  ELSE (BUILD_SHARED_LIBS)
-    ADD_DEFINITIONS(-DJPEGSTATIC)
-  ENDIF (BUILD_SHARED_LIBS)
-ENDIF (WIN32)
+#IF (WIN32)
+#  IF (BUILD_SHARED_LIBS)
+#    ADD_DEFINITIONS(-DJPEGDLL)
+#  ELSE (BUILD_SHARED_LIBS)
+#    ADD_DEFINITIONS(-DJPEGSTATIC)
+#  ENDIF (BUILD_SHARED_LIBS)
+#ENDIF (WIN32)
 SUBDIRS(
   gdcmjpeg
   #gdcmmpeg2
   gdcmjasper
-  #gdcmjpegls
+  gdcmjpegls
   )
 
 # "jpeglib.h" is defined here:
diff --git a/src/gdcmjasper/src/libjasper/include/jasper/CMakeLists.txt b/src/gdcmjasper/src/libjasper/include/jasper/CMakeLists.txt
index e18032d9..1799a161 100644
--- a/src/gdcmjasper/src/libjasper/include/jasper/CMakeLists.txt
+++ b/src/gdcmjasper/src/libjasper/include/jasper/CMakeLists.txt
@@ -176,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)
diff --git a/src/gdcmjasper/src/libjasper/include/jasper/jas_config.h.in b/src/gdcmjasper/src/libjasper/include/jasper/jas_config.h.in
index cd86a5c7..64aece3f 100644
--- a/src/gdcmjasper/src/libjasper/include/jasper/jas_config.h.in
+++ b/src/gdcmjasper/src/libjasper/include/jasper/jas_config.h.in
@@ -219,6 +219,7 @@ typedef __int64            longlong;
 
 
 #cmakedefine JASPERSTATIC
+#cmakedefine JASPERDLL
 
 /* a function referenced thru EXTERNs: */
 #if defined( _WIN32 ) && defined (JASPERDLL)
diff --git a/src/gdcmjpeg/CMakeLists.txt b/src/gdcmjpeg/CMakeLists.txt
index 7a905f3b..0a208e1b 100644
--- a/src/gdcmjpeg/CMakeLists.txt
+++ b/src/gdcmjpeg/CMakeLists.txt
@@ -86,9 +86,11 @@ ENDFOREACH(src)
 
 IF (WIN32)
   IF (BUILD_SHARED_LIBS)
-    ADD_DEFINITIONS(-DJPEGDLL)
+    #ADD_DEFINITIONS(-DJPEGDLL)
+    SET(JPEGDLL 1)
   ELSE (BUILD_SHARED_LIBS)
-    ADD_DEFINITIONS(-DJPEGSTATIC)
+    #ADD_DEFINITIONS(-DJPEGSTATIC)
+    SET(JPEGSTATIC 1)
   ENDIF (BUILD_SHARED_LIBS)
 ENDIF (WIN32)
 
diff --git a/src/gdcmjpeg/jmorecfg.h.in b/src/gdcmjpeg/jmorecfg.h.in
index 621dc0e3..c728d946 100644
--- a/src/gdcmjpeg/jmorecfg.h.in
+++ b/src/gdcmjpeg/jmorecfg.h.in
@@ -214,6 +214,9 @@ typedef unsigned int JDIMENSION;
  * or code profilers that require it.
  */
 
+#cmakedefine JPEGDLL
+#cmakedefine JPEGSTATIC
+
 /* a function called through method pointers: */
 #define METHODDEF(type)    static type
 /* a function used only in its module: */