X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2Fgdcmjpeg%2FCMakeLists.txt;h=8a0641cfb0be91deba59ad8c73fa2678b4d17ac4;hb=80075429b6ab9db9e885b9bb9ae1427530c7bef8;hp=b41615cb58a9d9724e3328865ea18bb115ff5584;hpb=0e1fc20ae75b480c43589c6f5a6eb5288b1dbb9e;p=gdcm.git

diff --git a/src/gdcmjpeg/CMakeLists.txt b/src/gdcmjpeg/CMakeLists.txt
index b41615cb..8a0641cf 100644
--- a/src/gdcmjpeg/CMakeLists.txt
+++ b/src/gdcmjpeg/CMakeLists.txt
@@ -86,12 +86,18 @@ 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)
 
+# By default support DICOMObjects bug, if this is a speed penalty for you
+# you should consider disabling it
+SET(SUPPORT_DICOMOBJECTS_BUG ON)
+
 CONFIGURE_FILE(${GDCMJPEG_SOURCE_DIR}/.NoDartCoverage
                ${GDCMJPEG_BINARY_DIR}/.NoDartCoverage)
 
@@ -111,6 +117,8 @@ FOREACH(bits 8 12 16)
                  ${CMAKE_CURRENT_BINARY_DIR}/${bits}/jpeglib.h COPYONLY IMMEDIATE)
   CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/jerror.h
                  ${CMAKE_CURRENT_BINARY_DIR}/${bits}/jerror.h COPYONLY IMMEDIATE)
+  CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/jinclude.h
+                 ${CMAKE_CURRENT_BINARY_DIR}/${bits}/jinclude.h COPYONLY IMMEDIATE)
 ENDFOREACH(bits)
 
 SUBDIRS(8 12 16)