Merge pull request #30 from blowekamp/FixITKVersionForGTest

jbvimort · web-flow · commit c3dfd2ae9c0a · 2017-07-31T15:27:41.000-04:00
Fix itk version required for GTest
diff --git a/itk-module.cmake b/itk-module.cmake
@@ -10,7 +10,7 @@ file(READ "${MY_CURRENT_DIR}/README.rst" DOCUMENTATION)
 # By convention those modules outside of ITK are not prefixed with
 # ITK.
 
-if( NOT "${ITK_VERSION_MAJOR}.${ITK_VERSION_MINOR}" VERSION_LESS "4.12" )
+if( NOT "${ITK_VERSION_MAJOR}.${ITK_VERSION_MINOR}" VERSION_LESS "4.13" )
   set(_GoogleTest_DEPENDS ITKGoogleTest)
 endif()
 
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -251,7 +251,7 @@ itk_add_test(NAME itkFirstOrderTextureFeaturesImageFilterTest1
           5
       )
 
-if( NOT "${ITK_VERSION_MAJOR}.${ITK_VERSION_MINOR}" VERSION_LESS "4.12" )
+if( NOT "${ITK_VERSION_MAJOR}.${ITK_VERSION_MINOR}" VERSION_LESS "4.13" )
   set(TextureFeaturesGTests
     itkFirstOrderTextureFeaturesImageFilterGTest.cxx
     )
diff --git a/test/itkFirstOrderTextureFeaturesImageFilterGTest.cxx b/test/itkFirstOrderTextureFeaturesImageFilterGTest.cxx
@@ -40,7 +40,7 @@ out << "entropy: " << p[7] << std::endl;
 
 }
 
-TEST(TextTureFeatures, FirstOrder_Test1)
+TEST(TextureFeatures, FirstOrder_Test1)
 {
   const unsigned int ImageDimension = 2;
   typedef itk::Image<float, ImageDimension >                    ImageType;
@@ -110,7 +110,7 @@ TEST(TextTureFeatures, FirstOrder_Test1)
 }
 
 
-TEST(TextTureFeatures, FirstOrder_Test2)
+TEST(TextureFeatures, FirstOrder_Test2)
 {
   const unsigned int ImageDimension = 2;
   typedef itk::Image<float, ImageDimension >                    ImageType;

Original file line number	Diff line number	Diff line change
`@@ -251,7 +251,7 @@ itk_add_test(NAME itkFirstOrderTextureFeaturesImageFilterTest1`
`251`	`251`	`5`
`252`	`252`	`)`
`253`	`253`
`254`		`-if( NOT "${ITK_VERSION_MAJOR}.${ITK_VERSION_MINOR}" VERSION_LESS "4.12" )`
	`254`	`+if( NOT "${ITK_VERSION_MAJOR}.${ITK_VERSION_MINOR}" VERSION_LESS "4.13" )`
`255`	`255`	`set(TextureFeaturesGTests`
`256`	`256`	`itkFirstOrderTextureFeaturesImageFilterGTest.cxx`
`257`	`257`	`)`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ out << "entropy: " << p[7] << std::endl;`
`40`	`40`
`41`	`41`	`}`
`42`	`42`
`43`		`-TEST(TextTureFeatures, FirstOrder_Test1)`
	`43`	`+TEST(TextureFeatures, FirstOrder_Test1)`
`44`	`44`	`{`
`45`	`45`	`const unsigned int ImageDimension = 2;`
`46`	`46`	`typedef itk::Image<float, ImageDimension > ImageType;`
`@@ -110,7 +110,7 @@ TEST(TextTureFeatures, FirstOrder_Test1)`
`110`	`110`	`}`
`111`	`111`
`112`	`112`
`113`		`-TEST(TextTureFeatures, FirstOrder_Test2)`
	`113`	`+TEST(TextureFeatures, FirstOrder_Test2)`
`114`	`114`	`{`
`115`	`115`	`const unsigned int ImageDimension = 2;`
`116`	`116`	`typedef itk::Image<float, ImageDimension > ImageType;`