diff --git a/CMakeExternals/GDCM.cmake b/CMakeExternals/GDCM.cmake index 0d384ba1e8..5d09b10c61 100644 --- a/CMakeExternals/GDCM.cmake +++ b/CMakeExternals/GDCM.cmake @@ -1,71 +1,71 @@ #----------------------------------------------------------------------------- # GDCM #----------------------------------------------------------------------------- # Sanity checks if(DEFINED GDCM_DIR AND NOT EXISTS ${GDCM_DIR}) message(FATAL_ERROR "GDCM_DIR variable is defined but corresponds to non-existing directory") endif() # Check if an external ITK build tree was specified. # If yes, use the GDCM from ITK, otherwise ITK will complain if(ITK_DIR) find_package(ITK) if(ITK_GDCM_DIR) set(GDCM_DIR ${ITK_GDCM_DIR}) endif() endif() set(proj GDCM) set(proj_DEPENDENCIES ) set(GDCM_DEPENDS ${proj}) if(NOT DEFINED GDCM_DIR) set(additional_args ) if(CTEST_USE_LAUNCHERS) list(APPEND additional_args "-DCMAKE_PROJECT_${proj}_INCLUDE:FILEPATH=${CMAKE_ROOT}/Modules/CTestUseLaunchers.cmake" ) endif() # On Mac some assertions fail that prevent reading certain DICOM files. Bug #19995 if(APPLE) list(APPEND additional_args "-DCMAKE_CXX_FLAGS_DEBUG:STRING=${CMAKE_CXX_FLAGS_DEBUG} -DNDEBUG" ) endif() mitk_query_custom_ep_vars() ExternalProject_Add(${proj} LIST_SEPARATOR ${sep} - URL ${MITK_THIRDPARTY_DOWNLOAD_PREFIX_URL}/gdcm-3.0.8.tar.gz - URL_MD5 29e0e60b04183e3eb9c18ad093156b2c + URL ${MITK_THIRDPARTY_DOWNLOAD_PREFIX_URL}/gdcm-3.0.10.tar.gz + URL_MD5 28c70d02c2005a8c9d2a5847c8ba3c00 CMAKE_GENERATOR ${gen} CMAKE_GENERATOR_PLATFORM ${gen_platform} CMAKE_ARGS ${ep_common_args} ${additional_args} -DGDCM_BUILD_SHARED_LIBS:BOOL=ON -DGDCM_BUILD_DOCBOOK_MANPAGES:BOOL=OFF ${${proj}_CUSTOM_CMAKE_ARGS} CMAKE_CACHE_ARGS ${ep_common_cache_args} ${${proj}_CUSTOM_CMAKE_CACHE_ARGS} CMAKE_CACHE_DEFAULT_ARGS ${ep_common_cache_default_args} ${${proj}_CUSTOM_CMAKE_CACHE_DEFAULT_ARGS} DEPENDS ${proj_DEPENDENCIES} ) set(GDCM_DIR ${ep_prefix}) mitkFunctionInstallExternalCMakeProject(${proj}) else() mitkMacroEmptyExternalProject(${proj} "${proj_DEPENDENCIES}") find_package(GDCM) endif() diff --git a/CMakeExternals/GDCM.patch b/CMakeExternals/GDCM.patch deleted file mode 100644 index 883cbcc29d..0000000000 --- a/CMakeExternals/GDCM.patch +++ /dev/null @@ -1,90 +0,0 @@ -commit 60bdeceff015258608f9d798268853ec4a76fc7d -Author: Christoph Kolb -Date: Wed May 18 12:13:37 2016 +0200 - - Prevent building man pages - -diff --git a/Utilities/doxygen/CMakeLists.txt b/Utilities/doxygen/CMakeLists.txt -index cf8f616..65608fd 100644 ---- a/Utilities/doxygen/CMakeLists.txt -+++ b/Utilities/doxygen/CMakeLists.txt -@@ -224,79 +224,3 @@ ${CMAKE_CURRENT_BINARY_DIR}/latex/Makefile - subdirs(vtk) - endif() - endif() -- --set(MANPAGES_XML -- gdcm2pnm -- gdcm2vtk -- gdcmanon -- gdcmconv -- gdcmdiff -- gdcmdump -- gdcmgendir -- gdcmimg -- gdcminfo -- gdcmpap3 -- gdcmpdf -- gdcmraw -- gdcmscanner -- gdcmscu -- gdcmtar -- gdcmviewer -- gdcmxml -- ) --find_package(LibXslt) --# need an XSLT 1.0 processor, use xsltproc, maybe add more implementations later --if(LIBXSLT_XSLTPROC_EXECUTABLE) -- set(XSLT_PROCESSOR ${LIBXSLT_XSLTPROC_EXECUTABLE}) --# http://docbook.sourceforge.net/release/xsl/current/doc/manpages/man.output.quietly.html -- set(XSLT_PROCESSOR_ARG --param man.output.quietly 1) -- # User can change the behavior at cmake time: -- if(NOT DEFINED GDCM_MANPAGES_USE_NONET) -- set(GDCM_MANPAGES_USE_NONET FALSE) -- # By default I want nonet on Debian: -- if(EXISTS /etc/xml/catalog) -- set(GDCM_MANPAGES_USE_NONET TRUE) -- endif() -- endif() -- if(GDCM_MANPAGES_USE_NONET) -- list(APPEND XSLT_PROCESSOR_ARG --nonet) -- endif() --else() -- find_program(MSXSL_EXECUTABLE -- msxsl -- ) -- if(MSXSL_EXECUTABLE) -- set(XSLT_PROCESSOR ${MSXSL_EXECUTABLE}) -- set(XSLT_PROCESSOR_ARG "-pi") --# msxsl.exe -pi gdcmimg.xml --# --#Error occurred while executing stylesheet 'http://docbook.sourceforge.net/release/xsl-ns/current/manpages/docbook.xsl'. --# --#Code: 0x80004005 --#Namespace 'http://exslt.org/common' does not contain any functions. --# -> http://stackoverflow.com/a/16605034/136285 ?? -- endif() --endif() --if(XSLT_PROCESSOR) --foreach(docbook ${MANPAGES_XML}) -- add_custom_command( -- OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${docbook}.1 -- COMMAND ${XSLT_PROCESSOR} ${XSLT_PROCESSOR_ARG} ${CMAKE_CURRENT_SOURCE_DIR}/man/${docbook}.xml -- DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/man/${docbook}.xml -- ) -- list(APPEND MANPAGES -- ${CMAKE_CURRENT_BINARY_DIR}/${docbook}.1 -- ) --endforeach() --add_custom_target(DOCBOOK_MANPAGES -- ALL -- DEPENDS ${MANPAGES} -- COMMENT "docbook manpages" -- ) --install(FILES -- ${MANPAGES} -- DESTINATION ${GDCM_INSTALL_MAN_DIR}/man1 COMPONENT DebugDevel --) --else() -- message(WARNING "Cannot build man page from docbook (need an XSL processor)") --endif()