X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2Fgdcmjasper%2Fsrc%2Flibjasper%2FCMakeLists.txt;h=cb30a24499ccd9f151f3ed55cc7ed6c0ee3760ad;hb=7c8b232fb62e92da08750b81d3126651f60b8f3f;hp=3d1ccf43f963df8148544c2107cb442fff762204;hpb=89fb0d91460d40fb4072f83ce35c2002789f8091;p=gdcm.git

diff --git a/src/gdcmjasper/src/libjasper/CMakeLists.txt b/src/gdcmjasper/src/libjasper/CMakeLists.txt
index 3d1ccf43..cb30a244 100644
--- a/src/gdcmjasper/src/libjasper/CMakeLists.txt
+++ b/src/gdcmjasper/src/libjasper/CMakeLists.txt
@@ -5,17 +5,11 @@
 SUBDIRS(include/jasper) # This is one can stay here
 
 MACRO(GDCM_CONVENIENT_LIBRARY)
-  #MESSAGE("ARGC=${ARGC}")
-  #MESSAGE("ARGV=${ARGV}")
   SET(GDCMJASPER_SOURCES)
   FOREACH(SUBDIR ${ARGV})
     INCLUDE("${GDCMJASPER_SOURCE_DIR}/src/libjasper/${SUBDIR}/CMakeLists.txt")
-    #MESSAGE("FILES=${lib${SUBDIR}_la_SOURCES}")
     #SET(convenient_lib${SUBDIR}_la_SOURCES)
     FOREACH(file ${lib${SUBDIR}_la_SOURCES})
-      #MESSAGE("${SUBDIR}/${file}")
-      #MESSAGE("BAR ${convenient_lib${SUBDIR}_la_SOURCES}")
-      #MESSAGE("${GDCMJASPER_SOURCE_DIR}/src/libjasper/${SUBDIR}/${file}")
       #SET(convenient_lib${SUBDIR}_la_SOURCES
       #  "${GDCMJASPER_SOURCE_DIR}/src/libjasper/${SUBDIR}/${file}"
       #  "${convenient_lib${SUBDIR}_la_SOURCES}"
@@ -25,18 +19,33 @@ MACRO(GDCM_CONVENIENT_LIBRARY)
         ${GDCMJASPER_SOURCES}
         )
     ENDFOREACH(file)
-    #MESSAGE("R= ${convenient_lib${SUBDIR}_la_SOURCES}")
   ENDFOREACH(SUBDIR)
 ENDMACRO(GDCM_CONVENIENT_LIBRARY)
 
 # Yeah ! I know how come I only did jpeg 8bits... bla bla
 # I'll wait until I actually such beast of jpeg2000 + some
 # crazy 16bits lossless jpeg...
-INCLUDE_DIRECTORIES(${GDCM_BINARY_DIR}/src/gdcmjpeg/8)
+IF(HAVE_LIBJPEG)
+  INCLUDE_DIRECTORIES(${GDCM_BINARY_DIR}/src/gdcmjpeg/8)
+ENDIF(HAVE_LIBJPEG)
+
+# For more info about this patch see the thread on gcc:
+# [ld: common symbols not allowed with MH_DYLIB output format with the -multi_module option]
+# http://www.mail-archive.com/gcc@gcc.gnu.org/msg05981.html
+IF(APPLE)
+  SET_SOURCE_FILES_PROPERTIES(
+    "${GDCMJASPER_SOURCE_DIR}/src/libjasper/jpc/jpc_t1cod.c"
+    PROPERTIES COMPILE_FLAGS -fno-common)
+ENDIF(APPLE)
+
+INCLUDE_DIRECTORIES(${GDCMJASPER_BINARY_DIR}/src/libjasper/include)
+INCLUDE_DIRECTORIES(${GDCMJASPER_SOURCE_DIR}/src/libjasper/include)
 GDCM_CONVENIENT_LIBRARY(base bmp jp2 jpc jpg mif pgx pnm ras) 
 
 #MESSAGE("src= ${GDCMJASPER_SOURCES}")
 ADD_LIBRARY(gdcmjasper ${GDCMJASPER_SOURCES})
-TARGET_LINK_LIBRARIES(gdcmjasper gdcmjpeg8)
+IF(HAVE_LIBJPEG)
+  TARGET_LINK_LIBRARIES(gdcmjasper gdcmjpeg8)
+ENDIF(HAVE_LIBJPEG)