X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2Fgdcmopenjpeg%2Flibopenjpeg%2FCMakeLists.txt;h=965759c2b3cc58566de422b1bb8d6a9739c8f3bd;hb=880f6dfe2e061712fafbf75ab9547aadf170fc40;hp=f2748dd4fb3eb4084602f6803f65cf07621ef505;hpb=4b12a00dc4f23ecd2df349051b54eff9ecef3247;p=gdcm.git

diff --git a/src/gdcmopenjpeg/libopenjpeg/CMakeLists.txt b/src/gdcmopenjpeg/libopenjpeg/CMakeLists.txt
index f2748dd4..965759c2 100644
--- a/src/gdcmopenjpeg/libopenjpeg/CMakeLists.txt
+++ b/src/gdcmopenjpeg/libopenjpeg/CMakeLists.txt
@@ -1,100 +1,43 @@
-# Create the lib
-SET(openjpeg_SRCS
+INCLUDE_REGULAR_EXPRESSION("^.*$")
+# Defines the source code for the library
+SET(OpenJPEG_SRCS
   bio.c
   cio.c
   dwt.c
-  fix.c
-  int.c
+  event.c
+  image.c
   j2k.c
+  j2k_lib.c
+  jp2.c
+  jpt.c
   mct.c
   mqc.c
-
+  openjpeg.c
   pi.c
   raw.c
   t1.c
   t2.c
   tcd.c
   tgt.c
-  jpt.c
-  jp2.c
 )
-ADD_LIBRARY(gdcmopenjpeg ${openjpeg_SRCS})
 
-## $Id: CMakeLists.txt,v 1.2 2005/10/24 15:39:38 malaterre Exp $
-##
-## makefile for OpenJPEG library
-#
-#CFLAGS  = -Wall -O3 -fno-strength-reduce -fomit-frame-pointer
-#
-#ifndef DEBUG
-#  LDFLAGS = -s -lm
-#else
-#  LDFLAGS = -lm
-#endif
-#
-#OBJ_DIR_W32 = obj.w32
-#LIB_DIR_W32 = lib.w32
-#
-#ifdef MINGW32
-#  CC = i386-mingw32-gcc
-#  AR = i386-mingw32-ar
-#  OBJ_DIR = $(OBJ_DIR_W32)
-#  LIB_DIR = $(LIB_DIR_W32)
-#  all:   $(OBJ_DIR) $(LIB_DIR) \
-#   $(LIB_DIR)/libopenjpeg.a $(LIB_DIR)/libopenjpeg.dll
-#else
-#  CC = gcc
-#  AR = ar
-#  OBJ_DIR = obj
-#  LIB_DIR = lib
-#  all:   $(OBJ_DIR) $(LIB_DIR) \
-#   $(LIB_DIR)/libopenjpeg.a $(LIB_DIR)/libopenjpeg.so
-#endif
-#
-#$(OBJ_DIR):
-#   mkdir $(OBJ_DIR)
-#
-#$(LIB_DIR):   
-#   mkdir $(LIB_DIR)
-#
-#$(OBJ_DIR)/%.o:
-#   $(CC) -c $(CFLAGS) $(CPPFLAGS) -o $@ $<
-#
-#$(OBJ_DIR)/bio.o:   bio.c bio.h
-#$(OBJ_DIR)/cio.o:   cio.c cio.h
-#$(OBJ_DIR)/dwt.o:   dwt.c dwt.h int.h fix.h tcd.h
-#$(OBJ_DIR)/fix.o:   fix.c fix.h
-#$(OBJ_DIR)/int.o:   int.c
-#$(OBJ_DIR)/j2k.o:   j2k.c j2k.h cio.h tcd.h dwt.h int.h
-#$(OBJ_DIR)/mct.o:   mct.c mct.h fix.h
-#$(OBJ_DIR)/mqc.o:   mqc.c mqc.h
-#
-#$(OBJ_DIR)/pi.o:   pi.c pi.h int.h
-#$(OBJ_DIR)/raw.o:   raw.c raw.h
-#$(OBJ_DIR)/t1.o:   t1.c t1.h j2k.h mqc.h raw.h int.h mct.h dwt.h fix.h
-#$(OBJ_DIR)/t2.o:   t2.c t2.h tcd.h bio.h j2k.h pi.h tgt.h int.h cio.h
-#$(OBJ_DIR)/tcd.o:   tcd.c tcd.h int.h t1.h t2.h dwt.h mct.h
-#$(OBJ_DIR)/tgt.o:   tgt.c tgt.h bio.h
-#$(OBJ_DIR)/jpt.o:       jpt.c jpt.h cio.h
-#$(OBJ_DIR)/jp2.o:   jp2.c jp2.h
-#
-#COM_OBJS = $(addprefix $(OBJ_DIR)/, j2k.o bio.o cio.o dwt.o fix.o int.o mct.o \
-#      mqc.o pi.o t1.o t2.o  tgt.o tcd.o raw.o jpt.o jp2.o)
-#
-#$(LIB_DIR)/libopenjpeg.a: ${COM_OBJS}
-#   $(AR) -sr $@ $^
-#
-#$(LIB_DIR)/libopenjpeg.dll: ${COM_OBJS}
-#   ${CC} -s -shared -Wl,-soname,libopenjpeg.dll -o $@ $^
-#
-#$(LIB_DIR)/libopenjpeg.so.1.0: ${COM_OBJS}
-#   ${CC} -s -shared -Wl,-soname,libopenjpeg.so.1 -o $@ $^
-#
-#$(LIB_DIR)/libopenjpeg.so.1: $(LIB_DIR)/libopenjpeg.so.1.0
-#   ln -s libopenjpeg.so.1.0 $(LIB_DIR)/libopenjpeg.so.1
-#
-#$(LIB_DIR)/libopenjpeg.so: $(LIB_DIR)/libopenjpeg.so.1
-#   ln -s libopenjpeg.so.1 $(LIB_DIR)/libopenjpeg.so
-#
-#clean:
-#   rm -f $(OBJ_DIR_W32)/* $(OBJ_DIR)/* $(LIB_DIR_W32)/* $(LIB_DIR)/*
+# Pass proper definition to preprocessor to generate shared lib
+IF (WIN32)
+  IF (BUILD_SHARED_LIBS)
+    ADD_DEFINITIONS(-DOPJ_EXPORTS)
+  ELSE (BUILD_SHARED_LIBS)
+    ADD_DEFINITIONS(-DOPJ_STATIC)
+  ENDIF (BUILD_SHARED_LIBS)
+ENDIF (WIN32)
+
+# Create the library
+ADD_LIBRARY(${OPJ_PREFIX}openjpeg ${OpenJPEG_SRCS})
+
+# Install library
+IF(NOT GDCM_INSTALL_NO_LIBRARIES)
+  INSTALL_TARGETS(
+    ${GDCM_INSTALL_LIB_DIR}
+    RUNTIME_DIRECTORY ${GDCM_INSTALL_BIN_DIR}
+    ${OPJ_PREFIX}openjpeg)
+ENDIF(NOT GDCM_INSTALL_NO_LIBRARIES)
+