X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2Fgdcmjpegls%2FDecoder%2FCMakeLists.txt;h=da2bcd119ebc1f434c008251ffb815ec663e13c2;hb=9c76b9a60c1e859bfcd43f4089304827c8361be5;hp=8de55c3d6629092880fa44c2a0452d8f5e8ac25b;hpb=8a8b4ae83ad19690f0cc51ebc9091d75ffc1cd8d;p=gdcm.git

diff --git a/src/gdcmjpegls/Decoder/CMakeLists.txt b/src/gdcmjpegls/Decoder/CMakeLists.txt
index 8de55c3d..da2bcd11 100644
--- a/src/gdcmjpegls/Decoder/CMakeLists.txt
+++ b/src/gdcmjpegls/Decoder/CMakeLists.txt
@@ -1,10 +1,6 @@
-#CC=cc
-#PKGNAME=loco
-#OPTFLAGS=  -Aa $(CFL) -DBIG_ENDIAN
+INCLUDE_REGULAR_EXPRESSION("^.*$")
 
-#CFLAGS  = $(OPTFLAGS) $(VFL) $(DFL) -DPGMPREFIX=\"$(PREFIX)\" -DMELCODE -DEXTERNDISTRIB -Dinline="" -DNDEBUG
-
-#LNKFLAGS = -lm
+INCLUDE_DIRECTORIES("${GDCMJPEGLS_BINARY_DIR}")
 
 SET(GDCMJPEGLS_SRCS
   global.c 
@@ -16,40 +12,18 @@ SET(GDCMJPEGLS_SRCS
   bitio.c 
   melcode.c)
 
-ADD_LIBRARY(gdcmjpegls ${GDCMJPEGLS_SRCS})
+# Do the -fno-common magic
+IF(APPLE)
+  FOREACH(f ${GDCMJPEGLS_SRCS})
+    SET_SOURCE_FILES_PROPERTIES(
+      "${GDCMJPEGLS_SOURCE_DIR}/Decoder/${f}"
+      PROPERTIES COMPILE_FLAGS -fno-common)
+  ENDFOREACH(f)
+ENDIF(APPLE)
 
-#INCL = global.h jpegmark.h bitio.h
 
-#EOBJS = global.o jpegmark.o initialize.o decoder.o lossless_d.o lossy_d.o bitio.o melcode.o
+ADD_LIBRARY(gdcmjpegls ${GDCMJPEGLS_SRCS})
+#ADD_EXECUTABLE(locod ${GDCMJPEGLS_SRCS})
 
-#loco:
-#  $(MAKE) -$(MAKEFLAGS) VFL="" PREFIX="loco" codec
-#
-#DECODER = $(PREFIX)d
-#
-#codec: $(DECODER)
-#
-#jpegmark.o: jpegmark.c jpegmark.h bitio.h global.h
-#
-#global.o: global.h global.c
-#
-#initialize.o: initialize.c bitio.h global.h
-#
-#lossless_d.o: global.h lossless_d.c bitio.h 
-#
-#lossy_d.o: global.h lossy_d.c bitio.h
-#
-#decoder.o: decoder.c jpegmark.c global.h 
-#
-#bitio.o: bitio.c bitio.h global.h
-#
-#melcode.o: melcode.c bitio.h global.h
-#
-#
-#$(DECODER): $(EOBJS)
-#  $(CC) $(CFLAGS) -o $@ $(EOBJS) $(LNKFLAGS)
-#
-#lint:
-#  lint $(SRCS)
-#clean:
-#  -rm -f *.o core loco* *.out
+# TODO must do the INSTALL_ blah thing
+INSTALL_TARGETS(/lib/gdcm/ gdcmjpegls)