Merge branch 'fix-build-siftfast-libsvm' into 'develop'

COMP: Fix build issue when libSVM is OFF or libsiftfast is OFF and Testing ON

Closes #1636 and #2141

See merge request !788

Modules/Feature/Descriptors/test/CMakeLists.txt

@@ -26,9 +26,12 @@ otbHistogramOfOrientedGradientCovariantImageFunction.cxx
 otbFourierMellinImageFilter.cxx
 otbImageToHessianDeterminantImageFilter.cxx
 otbFourierMellinDescriptors.cxx
-otbKeyPointsAlgorithmsTest.cxx
 )
 
+if(OTB_USE_SIFTFAST)
+  set(OTBDescriptorsTests ${OTBDescriptorsTests} otbKeyPointsAlgorithmsTest.cxx)
+endif()
+
 add_executable(otbDescriptorsTestDriver ${OTBDescriptorsTests})
 target_link_libraries(otbDescriptorsTestDriver ${OTBDescriptors-Test_LIBRARIES})
 otb_module_target_label(otbDescriptorsTestDriver)
@@ -95,7 +98,8 @@ otb_add_test(NAME feTvFourierMellinDescriptors COMMAND otbDescriptorsTestDriver
   ${TEMP}/feTvFourierMellinDescriptors.txt
   )
 
-otb_add_test(NAME feTvKeyPointsAlgorithmsTest COMMAND otbDescriptorsTestDriver
-  otbKeyPointsAlgorithmsTest
-  ${INPUTDATA}/QB_TOULOUSE_RpcTag_100_100.tif
-)
+if(OTB_USE_SIFTFAST)
+    otb_add_test(NAME feTvKeyPointsAlgorithmsTest COMMAND otbDescriptorsTestDriver
+      otbKeyPointsAlgorithmsTest
+      ${INPUTDATA}/QB_TOULOUSE_RpcTag_100_100.tif)
+endif()

Modules/Feature/Descriptors/test/otbDescriptorsTestDriver.cxx

@@ -28,5 +28,7 @@ void RegisterTests()
   REGISTER_TEST(otbFourierMellinDescriptors);
   REGISTER_TEST(otbFourierMellinDescriptorsScaleInvariant);
   REGISTER_TEST(otbFourierMellinDescriptorsRotationInvariant);
+ #ifdef OTB_USE_SIFTFAST
   REGISTER_TEST(otbKeyPointsAlgorithmsTest);
+ #endif
 }

Modules/Learning/Supervised/test/CMakeLists.txt

@@ -28,14 +28,16 @@ otbTrainMachineLearningModel.cxx
 otbImageClassificationFilter.cxx
 otbMachineLearningRegressionTests.cxx
 otbExhaustiveExponentialOptimizerTest.cxx
-otbLabelMapClassifier.cxx
-otbSVMMarginSampler.cxx
 )
 
 if(OTB_USE_SHARK)
 set(OTBSupervisedTests ${OTBSupervisedTests} otbSharkImageClassificationFilter.cxx)
 endif()
 
+if(OTB_USE_LIBSVM)
+    set(OTBSupervisedTests ${OTBSupervisedTests} otbLabelMapClassifier.cxx otbSVMMarginSampler.cxx)
+endif()
+
 add_executable(otbSupervisedTestDriver ${OTBSupervisedTests})
 target_link_libraries(otbSupervisedTestDriver ${OTBSupervised-Test_LIBRARIES})
 otb_module_target_label(otbSupervisedTestDriver)