X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2Fgdcmjasper%2Fsrc%2Flibjasper%2FCMakeLists.txt;h=9ff2d9f2058e7b97767075e878b730c4463ae383;hb=bbe839f4ab724c326fddb9c7ac156d14d9c6da26;hp=33cebb74f6c7fc067c9e4279005bbcac65c2c908;hpb=899e8669c13651e11b308af90a5454f72f5c3d5c;p=gdcm.git

diff --git a/src/gdcmjasper/src/libjasper/CMakeLists.txt b/src/gdcmjasper/src/libjasper/CMakeLists.txt
index 33cebb74..9ff2d9f2 100644
--- a/src/gdcmjasper/src/libjasper/CMakeLists.txt
+++ b/src/gdcmjasper/src/libjasper/CMakeLists.txt
@@ -23,12 +23,21 @@ MACRO(GDCM_CONVENIENT_LIBRARY)
 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
+# I'll wait until I actually see such beast as jpeg2000 + some
 # crazy 16bits lossless jpeg...
 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) 
@@ -39,4 +48,4 @@ IF(HAVE_LIBJPEG)
   TARGET_LINK_LIBRARIES(gdcmjasper gdcmjpeg8)
 ENDIF(HAVE_LIBJPEG)
 
-
+INSTALL_TARGETS(/lib/gdcm/ gdcmjasper)