Merge pull request #41 from jcfr/40-relax-itk-requirements

jcfr · jcfr · commit e00851314ab1 · 2015-03-01T19:57:15.000-05:00
Relax ITK version requirements. See #40
diff --git a/GenerateCLP/CMakeLists.txt b/GenerateCLP/CMakeLists.txt
@@ -41,7 +41,7 @@ include(${TCLAP_USE_FILE})
 set(${PROJECT_NAME}_ITK_COMPONENTS
   ${ModuleDescriptionParser_ITK_COMPONENTS}
   )
-find_package(ITK 4.5 COMPONENTS ${${PROJECT_NAME}_ITK_COMPONENTS} REQUIRED)
+find_package(ITK 4.3 COMPONENTS ${${PROJECT_NAME}_ITK_COMPONENTS} REQUIRED)
 set(ITK_NO_IO_FACTORY_REGISTER_MANAGER 1) # See Slicer/Libs/ITKFactoryRegistration/CMakeLists.txt
 include(${ITK_USE_FILE})
 
diff --git a/GenerateCLP/UseGenerateCLP.cmake.in b/GenerateCLP/UseGenerateCLP.cmake.in
@@ -17,7 +17,7 @@ include(${ModuleDescriptionParser_USE_FILE})
 set(${PROJECT_NAME}_ITK_COMPONENTS
   ${ModuleDescriptionParser_ITK_COMPONENTS}
   )
-find_package(ITK 4.5 COMPONENTS ${${PROJECT_NAME}_ITK_COMPONENTS} REQUIRED)
+find_package(ITK 4.3 COMPONENTS ${${PROJECT_NAME}_ITK_COMPONENTS} REQUIRED)
 # Allow other projects to specify a different list of COMPONENTS
 set(ITK_FOUND FALSE)
 
diff --git a/ModuleDescriptionParser/CMakeLists.txt b/ModuleDescriptionParser/CMakeLists.txt
@@ -37,7 +37,7 @@ set(${PROJECT_NAME}_ITK_COMPONENTS
   ITKCommon# For itksys
   ITKIOXML # For ITKEXPAT
   )
-find_package(ITK 4.5 COMPONENTS ${${PROJECT_NAME}_ITK_COMPONENTS} REQUIRED)
+find_package(ITK 4.3 COMPONENTS ${${PROJECT_NAME}_ITK_COMPONENTS} REQUIRED)
 include(${ITK_USE_FILE})
 
 #

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ include(${TCLAP_USE_FILE})`
`41`	`41`	`set(${PROJECT_NAME}_ITK_COMPONENTS`
`42`	`42`	`${ModuleDescriptionParser_ITK_COMPONENTS}`
`43`	`43`	`)`
`44`		`-find_package(ITK 4.5 COMPONENTS ${${PROJECT_NAME}_ITK_COMPONENTS} REQUIRED)`
	`44`	`+find_package(ITK 4.3 COMPONENTS ${${PROJECT_NAME}_ITK_COMPONENTS} REQUIRED)`
`45`	`45`	`set(ITK_NO_IO_FACTORY_REGISTER_MANAGER 1) # See Slicer/Libs/ITKFactoryRegistration/CMakeLists.txt`
`46`	`46`	`include(${ITK_USE_FILE})`
`47`	`47`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ include(${ModuleDescriptionParser_USE_FILE})`
`17`	`17`	`set(${PROJECT_NAME}_ITK_COMPONENTS`
`18`	`18`	`${ModuleDescriptionParser_ITK_COMPONENTS}`
`19`	`19`	`)`
`20`		`-find_package(ITK 4.5 COMPONENTS ${${PROJECT_NAME}_ITK_COMPONENTS} REQUIRED)`
	`20`	`+find_package(ITK 4.3 COMPONENTS ${${PROJECT_NAME}_ITK_COMPONENTS} REQUIRED)`
`21`	`21`	`# Allow other projects to specify a different list of COMPONENTS`
`22`	`22`	`set(ITK_FOUND FALSE)`
`23`	`23`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ set(${PROJECT_NAME}_ITK_COMPONENTS`
`37`	`37`	`ITKCommon# For itksys`
`38`	`38`	`ITKIOXML # For ITKEXPAT`
`39`	`39`	`)`
`40`		`-find_package(ITK 4.5 COMPONENTS ${${PROJECT_NAME}_ITK_COMPONENTS} REQUIRED)`
	`40`	`+find_package(ITK 4.3 COMPONENTS ${${PROJECT_NAME}_ITK_COMPONENTS} REQUIRED)`
`41`	`41`	`include(${ITK_USE_FILE})`
`42`	`42`
`43`	`43`	`#`