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

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 428c38986e10631ebc319012f52ca336748874d9..e6c9907c3cdd345d5dec5558004fa5ff938b327d 100644 (file)
--- 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 e18032d9b56bf97149544599b006bd3b97ee02f5..1799a161ad20cc6e0327ab4f23b1180ef50535ab 100644 (file)
--- 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 cd86a5c79e46f6b62cbe1d73f909474bcd4fe9c8..64aece3f2855862791442570138f1d3d48e2dd5c 100644 (file)
--- 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 7a905f3beab21bcae667ed133550a3eba05211f8..0a208e1b053d93aed84793b722cd0ccbe99b8f0d 100644 (file)
--- 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 621dc0e3fb3a6fe35107b3da78df1217de36a34f..c728d94604d74369fe7afc5e3d15456fa2e5ed2b 100644 (file)
--- 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: */