gdcm images are now "GDCM 1.1" built.

[gdcm.git] / src / gdcmjpeg / CMakeLists.txt

diff --git a/src/gdcmjpeg/CMakeLists.txt b/src/gdcmjpeg/CMakeLists.txt
index b41615cb58a9d9724e3328865ea18bb115ff5584..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)
 
@@ -111,6 +113,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)