Merge pull request #4 from thewtex/superbuild-itk-version

ENH: Enable specification of ITK_GIT_TAG in the superbuild
InsightSoftwareConsortium · Oct 6, 2017 · 6cae7a9 · 6cae7a9
2 parents 262e9b0 + 3742c3d
commit 6cae7a9
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/CMake/CTestCustom.cmake.in b/CMake/CTestCustom.cmake.in
@@ -293,7 +293,7 @@ set(CTEST_CUSTOM_WARNING_EXCEPTION
   ".*OpenCV.*"
   ".*VTK.*"
   ".*has no symbols."
-  "ITKv4"
+  "ITK"
   "SlicerExecutionModel"
   "SimpleITK"
 
@@ -340,7 +340,7 @@ set(CTEST_CUSTOM_ERROR_EXCEPTION
   ".*OpenCV.*"
   ".*VTK.*"
   ".*has no symbols."
-  "ITKv4"
+  "ITK"
   "SlicerExecutionModel"
   "SimpleITK"
 

diff --git a/SuperBuild.cmake b/SuperBuild.cmake
@@ -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
@@ -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

diff --git a/SuperBuild/External_ITKv4.cmake → SuperBuild/External_ITK.cmake b/SuperBuild/External_ITKv4.cmake → SuperBuild/External_ITK.cmake
@@ -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}})
@@ -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}