COMP: Hopefully this patch is the right one to get jasper to compile on macosx

diff --git a/src/gdcmjasper/CMakeLists.txt b/src/gdcmjasper/CMakeLists.txt
index 4fa764200de44fc116e5ef1662fa2324084cee4f..5298f6dc91f376a175b16295cadaeadc1a7c5366 100644 (file)
--- a/src/gdcmjasper/CMakeLists.txt
+++ b/src/gdcmjasper/CMakeLists.txt
@@ -1,10 +1,5 @@
 PROJECT(GDCMJASPER C)
 
-# Don't ask me why...
-IF(APPLE)
-  SET(CMAKE_SHARED_LINKER_FLAGS -single_module CACHE STRING "" FORCE)
-ENDIF(APPLE)
-
 #OPTION(HAVE_LIBJPEG "Do you have ijg" OFF)
 IF(GDCM_SOURCE_DIR)
   SET(HAVE_LIBJPEG ON CACHE BOOL "Do you have ijg" FORCE)

diff --git a/src/gdcmjasper/src/libjasper/CMakeLists.txt b/src/gdcmjasper/src/libjasper/CMakeLists.txt
index 33cebb74f6c7fc067c9e4279005bbcac65c2c908..cb30a24499ccd9f151f3ed55cc7ed6c0ee3760ad 100644 (file)
--- a/src/gdcmjasper/src/libjasper/CMakeLists.txt
+++ b/src/gdcmjasper/src/libjasper/CMakeLists.txt
@@ -29,6 +29,15 @@ 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)