ENH : clean CMakeLists

Code/IO/otbTerraSarImageMetadataInterface.h

@@ -29,8 +29,8 @@
 #include "otbMetaDataKey.h"
 #include "otbImageKeywordlist.h"
 #include "itkImageBase.h"
-#include <otb/Noise.h>
-#include <otb/IncidenceAngles.h>
+#include <ossim/otb/Noise.h>
+#include <ossim/otb/IncidenceAngles.h>
 #include <string>
 
 namespace otb

Examples/OBIA/CMakeLists.txt

@@ -19,8 +19,8 @@ TARGET_LINK_LIBRARIES(LabelMapToVectorData OTBCommon OTBIO OTBBasicFilters ${OTB
 IF( NOT OTB_DISABLE_CXX_TESTING AND BUILD_TESTING )
 
 SET(BASELINE ${OTB_DATA_ROOT}/Baseline/Examples/OBIA)
-
 SET(INPUTDATA ${OTB_DATA_ROOT}/Examples)
+
 #Remote sensing images (large images )
 IF(OTB_DATA_USE_LARGEINPUT)
   SET(INPUTLARGEDATA ${OTB_DATA_LARGEINPUT_ROOT} )
@@ -55,7 +55,7 @@ ADD_TEST(trTeOBIAShapeAttributeComputationTest ${EXE_TESTS}
 ADD_TEST(trTeOBIARadiometricAttributesLabelMapFilterTest ${EXE_TESTS}
 	--compare-image ${TOL}	${BASELINE}/OBIARadiometricAttributes.tif
 	                        ${TEMP}/OBIARadiometricAttributes.tif
-	OBIARadiometricAttributesTest
+	RadiometricAttributesLabelMapFilterExample
 	${INPUTDATA}/qb_RoadExtract2.tif  
 	${TEMP}/OBIARadiometricAttributes.tif
 	STATS::Ndvi::Mean

Examples/OBIA/otbOBIAExamplesTests.cxx

@@ -27,7 +27,7 @@ void RegisterTests()
 {
   REGISTER_TEST(OBIAImageToLabelToImageTest);
   REGISTER_TEST(OBIAShapeAttributeComputationTest);
-  REGISTER_TEST(OBIARadiometricAttributesTest);
+  REGISTER_TEST(RadiometricAttributesLabelMapFilterExample);
   REGISTER_TEST(LabelMapToVectorDataTest);
 }
 
@@ -40,7 +40,7 @@ void RegisterTests()
 #include "ShapeAttributeComputation.cxx"
 
 #undef main
-#define main OBIARadiometricAttributesTest
+#define main RadiometricAttributesLabelMapFilterExample
 #include "otbRadiometricAttributesLabelMapFilterExample.cxx"
 
 #undef main

Examples/Projections/CMakeLists.txt

@@ -53,6 +53,7 @@ SET(EXE_TESTS ${CXX_TEST_PATH}/otbProjectionsExamplesTests)
 SET(EXE_TESTS2 ${CXX_TEST_PATH}/otbProjectionsExamplesTests2)
 
 SET(TOL 0.0)
+SET(EPSILON_4 0.0001)
 
 IF(OTB_DATA_USE_LARGEINPUT)
 ADD_TEST(prTeOrthoRectificationExampleTest ${EXE_TESTS}
@@ -115,11 +116,11 @@ ENDIF(OTB_DATA_USE_LARGEINPUT)
 IF(OTB_DATA_USE_LARGEINPUT)
 #TODO change the example by using a SPOT4 roamnia
 ADD_TEST(prTvEstimateRPCSensorModelExampleTest ${EXE_TESTS}
-  --compare-ascii ${EPSILON_4} 
+         --compare-ascii ${EPSILON_4} 
          ${BASELINE}/otbGCPsToRPCSensorModelImageFilterWithoutDEMOutput.txt
          ${TEMP}/otbGCPsToRPCSensorModelImageFilterWithoutDEMOutput.txt
-         EstimateRPCSensorModelExampleTest
-	 ${LARGEINPUT}/SPOT4/RIO_DE_JANEIRO/IMAG_01.DAT
+    EstimateRPCSensorModelExample
+	 ${INPUTLARGEDATA}/SPOT4/RIO_DE_JANEIRO/IMAG_01.DAT
 	 ${TEMP}/otbGCPsToRPCSensorModelImageFilterWithoutDEMOutput.txt
 	 1199 1259 -22.76847 -43.168043 0.
 	 1497 727  -22.688931 -43.066686 0.

Examples/Projections/otbProjectionsExamplesTests.cxx

@@ -29,6 +29,7 @@ void RegisterTests()
   REGISTER_TEST(OrthoRectificationExampleTest);
   REGISTER_TEST(MapProjectionExampleTest);
   REGISTER_TEST(VectorDataProjectionExampleTest);
+  REGISTER_TEST(EstimateRPCSensorModelExample);
 }
 
 #undef main
@@ -43,4 +44,6 @@ void RegisterTests()
 #define main VectorDataProjectionExampleTest
 #include "VectorDataProjectionExample.cxx"
 
-
+#undef main
+#define main EstimateRPCSensorModelExample
+#include "EstimateRPCSensorModelExample.cxx"

Examples/Projections/otbProjectionsExamplesTests2.cxx

@@ -29,7 +29,6 @@ void RegisterTests()
 {
   REGISTER_TEST(PlaceNameToLonLatExampleTest);
   REGISTER_TEST(CoordinateToNameExampleTest);
-  REGISTER_TEST(EstimateRPCSensorModelExampleTest);
 }
 
 #undef main
@@ -39,7 +38,3 @@ void RegisterTests()
 #undef main
 #define main CoordinateToNameExampleTest
 #include "CoordinateToNameExample.cxx"
-
-#undef main
-#define main EstimateRPCSensorModelExampleTest
-#include "EstimateRPCSensorModelExample.cxx"

Testing/Code/Projections/otbVectorDataExtractROIandProjection.cxx

@@ -80,7 +80,7 @@ int otbVectorDataExtractROIandProjection(int argc, char * argv[])
 
   unsigned int elementsKeptAfterProj = extractROI->GetOutput()->Size();
   std::cout << "After projection: kept " << elementsKeptAfterProj << " features." << std::endl;
-
+  
   extractROI->SetInput(reader->GetOutput());
   extractROI->Update();