Commit 3afe5ec3 authored by Thomas Feuvrier's avatar Thomas Feuvrier

ENH: Add Checking cpp source file process (macro OTB_ADD_EXECUTABLE) activate...

ENH: Add Checking cpp source file process (macro OTB_ADD_EXECUTABLE) activate by setting OTB_CPP_CHECK_SOURCE_FILE ON. Set OTB_CPP_CHECK_PROG to cppcheck program.
parent 5013d4ac
......@@ -762,6 +762,33 @@ IF(OTB_COMPILE_WITH_FULL_WARNING)
ENDIF(OTB_COMPILE_WITH_FULL_WARNING)
OPTION(OTB_CPP_CHECK_SOURCE_FILE "OTB developers : Checking cpp source file (use only for otb developers)." OFF)
MARK_AS_ADVANCED(OTB_CPP_CHECK_SOURCE_FILE)
IF(OTB_CPP_CHECK_SOURCE_FILE)
FIND_PROGRAM(OTB_CPP_CHECK_PROG "")
ENDIF(OTB_CPP_CHECK_SOURCE_FILE)
FUNCTION(OTB_ADD_EXECUTABLE name sources libraries)
# MESSAGE(STATUS "name: ${name}")
# MESSAGE(STATUS "sources: ${sources}")
# MESSAGE(STATUS "libraries: ${libraries}")
ADD_EXECUTABLE(${name} ${sources})
TARGET_LINK_LIBRARIES(${name} ${libraries})
IF(OTB_CPP_CHECK_SOURCE_FILE)
# SET_TARGET_PROPERTIES(otbBasicFiltersTests1 PROPERTIES "OTBBasicFilters")
# ADD_DEPENDENCIES(otbBasicFiltersTests1 OTBBasicFilters)
FOREACH( file ${sources})
ADD_CUSTOM_COMMAND( TARGET ${name}
PRE_BUILD
COMMAND ${OTB_CPP_CHECK_PROG}
ARGS ${CMAKE_CURRENT_SOURCE_DIR}/${file}
DEPENDS ${libraries}
COMMENT "============== C++ checking ${file} source file... =================="
VERBATIM )
ENDFOREACH(file)
ENDIF(OTB_CPP_CHECK_SOURCE_FILE)
ENDFUNCTION(OTB_ADD_EXECUTABLE)
#-----------------------------------------------------------------------------
# Advanced option to avoid recompiling utilities at each cmake reconfiguration
......
......@@ -34,6 +34,7 @@ class ITK_EXPORT BinaryImageToDensityImageFilter
: public itk::ImageToImageFilter<TInputImage,TOutputImage >
{
public:
/** Standard typedefs */
typedef BinaryImageToDensityImageFilter Self;
typedef itk::ImageToImageFilter<TInputImage,TOutputImage> Superclass;
......
......@@ -67,9 +67,7 @@ public:
* 37 : Angstrom value "440-870Angstrom"
* 44 : Solar zenith angle "Solar_Zenith_Angle"
* The datas start in the line number 6.
*
* Aeronet files can be download here: http://aeronet.gsfc.nasa.gov/cgi-bin/webtool_opera_v2_new
*
*
* \sa AeronetData
*/
class ITK_EXPORT AeronetFileReader : public itk::ProcessObject
......
......@@ -1587,6 +1587,7 @@ ADD_TEST(bfTvImageAndVectorImageOperationFilterTest ${BASICFILTERS_TESTS12}
# A enrichir
SET(BasicFilters_SRCS1
otbBasicFiltersTests1.cxx
otbLeeFilter.cxx
#otbFrostFilterTest.cxx
otbFrostFilterNew.cxx
......@@ -1603,6 +1604,7 @@ otbMeanFunctorImageTest.cxx
# A enrichir
SET(BasicFilters_SRCS2
otbBasicFiltersTests2.cxx
otbLogPolarTransformNew.cxx
otbLogPolarTransform.cxx
otbLogPolarTransformResample.cxx
......@@ -1617,6 +1619,7 @@ otbSpatialObjectToImageDrawingFilter.cxx
# A enrichir
SET(BasicFilters_SRCS3
otbBasicFiltersTests3.cxx
otbImportGeoInformationImageFilterNew.cxx
otbImportGeoInformationImageFilter.cxx
otbImportGeoInformationImageFilterWithKeywordList.cxx
......@@ -1632,6 +1635,7 @@ otbImageListToVectorImageFilter.cxx
# A enrichir
SET(BasicFilters_SRCS4
otbBasicFiltersTests4.cxx
otbImageListToImageListApplyFilterNew.cxx
otbImageListToImageListApplyFilter.cxx
otbPerBandVectorImageFilterNew.cxx
......@@ -1645,6 +1649,7 @@ otbVectorImageTo3DScalarImageFilter.cxx
# A enrichir
SET(BasicFilters_SRCS5
otbBasicFiltersTests5.cxx
otbStreamingResampleImageFilterNew.cxx
otbStreamingResampleImageFilter.cxx
otbStreamingResampleImageFilterCompareWithITK.cxx
......@@ -1662,6 +1667,7 @@ otbPrintableImageFilterWithMask.cxx
# A enrichir
SET(BasicFilters_SRCS6
otbBasicFiltersTests6.cxx
otbBSplineDecompositionImageFilterNew.cxx
otbBSplineDecompositionImageFilter.cxx
otbBSplineInterpolateImageFunctionNew.cxx
......@@ -1677,6 +1683,7 @@ otbWindowedSincInterpolateImageHammingFunction.cxx
# A enrichir
SET(BasicFilters_SRCS7
otbBasicFiltersTests7.cxx
otbWindowedSincInterpolateImageCosineFunctionNew.cxx
otbWindowedSincInterpolateImageCosineFunction.cxx
otbWindowedSincInterpolateImageWelchFunctionNew.cxx
......@@ -1694,6 +1701,7 @@ otbVectorImageToIntensityImageFilter.cxx
# A enrichir
SET(BasicFilters_SRCS8
otbBasicFiltersTests8.cxx
otbLabelizeConnectedThresholdImageFilterNew.cxx
otbLabelizeConnectedThresholdImageFilter.cxx
otbLabelizeNeighborhoodConnectedImageFilterNew.cxx
......@@ -1717,6 +1725,7 @@ otbFlexibleDistanceWithMissingValue.cxx
# A enrichir
SET(BasicFilters_SRCS9
otbBasicFiltersTests9.cxx
otbContinuousMinimumMaximumImageCalculatorNew.cxx
otbContinuousMinimumMaximumImageCalculatorTest.cxx
otbMeanShiftImageFilterNew.cxx
......@@ -1735,6 +1744,7 @@ otbEdgeDensityImageFilter.cxx
# A enrichir
SET(BasicFilters_SRCS10
otbBasicFiltersTests10.cxx
otbScalarImageTextureFunctorNew.cxx
otbScalarImageTextureFunctor.cxx
otbScalarVectorImageTextureFunctorNew.cxx
......@@ -1758,6 +1768,7 @@ otbCompareOverlapSaveAndClassicalConvolutionWithGaborFilter.cxx
ENDIF(USE_FFTWD)
SET(BasicFilters_SRCS11
otbBasicFiltersTests11.cxx
otbExtractROIResample.cxx
#otbPointSetFunctionNew.cxx
otbPointSetDensityFunctionNew.cxx
......@@ -1784,6 +1795,7 @@ otbListSampleToHistogramListGenerator.cxx
)
SET(BasicFilters_SRCS12
otbBasicFiltersTests12.cxx
otbEdgeDetectorImageFilter.cxx
otbEdgeDetectorImageFilterNew.cxx
otbChangeLabelImageFilterNew.cxx
......@@ -1796,40 +1808,18 @@ otbImageAndVectorImageOperationFilterTest.cxx
INCLUDE_DIRECTORIES(${OTB_SOURCE_DIR}/Testing/Code)
ADD_EXECUTABLE(otbBasicFiltersTests1 otbBasicFiltersTests1.cxx ${BasicFilters_SRCS1})
TARGET_LINK_LIBRARIES(otbBasicFiltersTests1 OTBBasicFilters OTBIO OTBTesting)
OTB_ADD_EXECUTABLE(otbBasicFiltersTests1 "${BasicFilters_SRCS1}" "OTBBasicFilters;OTBIO;OTBTesting")
OTB_ADD_EXECUTABLE(otbBasicFiltersTests2 "${BasicFilters_SRCS2}" "OTBBasicFilters;OTBIO;OTBTesting")
OTB_ADD_EXECUTABLE(otbBasicFiltersTests3 "${BasicFilters_SRCS3}" "OTBBasicFilters;OTBIO;OTBTesting")
OTB_ADD_EXECUTABLE(otbBasicFiltersTests4 "${BasicFilters_SRCS4}" "OTBBasicFilters;OTBIO;OTBTesting")
OTB_ADD_EXECUTABLE(otbBasicFiltersTests5 "${BasicFilters_SRCS5}" "OTBBasicFilters;OTBIO;OTBTesting")
OTB_ADD_EXECUTABLE(otbBasicFiltersTests6 "${BasicFilters_SRCS6}" "OTBBasicFilters;OTBIO;OTBTesting")
OTB_ADD_EXECUTABLE(otbBasicFiltersTests7 "${BasicFilters_SRCS7}" "OTBBasicFilters;OTBIO;OTBTesting")
OTB_ADD_EXECUTABLE(otbBasicFiltersTests8 "${BasicFilters_SRCS8}" "OTBBasicFilters;OTBIO;OTBTesting")
OTB_ADD_EXECUTABLE(otbBasicFiltersTests9 "${BasicFilters_SRCS9}" "OTBBasicFilters;OTBIO;OTBTesting")
OTB_ADD_EXECUTABLE(otbBasicFiltersTests10 "${BasicFilters_SRCS10}" "OTBBasicFilters;OTBIO;OTBTesting")
OTB_ADD_EXECUTABLE(otbBasicFiltersTests11 "${BasicFilters_SRCS11}" "OTBBasicFilters;ITKAlgorithms;OTBIO;OTBTesting")
OTB_ADD_EXECUTABLE(otbBasicFiltersTests12 "${BasicFilters_SRCS12}" "OTBBasicFilters;ITKAlgorithms;OTBIO;OTBTesting")
ADD_EXECUTABLE(otbBasicFiltersTests2 otbBasicFiltersTests2.cxx ${BasicFilters_SRCS2})
TARGET_LINK_LIBRARIES(otbBasicFiltersTests2 OTBBasicFilters OTBIO OTBTesting)
ADD_EXECUTABLE(otbBasicFiltersTests3 otbBasicFiltersTests3.cxx ${BasicFilters_SRCS3})
TARGET_LINK_LIBRARIES(otbBasicFiltersTests3 OTBBasicFilters OTBIO OTBTesting)
ADD_EXECUTABLE(otbBasicFiltersTests4 otbBasicFiltersTests4.cxx ${BasicFilters_SRCS4})
TARGET_LINK_LIBRARIES(otbBasicFiltersTests4 OTBBasicFilters OTBIO OTBTesting)
ADD_EXECUTABLE(otbBasicFiltersTests5 otbBasicFiltersTests5.cxx ${BasicFilters_SRCS5})
TARGET_LINK_LIBRARIES(otbBasicFiltersTests5 OTBBasicFilters OTBIO OTBTesting)
ADD_EXECUTABLE(otbBasicFiltersTests6 otbBasicFiltersTests6.cxx ${BasicFilters_SRCS6})
TARGET_LINK_LIBRARIES(otbBasicFiltersTests6 OTBBasicFilters OTBIO OTBTesting)
ADD_EXECUTABLE(otbBasicFiltersTests7 otbBasicFiltersTests7.cxx ${BasicFilters_SRCS7})
TARGET_LINK_LIBRARIES(otbBasicFiltersTests7 OTBBasicFilters OTBIO OTBTesting)
ADD_EXECUTABLE(otbBasicFiltersTests8 otbBasicFiltersTests8.cxx ${BasicFilters_SRCS8})
TARGET_LINK_LIBRARIES(otbBasicFiltersTests8 OTBBasicFilters OTBIO OTBTesting)
ADD_EXECUTABLE(otbBasicFiltersTests9 otbBasicFiltersTests9.cxx ${BasicFilters_SRCS9})
TARGET_LINK_LIBRARIES(otbBasicFiltersTests9 OTBBasicFilters OTBIO OTBTesting)
ADD_EXECUTABLE(otbBasicFiltersTests10 otbBasicFiltersTests10.cxx ${BasicFilters_SRCS10})
TARGET_LINK_LIBRARIES(otbBasicFiltersTests10 OTBBasicFilters OTBIO OTBTesting)
ADD_EXECUTABLE(otbBasicFiltersTests11 otbBasicFiltersTests11.cxx ${BasicFilters_SRCS11})
TARGET_LINK_LIBRARIES(otbBasicFiltersTests11 OTBBasicFilters ITKAlgorithms OTBIO OTBTesting)
ADD_EXECUTABLE(otbBasicFiltersTests12 otbBasicFiltersTests12.cxx ${BasicFilters_SRCS12})
TARGET_LINK_LIBRARIES(otbBasicFiltersTests12 OTBBasicFilters ITKAlgorithms OTBIO OTBTesting)
ENDIF( NOT OTB_DISABLE_CXX_TESTING AND BUILD_TESTING )
......@@ -28,7 +28,6 @@
#include "itkRandomImageSource.h"
#include "itkMeanImageFilter.h"
int otbFrostFilterNew( int argc, char * argv[] )
{
typedef unsigned char InputPixelType;
......
......@@ -807,6 +807,7 @@ ENDIF(OTB_USE_PQXX)
# ------- Fichiers sources CXX -----------------------------------
SET(BasicCommon_SRCS1
otbCommonTests1.cxx
otbSystemTest.cxx
otbTestCommandLineArgumentParser.cxx
#otbTestCommandLineArgumentParserGUI.cxx
......@@ -815,6 +816,7 @@ otbTestCommandLineArgumentParserList.cxx
otbTestCommandLineArgumentParserWithError.cxx
)
SET(BasicCommon_SRCS2
otbCommonTests2.cxx
otbLineSpatialObjectList.cxx
otbExtractROINew.cxx
otbExtractROI.cxx
......@@ -827,6 +829,7 @@ otbVectorDataExtractROINew.cxx
otbVectorDataExtractROI.cxx
)
SET(BasicCommon_SRCS3
otbCommonTests3.cxx
otbMultiToMonoChannelExtractROI.cxx
otbMultiToMonoChannelExtractROINew.cxx
otbPointSetSourceTest.cxx
......@@ -840,6 +843,7 @@ otbPathListToHistogramGenerator.cxx
otbLineSpatialObjectListToPointSetFilterNew.cxx
)
SET(BasicCommon_SRCS4
otbCommonTests4.cxx
otbHistogramStatisticsFunction.cxx
otbObjectListNew.cxx
otbObjectList.cxx
......@@ -853,6 +857,7 @@ otbObjectListToObjectListFilterNew.cxx
otbVectorDataToVectorDataFilterNew.cxx
)
SET(BasicCommon_SRCS5
otbCommonTests5.cxx
otbImageListToImageListFilterNew.cxx
otbConcatenateVectorImageFilterNew.cxx
otbConcatenateVectorImageFilter.cxx
......@@ -865,6 +870,7 @@ otbArcSpatialObjectNew.cxx
otbPathListToPathListFilterNew.cxx
)
SET(BasicCommon_SRCS6
otbCommonTests6.cxx
otbPolyLineImageConstIterator.cxx
otbPolyLineImageIterator.cxx
otbDrawPathFilterNew.cxx
......@@ -882,6 +888,7 @@ otbRectangle.cxx
)
SET(BasicCommon_SRCS7
otbCommonTests7.cxx
otbGenericInterpolateImageFunctionNew.cxx
otbMirrorBoundaryConditionTest.cxx
otbStandardFilterWatcherNew.cxx
......@@ -898,6 +905,7 @@ otbRemoteSensingRegion.cxx
)
SET(BasicCommon_SRCS8
otbCommonTests8.cxx
otbQuickLookImageGeneratorNew.cxx
otbQuickLookImageGenerator.cxx
otbImageRegionTileMapSplitterNew.cxx
......@@ -911,6 +919,7 @@ otbVectorImageToASImageAdaptorNew.cxx
IF(OTB_USE_MAPNIK)
SET(BasicCommon_SRCS9
otbCommonTests9.cxx
otbVectorDataToImageFilterNew.cxx
otbVectorDataToImageFilter.cxx
otbVectorDataToImageFilterSensorModel.cxx
......@@ -920,6 +929,7 @@ ENDIF(OTB_USE_MAPNIK)
IF(OTB_USE_PQXX)
SET(BasicCommon_SRCS10
otbCommonTests10.cxx
otbPostGISConnectionImplementationNew.cxx
otbPostGISConnectionImplementationConnectToDB.cxx
otbPostGISConnectionImplementationPerformTransaction.cxx
......@@ -929,41 +939,20 @@ ENDIF(OTB_USE_PQXX)
INCLUDE_DIRECTORIES(${OTB_SOURCE_DIR}/Testing/Code)
# ${TIFF_LIBRARY}
ADD_EXECUTABLE(otbCommonTests1 otbCommonTests1.cxx ${BasicCommon_SRCS1})
TARGET_LINK_LIBRARIES(otbCommonTests1 OTBIO OTBTesting)
ADD_EXECUTABLE(otbCommonTests2 otbCommonTests2.cxx ${BasicCommon_SRCS2})
TARGET_LINK_LIBRARIES(otbCommonTests2 OTBIO OTBTesting)
ADD_EXECUTABLE(otbCommonTests3 otbCommonTests3.cxx ${BasicCommon_SRCS3})
TARGET_LINK_LIBRARIES(otbCommonTests3 OTBIO OTBTesting)
ADD_EXECUTABLE(otbCommonTests4 otbCommonTests4.cxx ${BasicCommon_SRCS4})
TARGET_LINK_LIBRARIES(otbCommonTests4 OTBIO OTBTesting)
ADD_EXECUTABLE(otbCommonTests5 otbCommonTests5.cxx ${BasicCommon_SRCS5})
TARGET_LINK_LIBRARIES(otbCommonTests5 OTBIO OTBTesting)
ADD_EXECUTABLE(otbCommonTests6 otbCommonTests6.cxx ${BasicCommon_SRCS6})
TARGET_LINK_LIBRARIES(otbCommonTests6 OTBIO OTBTesting)
ADD_EXECUTABLE(otbCommonTests7 otbCommonTests7.cxx ${BasicCommon_SRCS7})
TARGET_LINK_LIBRARIES(otbCommonTests7 OTBIO OTBTesting)
ADD_EXECUTABLE(otbCommonTests8 otbCommonTests8.cxx ${BasicCommon_SRCS8})
TARGET_LINK_LIBRARIES(otbCommonTests8 OTBIO OTBTesting)
OTB_ADD_EXECUTABLE(otbCommonTests1 "${BasicCommon_SRCS1}" "OTBIO;OTBTesting")
OTB_ADD_EXECUTABLE(otbCommonTests2 "${BasicCommon_SRCS2}" "OTBIO;OTBTesting")
OTB_ADD_EXECUTABLE(otbCommonTests3 "${BasicCommon_SRCS3}" "OTBIO;OTBTesting")
OTB_ADD_EXECUTABLE(otbCommonTests4 "${BasicCommon_SRCS4}" "OTBIO;OTBTesting")
OTB_ADD_EXECUTABLE(otbCommonTests5 "${BasicCommon_SRCS5}" "OTBIO;OTBTesting")
OTB_ADD_EXECUTABLE(otbCommonTests6 "${BasicCommon_SRCS6}" "OTBIO;OTBTesting")
OTB_ADD_EXECUTABLE(otbCommonTests7 "${BasicCommon_SRCS7}" "OTBIO;OTBTesting")
OTB_ADD_EXECUTABLE(otbCommonTests8 "${BasicCommon_SRCS8}" "OTBIO;OTBTesting")
IF(OTB_USE_MAPNIK)
ADD_EXECUTABLE(otbCommonTests9 otbCommonTests9.cxx ${BasicCommon_SRCS9})
TARGET_LINK_LIBRARIES(otbCommonTests9 OTBIO OTBTesting ${MAPNIK_LIBRARY})
OTB_ADD_EXECUTABLE(otbCommonTests9 "${BasicCommon_SRCS9}" "OTBIO;OTBTesting;${MAPNIK_LIBRARY}")
ENDIF(OTB_USE_MAPNIK)
IF(OTB_USE_PQXX)
ADD_EXECUTABLE(otbCommonTests10 otbCommonTests10.cxx ${BasicCommon_SRCS10})
#TODO this line should be refined when we will like to have this capability with windows
TARGET_LINK_LIBRARIES(otbCommonTests10 OTBIO OTBTesting pq pqxx)
#TODO this line should be refined when we will like to have this capability with windows
OTB_ADD_EXECUTABLE(otbCommonTests10 "${BasicCommon_SRCS10}" "OTBIO;OTBTesting;pq;pqxx")
ENDIF(OTB_USE_PQXX)
ENDIF( NOT OTB_DISABLE_CXX_TESTING AND BUILD_TESTING )
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment