Skip to content

ENH: Enable specification of ITK_GIT_TAG in the superbuild #4

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

Merged
merged 1 commit into from
Oct 6, 2017
Merged

ENH: Enable specification of ITK_GIT_TAG in the superbuild #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions CMake/CTestCustom.cmake.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@ set(CTEST_CUSTOM_WARNING_EXCEPTION
".*OpenCV.*"
".*VTK.*"
".*has no symbols."
"ITKv4"
"ITK"
"SlicerExecutionModel"
"SimpleITK"

Expand Down Expand Up @@ -340,7 +340,7 @@ set(CTEST_CUSTOM_ERROR_EXCEPTION
".*OpenCV.*"
".*VTK.*"
".*has no symbols."
"ITKv4"
"ITK"
"SlicerExecutionModel"
"SimpleITK"

Expand Down
6 changes: 3 additions & 3 deletions SuperBuild.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ option(USE_SYSTEM_ITK "Build using an externally defined version of ITK" OFF)


## for i in SuperBuild/*; do echo $i |sed 's/.*External_\([a-zA-Z]*\).*/\1/g'|fgrep -v cmake|fgrep -v Template; done|sort -u
set(${PRIMARY_PROJECT_NAME}_DEPENDENCIES ITKv4)
set(${PRIMARY_PROJECT_NAME}_DEPENDENCIES ITK)

#-----------------------------------------------------------------------------
# Define Superbuild global variables
Expand Down Expand Up @@ -166,8 +166,8 @@ list(APPEND ${CMAKE_PROJECT_NAME}_SUPERBUILD_EP_VARS
)

if( NOT ${USE_SYSTEM_ITK} )
set(ITK_SOURCE_DIR ${CMAKE_CURRENT_BINARY_DIR}/ITKv4 )
set(ITK_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/ITKv4-build )
set(ITK_SOURCE_DIR ${CMAKE_CURRENT_BINARY_DIR}/ITK )
set(ITK_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/ITK-build )
else()
find_path(ITK_BINARY_DIR UseITK.cmake
../ITK-build
Expand Down
6 changes: 4 additions & 2 deletions SuperBuild/External_ITKv4.cmake → SuperBuild/External_ITK.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ ProjectDependancyPush(CACHED_proj ${proj})
# even if other External_${ExtProjName}.cmake files are sourced by
# SlicerMacroCheckExternalProjectDependency
set(extProjName ITK) #The find_package known name
set(proj ITKv4) #This local name
set(proj ITK) #This local name
set(${extProjName}_REQUIRED_VERSION 4) #If a required version is necessary, then set this, else leave blank

#if(${USE_SYSTEM_${extProjName}})
Expand Down Expand Up @@ -104,7 +104,9 @@ if(NOT ( DEFINED "${extProjName}_DIR" OR ( DEFINED "USE_SYSTEM_${extProjName}" A
### --- End Project specific additions
set(${proj}_REPOSITORY ${git_protocol}://itk.org/ITK.git)
# ITK release 2017-09-12
set(${proj}_GIT_TAG "v4.12.2")
if("${${proj}_GIT_TAG}" STREQUAL "")
set(${proj}_GIT_TAG "v4.12.2")
endif()

ExternalProject_Add(${proj}
GIT_REPOSITORY ${${proj}_REPOSITORY}
Expand Down