Parcourir la source

Revert "Fix DCMTK linking issue by explicitly passing fPIC flag" Closes #22

This reverts commit 4b95a9bef509e62a2d86621539829165500baa48.
Jean-Christophe Fillion-Robin il y a 13 ans
Parent
commit
d9f910a21c
1 fichiers modifiés avec 2 ajouts et 17 suppressions
  1. 2 17
      CMakeExternals/DCMTK.cmake

+ 2 - 17
CMakeExternals/DCMTK.cmake

@@ -28,21 +28,6 @@ IF(${add_project})
         -DCMAKE_OSX_SYSROOT=${CMAKE_OSX_SYSROOT}
         -DCMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET})
     endif()
-    
-    #-----------------------------------------------------------------------------
-    # HACK Waiting upstream DCMTK is fixed, specify -fPIC here.
-    #      See http://public.kitware.com/pipermail/ctk-developers/2011-August/000725.html
-    #-----------------------------------------------------------------------------
-    set(dcmtk_cxx_flags ${ep_common_cxx_flags})
-    set(dcmtk_c_flags ${ep_common_c_flags})
-    # To fix compilation problem: relocation R_X86_64_32 against `a local symbol' can not be
-    # used when making a shared object; recompile with -fPIC
-    # See http://www.cmake.org/pipermail/cmake/2007-May/014350.html
-    #
-    IF(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-      set(dcmtk_cxx_flags "${ep_common_cxx_flags} -fPIC")
-      set(dcmtk_c_flags "${ep_common_c_flags} -fPIC")
-    ENDIF()
 
     ExternalProject_Add(${proj}
       SOURCE_DIR ${CMAKE_BINARY_DIR}/${proj}
@@ -54,8 +39,8 @@ IF(${add_project})
       BUILD_COMMAND ""
       CMAKE_ARGS
         -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
-        -DCMAKE_CXX_FLAGS:STRING=${dcmtk_cxx_flags}
-        -DCMAKE_C_FLAGS:STRING=${dcmtk_c_flags}
+        -DCMAKE_CXX_FLAGS:STRING=${ep_common_cxx_flags}
+        -DCMAKE_C_FLAGS:STRING=${ep_common_c_flags}
         -DCMAKE_INSTALL_PREFIX:PATH=${ep_install_dir}
         ${CMAKE_OSX_EXTERNAL_PROJECT_ARGS}
         -DBUILD_TESTING:BOOL=OFF