Skip to content

Commit

Permalink
COMP: set parameters to v5 in cmake
Browse files Browse the repository at this point in the history
  • Loading branch information
stnava committed Jun 5, 2018
1 parent 99cf908 commit fbda36c
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions CTestCustom.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,7 @@ set(CTEST_CUSTOM_WARNING_EXCEPTION
".*OpenCV.*"
".*VTK.*"
".*has no symbols."
"ITKv4"
"ITKv5"
"SlicerExecutionModel"
"SimpleITK"

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

Expand Down
2 changes: 1 addition & 1 deletion Common.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ set(ANTS_BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS})
# endif("${isSystemDir}" STREQUAL "-1")
#####################################################################################################

set(USE_ITKv4 ON)
set(USE_ITKv5 ON)
set(ITK_VERSION_MAJOR 5 CACHE STRING "Choose the expected ITK major version to build ANTS only version 5 allowed.")
# Set the possible values of ITK major version for cmake-gui
set_property(CACHE ITK_VERSION_MAJOR PROPERTY STRINGS "5")
Expand Down
2 changes: 1 addition & 1 deletion SuperBuild/External_ITKv5.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,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 ITKv5) #This local name
set(${extProjName}_REQUIRED_VERSION ${${extProjName}_VERSION_MAJOR}) #If a required version is necessary, then set this, else leave blank

#if(${USE_SYSTEM_${extProjName}})
Expand Down

0 comments on commit fbda36c

Please sign in to comment.