diff --git a/CMake/External_ITK.cmake b/CMake/External_ITK.cmake index 17d7a5a8..b70fbe17 100644 --- a/CMake/External_ITK.cmake +++ b/CMake/External_ITK.cmake @@ -58,6 +58,14 @@ if (fletch_ENABLE_VXL) list(APPEND ITK_DEPENDS VXL) endif() +if (fletch_ENABLE_OpenCV) + list (APPEND itk_cmake_args + -DModule_ITKVideoBridgeOpenCV:BOOL=ON + -DOpenCV_DIR:PATH=${OpenCV_ROOT} + ) + list(APPEND ITK_DEPENDS OpenCV) +endif() + ExternalProject_Add(ITK DEPENDS ${ITK_DEPENDS} URL ${ITK_file} @@ -68,6 +76,8 @@ ExternalProject_Add(ITK ${COMMON_CMAKE_ARGS} ${ITK_IMG_ARGS} ${itk_cmake_args} + -DModule_PhaseSymmetry:BOOL=ON + -DModule_AnisotropicDiffusionLBR:BOOL=ON ) fletch_external_project_force_install(PACKAGE ITK) diff --git a/CMake/External_VXL.cmake b/CMake/External_VXL.cmake index cf31b442..495e02e0 100644 --- a/CMake/External_VXL.cmake +++ b/CMake/External_VXL.cmake @@ -47,16 +47,16 @@ add_package_dependency( ) set(VXL_ARGS_CONTRIB - -DBUILD_CONTRIB:BOOL=ON - -DBUILD_RPL:BOOL=ON - -DBUILD_BRL:BOOL=OFF - -DBUILD_MUL_TOOLS:BOOL=OFF - -DBUILD_PRIP:BOOL=OFF + -DVXL_BUILD_CONTRIB:BOOL=ON + -DVXL_BUILD_RPL:BOOL=ON + -DVXL_BUILD_BRL:BOOL=OFF + -DVXL_BUILD_MUL_TOOLS:BOOL=OFF + -DVXL_BUILD_PRIP:BOOL=OFF ) # Handle FFMPEG disable flag list(APPEND VXL_ARGS_VIDL - -DBUILD_CORE_VIDEO:BOOL=ON + -DVXL_BUILD_CORE_VIDEO:BOOL=ON ) if(fletch_ENABLE_FFmpeg) add_package_dependency( @@ -105,20 +105,21 @@ ExternalProject_Add(VXL ${VXL_ARGS_V3P} ${VXL_EXTRA_CMAKE_CXX_FLAGS} ${COMMON_CMAKE_ARGS} - -DBUILD_EXAMPLES:BOOL=OFF -DBUILD_TESTING:BOOL=OFF - -DBUILD_DOCUMENTATION:BOOL=OFF - -DBUILD_FOR_VXL_DASHBOARD:BOOL=ON - -DBUILD_CORE_PROBABILITY:BOOL=ON - -DBUILD_CORE_GEOMETRY:BOOL=ON - -DBUILD_CORE_NUMERICS:BOOL=ON - -DBUILD_CORE_IMAGING:BOOL=ON - -DBUILD_CORE_SERIALISATION:BOOL=ON - -DBUILD_BRL:BOOL=OFF - -DBUILD_GEL:BOOL=OFF - -DBUILD_MUL:BOOL=OFF - -DBUILD_MUL_TOOLS:BOOL=OFF - -DBUILD_TBL:BOOL=OFF + -DVXL_BUILD_EXAMPLES:BOOL=OFF + -DVXL_BUILD_DOCUMENTATION:BOOL=OFF + -DVXL_BUILD_FOR_VXL_DASHBOARD:BOOL=ON + -DVXL_BUILD_CORE_PROBABILITY:BOOL=ON + -DVXL_BUILD_CORE_GEOMETRY:BOOL=ON + -DVXL_BUILD_CORE_NUMERICS:BOOL=ON + -DVXL_BUILD_CORE_IMAGING:BOOL=ON + -DVXL_BUILD_CORE_SERIALISATION:BOOL=ON + -DVXL_BUILD_BRL:BOOL=OFF + -DVXL_BUILD_GEL:BOOL=OFF + -DVXL_BUILD_MUL:BOOL=OFF + -DVXL_BUILD_MUL_TOOLS:BOOL=OFF + -DVXL_BUILD_TBL:BOOL=OFF + -DVXL_BUILD_OXL:BOOL=OFF -DVXL_USE_DCMTK:BOOL=OFF -DJPEG_LIBRARY:FILEPATH=${JPEG_LIBRARY} -DJPEG_INCLUDE_DIR:PATH=${JPEG_INCLUDE_DIR} diff --git a/CMake/fletch-tarballs.cmake b/CMake/fletch-tarballs.cmake index 96373756..6c993797 100644 --- a/CMake/fletch-tarballs.cmake +++ b/CMake/fletch-tarballs.cmake @@ -429,17 +429,16 @@ endif() list(APPEND fletch_external_sources VTK) # VXL -set(VXL_version "0bb0ca92867408caec298cef05412ed85c6d56b7") +set(VXL_version "ecc0202f4f9eccaffa89b061e9567a20597fd10e") set(VXL_url "https://github.com/vxl/vxl/archive/${VXL_version}.zip") -set(VXL_md5 "287536149942081666a2f9a3be87a666") +set(VXL_md5 "43f59314889597ad5e84da9d023f0ee7") set(VXL_dlname "vxl-${VXL_version}.zip") list(APPEND fletch_external_sources VXL) # ITK -set(ITK_version 5.0) -set(ITK_minor b01) -set(ITK_url "https://github.com/InsightSoftwareConsortium/ITK/archive/v${ITK_version}${ITK_minor}.zip") -set(ITK_md5 "3a93ba69d3bf05258054806fab742611") +set(ITK_version "fc688e7a2c89967e3d6cbb779f87ec37a4e4750b") +set(ITK_url "https://github.com/InsightSoftwareConsortium/ITK/archive/${ITK_version}.tar.gz") +set(ITK_md5 "8f0965e5ac7828a273dfff8d3b81ff9a") set(ITK_experimental TRUE) list(APPEND fletch_external_sources ITK)