Skip to content

Update VXL and ITK #479

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mattdawkins wants to merge 22 commits into
base: master
Choose a base branch
from
Open

Update VXL and ITK #479

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
c7baf3f
Update ITK minor version
mattdawkins Dec 28, 2018
3a8f940
Update path
mattdawkins Dec 28, 2018
345ea8a
Update vxl version
mattdawkins Dec 28, 2018
72b34f6
Enable modules
mattdawkins Dec 28, 2018
d265038
Adjust flags for latest VXL changes
mattdawkins Dec 28, 2018
13fc389
Patch ffmpeg issue
mattdawkins Dec 28, 2018
14007ca
Cleanup patch
mattdawkins Dec 28, 2018
814e90a
Modify patch
mattdawkins Dec 29, 2018
3fd0d00
Update hash
mattdawkins Feb 8, 2019
f1806c1
Disable OXL
mattdawkins Feb 11, 2019
7bbea9b
Add link to opencv if enabled
mattdawkins Feb 27, 2019
167a711
Fix OpenCV ITK depends
Cookt2 Apr 10, 2019
d5bbf06
Add patch for windows linking issues
mattdawkins Feb 11, 2019
2d5bd16
Update patch
mattdawkins Feb 11, 2019
ceb5260
Update ITK hash
mattdawkins Jul 12, 2019
de998cc
Update hash
mattdawkins Jul 12, 2019
ac4e6a6
Revert "Update patch"
mattdawkins Jul 22, 2019
ed3ef1a
Revert "Add patch for windows linking issues"
mattdawkins Jul 22, 2019
a411b4e
Revert "Modify patch"
mattdawkins Jul 22, 2019
b6c35bc
Revert "Cleanup patch"
mattdawkins Jul 22, 2019
31df308
Revert "Patch ffmpeg issue"
mattdawkins Jul 22, 2019
ebe73e0
Peg the vxl hash to today's master
dstoup Jul 17, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions CMake/External_ITK.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand All @@ -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)
Expand Down
39 changes: 20 additions & 19 deletions CMake/External_VXL.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down Expand Up @@ -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}
Expand Down
11 changes: 5 additions & 6 deletions CMake/fletch-tarballs.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down