diff --git a/CMakeExternals/ITK-4.5.1-gcc-4.6.patch b/CMakeExternals/ITK-4.7.1-gcc-4.6.patch similarity index 88% rename from CMakeExternals/ITK-4.5.1-gcc-4.6.patch rename to CMakeExternals/ITK-4.7.1-gcc-4.6.patch index 0b23eebcaf..c107d22c50 100644 --- a/CMakeExternals/ITK-4.5.1-gcc-4.6.patch +++ b/CMakeExternals/ITK-4.7.1-gcc-4.6.patch @@ -1,21 +1,21 @@ -diff -urNb ITK-4.5.1/Modules/ThirdParty/VNL/src/vxl/vcl/vcl_config_compiler.h.in ITK/Modules/ThirdParty/VNL/src/vxl/vcl/vcl_config_compiler.h.in ---- ITK-4.5.1/Modules/ThirdParty/VNL/src/vxl/vcl/vcl_config_compiler.h.in 2014-02-28 19:46:45.000000000 +0100 +diff -urNb ITK-4.7.1/Modules/ThirdParty/VNL/src/vxl/vcl/vcl_config_compiler.h.in ITK/Modules/ThirdParty/VNL/src/vxl/vcl/vcl_config_compiler.h.in +--- ITK-4.7.1/Modules/ThirdParty/VNL/src/vxl/vcl/vcl_config_compiler.h.in 2014-02-28 19:46:45.000000000 +0100 +++ ITK/Modules/ThirdParty/VNL/src/vxl/vcl/vcl_config_compiler.h.in 2015-02-06 01:37:50.344008518 +0100 @@ -120,7 +120,7 @@ // define VCL_CAN_STATIC_CONST_INIT_INT to either 0 or 1. //#define VCL_CAN_STATIC_CONST_INIT_INT 1 /* allowed */ -//#define VCL_CAN_STATIC_CONST_INIT_INT 0 /* not allowed */ +#define VCL_CAN_STATIC_CONST_INIT_INT 0 /* not allowed */ #ifndef VCL_CAN_STATIC_CONST_INIT_INT # define VCL_CAN_STATIC_CONST_INIT_INT @VCL_STATIC_CONST_INIT_INT@ #endif @@ -144,7 +144,7 @@ // define VCL_CAN_STATIC_CONST_INIT_FLOAT to either 0 or 1. //#define VCL_CAN_STATIC_CONST_INIT_FLOAT 1 /* allowed */ -//#define VCL_CAN_STATIC_CONST_INIT_FLOAT 0 /* not allowed */ +#define VCL_CAN_STATIC_CONST_INIT_FLOAT 0 /* not allowed */ #ifndef VCL_CAN_STATIC_CONST_INIT_FLOAT # define VCL_CAN_STATIC_CONST_INIT_FLOAT @VCL_STATIC_CONST_INIT_FLOAT@ #endif diff --git a/CMakeExternals/ITK-4.5.1.patch b/CMakeExternals/ITK-4.7.1.patch similarity index 69% rename from CMakeExternals/ITK-4.5.1.patch rename to CMakeExternals/ITK-4.7.1.patch index 4bff53ba30..fa4441dfd8 100644 --- a/CMakeExternals/ITK-4.5.1.patch +++ b/CMakeExternals/ITK-4.7.1.patch @@ -1,15 +1,15 @@ -diff -burN ITK-4.5.1/CMake/UseITK.cmake ITK/CMake/UseITK.cmake ---- ITK-4.5.1/CMake/UseITK.cmake 2014-02-28 19:46:45.000000000 +0100 -+++ ITK/CMake/UseITK.cmake 2015-01-29 14:31:00.137911666 +0100 -@@ -100,7 +100,11 @@ +diff -burN ITK-4.7.1/CMake/UseITK.cmake ITK/CMake/UseITK.cmake +--- ITK-4.7.1/CMake/UseITK.cmake 2014-02-28 19:46:45.000000000 +0100 ++++ ITK/CMake/UseITK.cmake 2015-01-29 14:31:00.137911666 +0100 +@@ -108,7 +108,11 @@ unset(LIST_OF_FACTORY_NAMES) #------------------- + if(NOT NO_DIRECTORY_SCOPED_ITK_COMPILE_DEFINITION) + # We add a target scoped compile definition in MITK manually, to avoid leaking + # the definition to other targets in the same directory or sub-directory. set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS ITK_IO_FACTORY_REGISTER_MANAGER) + endif() include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR}/ITKIOFactoryRegistration) endif() diff --git a/CMakeExternals/ITK.cmake b/CMakeExternals/ITK.cmake index 9389663998..f659ac5934 100644 --- a/CMakeExternals/ITK.cmake +++ b/CMakeExternals/ITK.cmake @@ -1,82 +1,82 @@ #----------------------------------------------------------------------------- # ITK #----------------------------------------------------------------------------- # Sanity checks if(DEFINED ITK_DIR AND NOT EXISTS ${ITK_DIR}) message(FATAL_ERROR "ITK_DIR variable is defined but corresponds to non-existing directory") endif() set(proj ITK) set(proj_DEPENDENCIES GDCM) if(MITK_USE_OpenCV) list(APPEND proj_DEPENDENCIES OpenCV) endif() if(MITK_USE_HDF5) list(APPEND proj_DEPENDENCIES HDF5) endif() set(ITK_DEPENDS ${proj}) if(NOT DEFINED ITK_DIR) set(additional_cmake_args ) if(MINGW) set(additional_cmake_args -DCMAKE_USE_WIN32_THREADS:BOOL=ON -DCMAKE_USE_PTHREADS:BOOL=OFF) endif() list(APPEND additional_cmake_args -DUSE_WRAP_ITK:BOOL=OFF ) if(MITK_USE_OpenCV) list(APPEND additional_cmake_args -DModule_ITKVideoBridgeOpenCV:BOOL=ON -DOpenCV_DIR:PATH=${OpenCV_DIR} ) endif() # Keep the behaviour of ITK 4.3 which by default turned on ITK Review # see MITK bug #17338 list(APPEND additional_cmake_args -DModule_ITKReview:BOOL=ON # for 4.7, the OpenJPEG is needed by review but the variable must be set -DModule_ITKOpenJPEG:BOOL=ON ) set(vcl_constexpr_patch) if(GCC_VERSION VERSION_LESS 4.7 AND GCC_VERSION VERSION_GREATER 4) set(vcl_constexpr_patch - COMMAND ${PATCH_COMMAND} -N -p1 -i ${CMAKE_CURRENT_LIST_DIR}/ITK-4.5.1-gcc-4.6.patch + COMMAND ${PATCH_COMMAND} -N -p1 -i ${CMAKE_CURRENT_LIST_DIR}/ITK-4.7777777.1-gcc-4.6.patch ) endif() ExternalProject_Add(${proj} LIST_SEPARATOR ${sep} URL ${MITK_THIRDPARTY_DOWNLOAD_PREFIX_URL}/InsightToolkit-4.7.1-20c0592.tar.gz URL_MD5 f778a5f0e297c06dc629c33ec45733dc # work with external GDCM - PATCH_COMMAND ${PATCH_COMMAND} -N -p1 -i ${CMAKE_CURRENT_LIST_DIR}/ITK-4.5.1.patch + PATCH_COMMAND ${PATCH_COMMAND} -N -p1 -i ${CMAKE_CURRENT_LIST_DIR}/ITK-4.7.1.patch ${vcl_constexpr_patch} CMAKE_GENERATOR ${gen} CMAKE_ARGS ${ep_common_args} ${additional_cmake_args} -DBUILD_EXAMPLES:BOOL=OFF -DITK_USE_SYSTEM_GDCM:BOOL=ON -DGDCM_DIR:PATH=${GDCM_DIR} DEPENDS ${proj_DEPENDENCIES} ) set(ITK_DIR ${ep_prefix}) mitkFunctionInstallExternalCMakeProject(${proj}) else() mitkMacroEmptyExternalProject(${proj} "${proj_DEPENDENCIES}") endif()