From 873d15bfde95820b5c1e91ee2e303dc46becef96 Mon Sep 17 00:00:00 2001 From: malaterre Date: Sat, 11 Jun 2005 15:24:36 +0000 Subject: [PATCH] COMP: Hopefully this patch is the right one to get jasper to compile on macosx --- src/gdcmjasper/CMakeLists.txt | 5 ----- src/gdcmjasper/src/libjasper/CMakeLists.txt | 9 +++++++++ 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/gdcmjasper/CMakeLists.txt b/src/gdcmjasper/CMakeLists.txt index 4fa76420..5298f6dc 100644 --- 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 33cebb74..cb30a244 100644 --- 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) -- 2.49.0