X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2Fjpeg%2Flibijg%2FCMakeLists.txt;h=d9dbe443084bc238ea23fd26a8d346b5bb6ffb24;hb=b8f1b0eb8c0977055c1ba39184e1c842dd80edf5;hp=38a5346c3ab184814ebd5dec95a172751d16f64d;hpb=63f579ada04b47069e977c900e89b433e1aae95b;p=gdcm.git

diff --git a/src/jpeg/libijg/CMakeLists.txt b/src/jpeg/libijg/CMakeLists.txt
index 38a5346c..d9dbe443 100644
--- a/src/jpeg/libijg/CMakeLists.txt
+++ b/src/jpeg/libijg/CMakeLists.txt
@@ -1,83 +1,55 @@
-#LTVERSION = 0:1:0
-
-#lib_LTLIBRARIES = libgdcmijpeg8.la
-
-##CXXFLAGS = @CXXFLAGS@
-
-SET(libgdcmijpeg8_la_SOURCES
-	jcapimin.c 
-	jcapistd.c 
-	jctrans.c 
-	jcparam.c
-	jdatadst.c 
-	jcinit.c 
-	jcmaster.c 
-	jcmarker.c 
-	jcmainct.c 
-	jcprepct.c 
-	jccoefct.c 
-	jccolor.c 
-	jcsample.c 
-	jchuff.c 
-	jcphuff.c 
-	jcdctmgr.c 
-	jfdctfst.c 
-	jfdctflt.c 
-	jfdctint.c 
-	jdapimin.c 
-	jdapistd.c 
-	jdtrans.c 
-	jdatasrc.c 
-	jdmaster.c 
-	jdinput.c 
-	jdmarker.c 
-	jdhuff.c 
-	jdphuff.c 
-	jdmainct.c 
-	jdcoefct.c 
-	jdpostct.c 
-	jddctmgr.c 
-	jidctfst.c 
-	jidctflt.c 
-	jidctint.c 
-	jidctred.c 
-	jdsample.c 
-	jdcolor.c 
-	jquant1.c 
-	jquant2.c 
-	jdmerge.c 
-	jcomapi.c 
-	jutils.c 
-	jerror.c 
-	jmemmgr.c 
-	jmemnobs.c 
-	rdrle.c
-)
-
-#libgdcmijpeg8includedir = $(includedir)
-SET(libgdcmijpeg8include_HEADERS
-	jchuff.h  
-	jconfig.h  
-	jdct.h  
-	jdhuff.h  
-	jerror.h  
-	jinclude.h  
-	jmemsys.h  
-	jmorecfg.h  
-	jpegint.h  
-	jpeglib.h  
-	jversion.h 
-)
-
-#EXTRA_DIST = \
-#   jconfig.linux \
-#   jconfig.vc
-
-ADD_LIBRARY(gdcmijpeg8 ${libgdcmijpeg8_la_SOURCES})
-
-#INSTALL_FILES(/include "\\.h$")
-INSTALL_FILES(/include FILES ${libgdcmijpeg8include_HEADERS})
-#INSTALL_FILES(/include FILES jconfig.linux jconfig.vc)
-INSTALL_FILES(/include FILES jconfig.linux)
-
-INSTALL_TARGETS(/lib/ gdcmijpeg8)
\ No newline at end of file
+# JPEG 8 bits project
+
+PROJECT(GDCMJPEG)
+INCLUDE_REGULAR_EXPRESSION("^(jchuff|jconfig|jdct|jdhuff|jerror|jinclude|jmemsys|jmorecfg|jpegint|jpeglib|jversion|jpeg|gdcm).*$")
+INCLUDE_DIRECTORIES(${GDCMJPEG_SOURCE_DIR})
+
+
+# memmgr back ends: compile only one of these into a working library
+# (For now, let's use the mode that requires the image fit into memory.
+# This is the recommended mode for Win32 anyway.)
+SET(systemdependent_SRCS jmemnobs.c)
+
+# library object files common to compression and decompression
+SET(common_SRCS
+jcomapi.c jutils.c jerror.c jmemmgr.c
+)
+
+# compression library object files
+SET(compression_SRCS
+jcapimin.c jcapistd.c jctrans.c jcparam.c jdatadst.c jcinit.c
+jcmaster.c jcmarker.c jcmainct.c jcprepct.c jccoefct.c jccolor.c
+jcsample.c jchuff.c jcphuff.c jcdctmgr.c jfdctfst.c jfdctflt.c
+jfdctint.c
+)
+
+# decompression library object files
+SET(decompression_SRCS
+jdapimin.c jdapistd.c jdtrans.c jdatasrc.c jdmaster.c
+jdinput.c jdmarker.c jdhuff.c jdphuff.c jdmainct.c jdcoefct.c
+jdpostct.c jddctmgr.c jidctfst.c jidctflt.c jidctint.c jidctred.c
+jdsample.c jdcolor.c jquant1.c jquant2.c jdmerge.c
+)
+
+ADD_LIBRARY(gdcmijpeg8 ${systemdependent_SRCS} ${common_SRCS} ${compression_SRCS} ${decompression_SRCS})
+
+INSTALL_TARGETS(/lib/ gdcmijpeg8)
+INSTALL_FILES(/include .h jconfig.linux jconfig.vc)
+
+# Attempt to generate two libraries: jpeg 8bits and 12 bits using only one
+# source directory
+
+# For now disable it
+
+#extremly dangerous as there could be a /usr/include/jconfig.h from regular jpeg lib
+#INCLUDE_DIRECTORIES(${GDCMJPEG_BINARY_DIR})
+
+SET(BITS_TYPE_JPEG_MANGLE_NAME gdcm_mangle_8bits.h)
+CONFIGURE_FILE(${GDCMJPEG_SOURCE_DIR}/jconfig.h.in
+               ${GDCMJPEG_BINARY_DIR}/jconfig.h @ONLY)
+#ADD_LIBRARY(gdcmijpeg8 ${systemdependent_SRCS} ${common_SRCS} ${compression_SRCS} ${decompression_SRCS})
+
+SET(BITS_TYPE_JPEG_MANGLE_NAME gdcm_mangle_12bits.h)
+CONFIGURE_FILE(${GDCMJPEG_SOURCE_DIR}/jconfig.h.in
+               ${GDCMJPEG_BINARY_DIR}/jconfig.h @ONLY)
+#ADD_LIBRARY(gdcmijpeg12 ${systemdependent_SRCS} ${common_SRCS} ${compression_SRCS} ${decompression_SRCS})