diff --git a/CMakeExternals/DCMTK.cmake b/CMakeExternals/DCMTK.cmake index 3486a1a565..40e4958e87 100644 --- a/CMakeExternals/DCMTK.cmake +++ b/CMakeExternals/DCMTK.cmake @@ -1,56 +1,62 @@ #----------------------------------------------------------------------------- # DCMTK #----------------------------------------------------------------------------- IF(MITK_USE_DCMTK) # Sanity checks IF(DEFINED DCMTK_DIR AND NOT EXISTS ${DCMTK_DIR}) MESSAGE(FATAL_ERROR "DCMTK_DIR variable is defined but corresponds to non-existing directory") ENDIF() SET(proj DCMTK) SET(proj_DEPENDENCIES ) SET(DCMTK_DEPENDS ${proj}) IF(NOT DEFINED DCMTK_DIR) + + SET(revision_tag ae3b946f) + #IF(${proj}_REVISION_TAG) + # SET(revision_tag ${${proj}_REVISION_TAG}) + #ENDIF() + IF(UNIX) SET(DCMTK_CXX_FLAGS "-fPIC") SET(DCMTK_C_FLAGS "-fPIC") ENDIF(UNIX) IF(DCMTK_DICOM_ROOT_ID) SET(DCMTK_CXX_FLAGS "${DCMTK_CXX_FLAGS} -DSITE_UID_ROOT=\\\"${DCMTK_DICOM_ROOT_ID}\\\"") SET(DCMTK_C_FLAGS "${DCMTK_CXX_FLAGS} -DSITE_UID_ROOT=\\\"${DCMTK_DICOM_ROOT_ID}\\\"") ENDIF() ExternalProject_Add(${proj} SOURCE_DIR ${CMAKE_BINARY_DIR}/${proj}-src BINARY_DIR ${proj}-build PREFIX ${proj}-cmake - URL ${MITK_THIRDPARTY_DOWNLOAD_PREFIX_URL}/dcmtk-3.6.0.tar.gz - URL_MD5 19409e039e29a330893caea98715390e + URL ${MITK_THIRDPARTY_DOWNLOAD_PREFIX_URL}/dcmtk-3.6.1_20120222.tar.gz + URL_MD5 86fa9e0f91e4e0c6b44d513ea48391d6 INSTALL_DIR ${proj}-install - PATCH_COMMAND ${CMAKE_COMMAND} -DTEMPLATE_FILE:FILEPATH=${MITK_SOURCE_DIR}/CMakeExternals/EmptyFileForPatching.dummy -P ${MITK_SOURCE_DIR}/CMakeExternals/PatchDCMTK-3.6.cmake CMAKE_GENERATOR ${gen} CMAKE_ARGS ${ep_common_args} -DDCMTK_OVERWRITE_WIN32_COMPILER_FLAGS:BOOL=OFF -DBUILD_SHARED_LIBS:BOOL=OFF "-DCMAKE_CXX_FLAGS:STRING=${ep_common_CXX_FLAGS} ${DCMTK_CXX_FLAGS}" "-DCMAKE_C_FLAGS:STRING=${ep_common_C_FLAGS} ${DCMTK_C_FLAGS}" -DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_CURRENT_BINARY_DIR}/${proj}-install + -DDCMTK_WITH_DOXYGEN:BOOL=OFF -DDCMTK_WITH_ZLIB:BOOL=OFF # see bug #9894 -DDCMTK_WITH_OPENSSL:BOOL=OFF # see bug #9894 -DDCMTK_WITH_PNG:BOOL=OFF # see bug #9894 -DDCMTK_WITH_TIFF:BOOL=OFF # see bug #9894 -DDCMTK_WITH_XML:BOOL=OFF # see bug #9894 -DDCMTK_FORCE_FPIC_ON_UNIX:BOOL=ON DEPENDS ${proj_DEPENDENCIES} ) SET(DCMTK_DIR ${CMAKE_CURRENT_BINARY_DIR}/${proj}-install) ELSE() mitkMacroEmptyExternalProject(${proj} "${proj_DEPENDENCIES}") ENDIF() ENDIF() diff --git a/CMakeExternals/PatchDCMTK-3.6.cmake b/CMakeExternals/PatchDCMTK-3.6.cmake deleted file mode 100644 index 88a21613de..0000000000 --- a/CMakeExternals/PatchDCMTK-3.6.cmake +++ /dev/null @@ -1,15 +0,0 @@ -# Called by DCMTK.cmake (ExternalProject_Add) as a patch for DCMTK. -# Makes pdf2dcm use "DOC" as modality for Encapsulated PDFs - -#message ("Patching dcmdata/apps/pdf2dcm.cc to use modality 'DOC'. Using template ${TEMPLATE_FILE}") - -# read whole file -file(STRINGS dcmdata/apps/pdf2dcm.cc sourceCode NEWLINE_CONSUME) - -# substitute "OT" for "DOC" (only single occurence where modality tag is set) -string(REGEX REPLACE "\"OT\"" "\"DOC\"" sourceCode ${sourceCode}) - -# set variable CONTENTS, which is substituted in TEMPLATE_FILE -set(CONTENTS ${sourceCode}) -configure_file(${TEMPLATE_FILE} dcmdata/apps/pdf2dcm.cc @ONLY) -