diff --git a/Modules/Adapters/ITKPendingPatches/CMakeLists.txt b/Modules/Adapters/ITKPendingPatches/CMakeLists.txt deleted file mode 100644 index 3a2c1e4b23a6c1620421e4ec5f01662caa6032f8..0000000000000000000000000000000000000000 --- a/Modules/Adapters/ITKPendingPatches/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -project(OTBITKPendingPatches) -otb_module_impl() diff --git a/Modules/Adapters/ITKPendingPatches/otb-module.cmake b/Modules/Adapters/ITKPendingPatches/otb-module.cmake deleted file mode 100644 index c830c03ed6e950041b3bb3be3f57b678b37c104b..0000000000000000000000000000000000000000 --- a/Modules/Adapters/ITKPendingPatches/otb-module.cmake +++ /dev/null @@ -1,10 +0,0 @@ -set(DOCUMENTATION "Pending patches (itk) module.") - -otb_module(OTBITKPendingPatches - DEPENDS - OTBITK - - - DESCRIPTION - "${DOCUMENTATION}" - ) diff --git a/Modules/Core/Common/otb-module.cmake b/Modules/Core/Common/otb-module.cmake index c41a7f43df22f651b4fee41eb3ca875a3f3ead80..cefb91fd23aa430d897c6a9f80d37a35ca697cd7 100644 --- a/Modules/Core/Common/otb-module.cmake +++ b/Modules/Core/Common/otb-module.cmake @@ -4,7 +4,6 @@ otb_module(OTBCommon DEPENDS OTBBoost OTBITK - OTBITKPendingPatches TEST_DEPENDS OTBImageBase diff --git a/Modules/Core/ImageBase/otb-module.cmake b/Modules/Core/ImageBase/otb-module.cmake index ff10f7620e953ebf90889ecadde52485789f4adf..c76c9484fc42b9d9e8d7facc371539f3eaafd142 100644 --- a/Modules/Core/ImageBase/otb-module.cmake +++ b/Modules/Core/ImageBase/otb-module.cmake @@ -5,7 +5,6 @@ otb_module(OTBImageBase DEPENDS OTBCommon OTBITK - OTBITKPendingPatches OTBMetadata OTBOSSIMAdapters diff --git a/Modules/Core/Streaming/otb-module.cmake b/Modules/Core/Streaming/otb-module.cmake index cdfe8be43efb2f285eb84c2bd6a041d64b1b1254..00615c856b6c3aa397dcefb4f07014d9e9912d53 100644 --- a/Modules/Core/Streaming/otb-module.cmake +++ b/Modules/Core/Streaming/otb-module.cmake @@ -7,7 +7,6 @@ otb_module(OTBStreaming DEPENDS OTBCommon OTBITK - OTBITKPendingPatches OTBImageBase OTBOSSIMAdapters OTBObjectList diff --git a/Modules/Core/Transform/otb-module.cmake b/Modules/Core/Transform/otb-module.cmake index c4eeabda0b85254e233d7f64cab4d132c2f03106..3c4b916ae0bec943dcfc5d7180d442214d804307 100644 --- a/Modules/Core/Transform/otb-module.cmake +++ b/Modules/Core/Transform/otb-module.cmake @@ -9,7 +9,6 @@ otb_module(OTBTransform OTBCommon OTBGDAL OTBITK - OTBITKPendingPatches OTBInterpolation OTBOSSIMAdapters diff --git a/Modules/Detection/CloudDetection/otb-module.cmake b/Modules/Detection/CloudDetection/otb-module.cmake index 2bfd11ac9bcfed61ae281e1d8182961890f147f9..aaa9c9921748ed9d4ed9117dfc8892fd79311949 100644 --- a/Modules/Detection/CloudDetection/otb-module.cmake +++ b/Modules/Detection/CloudDetection/otb-module.cmake @@ -4,14 +4,13 @@ radiometric gap between a reference pixel and the other pixels of the image.") otb_module(OTBCloudDetection DEPENDS + OTBITK OTBImageManipulation - OTBITKPendingPatches TEST_DEPENDS - OTBTestKernel - OTBImageIO - OTBITK OTBImageBase + OTBImageIO + OTBTestKernel DESCRIPTION "${DOCUMENTATION}" diff --git a/Modules/Feature/Descriptors/otb-module.cmake b/Modules/Feature/Descriptors/otb-module.cmake index 4e755fed33d91091b65acca7badce738291ebcc5..756732f8da662c4a0b7db4957ad14e69ad41ab7a 100644 --- a/Modules/Feature/Descriptors/otb-module.cmake +++ b/Modules/Feature/Descriptors/otb-module.cmake @@ -5,20 +5,19 @@ contains different descriptors such as Fourrier-Mellin, SIFT, SURF, HOG, and so otb_module(OTBDescriptors DEPENDS - OTBSiftFast + OTBCommon OTBITK - OTBITKPendingPatches OTBImageBase - OTBTransform - OTBPointSet - OTBCommon OTBObjectList + OTBPointSet + OTBSiftFast + OTBTransform TEST_DEPENDS - OTBTestKernel OTBImageIO OTBImageManipulation OTBInterpolation + OTBTestKernel DESCRIPTION "${DOCUMENTATION}" diff --git a/Modules/Feature/Edge/otb-module.cmake b/Modules/Feature/Edge/otb-module.cmake index 0502ac6293661191bbb318de790b6f0472fc655b..86116471a7a3232429dcf8f58b81ed443016d153 100644 --- a/Modules/Feature/Edge/otb-module.cmake +++ b/Modules/Feature/Edge/otb-module.cmake @@ -7,7 +7,6 @@ otb_module(OTBEdge OTBCommon OTBConversion OTBITK - OTBITKPendingPatches OTBImageBase OTBImageManipulation OTBObjectList diff --git a/Modules/Filtering/ColorMap/otb-module.cmake b/Modules/Filtering/ColorMap/otb-module.cmake index ee09403de9f21f6b4d225a85b7f6c6cd121f4051..3e0b3f9c327f3660266ba4d76078994138daa98d 100644 --- a/Modules/Filtering/ColorMap/otb-module.cmake +++ b/Modules/Filtering/ColorMap/otb-module.cmake @@ -10,7 +10,6 @@ otb_module(OTBColorMap OTBITK TEST_DEPENDS - OTBITKPendingPatches OTBImageBase OTBImageIO OTBTestKernel diff --git a/Modules/Filtering/ImageManipulation/otb-module.cmake b/Modules/Filtering/ImageManipulation/otb-module.cmake index 4e0237a0f8429518bf7f76df369bf0f0debd8270..ca49464420ecf8215c1d36eacf45005fdcabc6c7 100644 --- a/Modules/Filtering/ImageManipulation/otb-module.cmake +++ b/Modules/Filtering/ImageManipulation/otb-module.cmake @@ -9,7 +9,6 @@ otb_module(OTBImageManipulation DEPENDS OTBCommon OTBITK - OTBITKPendingPatches OTBImageBase OTBInterpolation OTBObjectList diff --git a/Modules/Filtering/Polarimetry/otb-module.cmake b/Modules/Filtering/Polarimetry/otb-module.cmake index b69409a21a75d47b04777e229455b33209d2b531..b6dd509ec39022126199e34d4b9285517119505d 100644 --- a/Modules/Filtering/Polarimetry/otb-module.cmake +++ b/Modules/Filtering/Polarimetry/otb-module.cmake @@ -8,13 +8,12 @@ on.") otb_module(OTBPolarimetry DEPENDS OTBCommon - OTBITKPendingPatches OTBITK TEST_DEPENDS - OTBTestKernel - OTBImageIO OTBImageBase + OTBImageIO + OTBTestKernel DESCRIPTION "${DOCUMENTATION}" diff --git a/Modules/Filtering/Projection/otb-module.cmake b/Modules/Filtering/Projection/otb-module.cmake index 47edda57a71920cb34917d500efdadf114ea9180..723a642cd3bceecc0ac16d4084be9d7c3c1f9f58 100644 --- a/Modules/Filtering/Projection/otb-module.cmake +++ b/Modules/Filtering/Projection/otb-module.cmake @@ -22,7 +22,6 @@ otb_module(OTBProjection TEST_DEPENDS OTBCommandLineParser - OTBITKPendingPatches OTBImageIO OTBTestKernel OTBVectorDataIO diff --git a/Modules/Filtering/Statistics/otb-module.cmake b/Modules/Filtering/Statistics/otb-module.cmake index 71ae3a9b4df0bae8f37bfbb7b3eda93997c8a20d..8031c401fe08d7446aec60298c05e9a30d81084e 100644 --- a/Modules/Filtering/Statistics/otb-module.cmake +++ b/Modules/Filtering/Statistics/otb-module.cmake @@ -9,7 +9,6 @@ otb_module(OTBStatistics DEPENDS OTBCommon OTBITK - OTBITKPendingPatches OTBImageBase OTBObjectList OTBProjection diff --git a/Modules/IO/ImageIO/otb-module.cmake b/Modules/IO/ImageIO/otb-module.cmake index 729927bacd3f10b40231ae255793a566072711d2..14338539c6ca58be7d90b2736f621b0fc2d43fbc 100644 --- a/Modules/IO/ImageIO/otb-module.cmake +++ b/Modules/IO/ImageIO/otb-module.cmake @@ -15,7 +15,6 @@ otb_module(OTBImageIO OTBIORAD OTBIOTileMap OTBITK - OTBITKPendingPatches OTBImageBase OTBOSSIMAdapters OTBObjectList diff --git a/Modules/Learning/SOM/otb-module.cmake b/Modules/Learning/SOM/otb-module.cmake index a2dee9e426c260628a86c4e88bb3693f3e8aead5..1e51cfce2536f5d8d65673ae059138a3ca3e0c01 100644 --- a/Modules/Learning/SOM/otb-module.cmake +++ b/Modules/Learning/SOM/otb-module.cmake @@ -8,7 +8,6 @@ otb_module(OTBSOM DEPENDS OTBCommon OTBITK - OTBITKPendingPatches OTBImageBase TEST_DEPENDS diff --git a/Modules/Radiometry/Indices/otb-module.cmake b/Modules/Radiometry/Indices/otb-module.cmake index d79c13129b0c362b56aa14289d1c8d466a26b072..4ac4efc02678686d3e04acd6bfeb4c5bcabfba4f 100644 --- a/Modules/Radiometry/Indices/otb-module.cmake +++ b/Modules/Radiometry/Indices/otb-module.cmake @@ -6,22 +6,21 @@ DifferenceWater Index) and so on.") otb_module(OTBIndices DEPENDS - OTBVectorDataBase + OTBCommon + OTBFuzzy OTBITK - OTBITKPendingPatches OTBImageManipulation - OTBFuzzy - OTBPath - OTBCommon OTBMetadata + OTBPath + OTBVectorDataBase TEST_DEPENDS - OTBTestKernel + OTBImageBase OTBImageIO + OTBObjectList OTBProjection + OTBTestKernel OTBVectorDataIO - OTBImageBase - OTBObjectList DESCRIPTION "${DOCUMENTATION}" diff --git a/Modules/Radiometry/LandSatClassifier/otb-module.cmake b/Modules/Radiometry/LandSatClassifier/otb-module.cmake index b527c89bdb5b527b1d5fa453c9a66e3890c74cd0..64e7853988bbfbbaa9d4e00cd45ee93e8ad8762c 100644 --- a/Modules/Radiometry/LandSatClassifier/otb-module.cmake +++ b/Modules/Radiometry/LandSatClassifier/otb-module.cmake @@ -6,7 +6,6 @@ otb_module(OTBLandSatClassifier TEST_DEPENDS OTBITK - OTBITKPendingPatches OTBImageBase OTBImageIO OTBTestKernel diff --git a/Modules/Radiometry/SARCalibration/otb-module.cmake b/Modules/Radiometry/SARCalibration/otb-module.cmake index 3391e86b6c3a2d214c5395b5668bc111ea422216..018f255ca1669919b25beff19c895f61bd58492c 100644 --- a/Modules/Radiometry/SARCalibration/otb-module.cmake +++ b/Modules/Radiometry/SARCalibration/otb-module.cmake @@ -3,17 +3,16 @@ set(DOCUMENTATION "This module contains tools related to SAR calibration otb_module(OTBSARCalibration DEPENDS - OTBITKPendingPatches - OTBMetadata + OTBCommon OTBITK + OTBMetadata OTBOSSIMAdapters - OTBCommon TEST_DEPENDS - OTBTestKernel - OTBStatistics - OTBImageIO OTBImageBase + OTBImageIO + OTBStatistics + OTBTestKernel DESCRIPTION "${DOCUMENTATION}" diff --git a/Modules/Registration/DisparityMap/otb-module.cmake b/Modules/Registration/DisparityMap/otb-module.cmake index 7239035d6ae1dc69949be05965d60eb19fcb52b7..b2d3243e56ee9a7a4e5205c0925e4145bd9588ea 100644 --- a/Modules/Registration/DisparityMap/otb-module.cmake +++ b/Modules/Registration/DisparityMap/otb-module.cmake @@ -9,7 +9,6 @@ otb_module(OTBDisparityMap DEPENDS OTBCommon OTBITK - OTBITKPendingPatches OTBImageBase OTBPointSet OTBStereo diff --git a/Modules/Registration/Stereo/otb-module.cmake b/Modules/Registration/Stereo/otb-module.cmake index 7cd7134a4aa537908e96b14d2cac3b3b385a9f2b..39f0eac8ac5ad387dd4be3792d52437b765ca8d5 100644 --- a/Modules/Registration/Stereo/otb-module.cmake +++ b/Modules/Registration/Stereo/otb-module.cmake @@ -6,7 +6,6 @@ otb_module(OTBStereo DEPENDS OTBCommon OTBITK - OTBITKPendingPatches OTBImageBase OTBInterpolation OTBOSSIMAdapters diff --git a/Modules/Segmentation/Labelling/otb-module.cmake b/Modules/Segmentation/Labelling/otb-module.cmake index 4dbc6d43072bb4ff7e1d24d7892a4bbc1587381f..f3931d251aad7da680d7f2169a5a054e384749a9 100644 --- a/Modules/Segmentation/Labelling/otb-module.cmake +++ b/Modules/Segmentation/Labelling/otb-module.cmake @@ -8,15 +8,14 @@ possible to sort the labels based on the size of the object.") otb_module(OTBLabelling DEPENDS - OTBPointSet - OTBImageManipulation OTBITK + OTBImageManipulation + OTBPointSet TEST_DEPENDS - OTBTestKernel - OTBImageIO - OTBITKPendingPatches OTBImageBase + OTBImageIO + OTBTestKernel DESCRIPTION "${DOCUMENTATION}" diff --git a/Modules/Adapters/ITKPendingPatches/include/itkImageRegionMultidimensionalSplitter.h b/Modules/ThirdParty/ITK/include/itkImageRegionMultidimensionalSplitter.h similarity index 100% rename from Modules/Adapters/ITKPendingPatches/include/itkImageRegionMultidimensionalSplitter.h rename to Modules/ThirdParty/ITK/include/itkImageRegionMultidimensionalSplitter.h diff --git a/Modules/Adapters/ITKPendingPatches/include/itkImageRegionMultidimensionalSplitter.hxx b/Modules/ThirdParty/ITK/include/itkImageRegionMultidimensionalSplitter.hxx similarity index 100% rename from Modules/Adapters/ITKPendingPatches/include/itkImageRegionMultidimensionalSplitter.hxx rename to Modules/ThirdParty/ITK/include/itkImageRegionMultidimensionalSplitter.hxx diff --git a/Modules/Adapters/ITKPendingPatches/include/itkImageRegionSplitter.h b/Modules/ThirdParty/ITK/include/itkImageRegionSplitter.h similarity index 100% rename from Modules/Adapters/ITKPendingPatches/include/itkImageRegionSplitter.h rename to Modules/ThirdParty/ITK/include/itkImageRegionSplitter.h diff --git a/Modules/Adapters/ITKPendingPatches/include/itkImageRegionSplitter.hxx b/Modules/ThirdParty/ITK/include/itkImageRegionSplitter.hxx similarity index 100% rename from Modules/Adapters/ITKPendingPatches/include/itkImageRegionSplitter.hxx rename to Modules/ThirdParty/ITK/include/itkImageRegionSplitter.hxx diff --git a/Modules/Adapters/ITKPendingPatches/include/itkTransformToDisplacementFieldSource.h b/Modules/ThirdParty/ITK/include/itkTransformToDisplacementFieldSource.h similarity index 100% rename from Modules/Adapters/ITKPendingPatches/include/itkTransformToDisplacementFieldSource.h rename to Modules/ThirdParty/ITK/include/itkTransformToDisplacementFieldSource.h diff --git a/Modules/Adapters/ITKPendingPatches/include/itkTransformToDisplacementFieldSource.hxx b/Modules/ThirdParty/ITK/include/itkTransformToDisplacementFieldSource.hxx similarity index 100% rename from Modules/Adapters/ITKPendingPatches/include/itkTransformToDisplacementFieldSource.hxx rename to Modules/ThirdParty/ITK/include/itkTransformToDisplacementFieldSource.hxx diff --git a/Modules/Adapters/ITKPendingPatches/include/itkUnaryFunctorImageFilter.h b/Modules/ThirdParty/ITK/include/itkUnaryFunctorImageFilter.h similarity index 100% rename from Modules/Adapters/ITKPendingPatches/include/itkUnaryFunctorImageFilter.h rename to Modules/ThirdParty/ITK/include/itkUnaryFunctorImageFilter.h diff --git a/Modules/Adapters/ITKPendingPatches/include/itkUnaryFunctorImageFilter.hxx b/Modules/ThirdParty/ITK/include/itkUnaryFunctorImageFilter.hxx similarity index 100% rename from Modules/Adapters/ITKPendingPatches/include/itkUnaryFunctorImageFilter.hxx rename to Modules/ThirdParty/ITK/include/itkUnaryFunctorImageFilter.hxx diff --git a/Modules/Adapters/ITKPendingPatches/include/otbWarpImageFilter.h b/Modules/ThirdParty/ITK/include/otbWarpImageFilter.h similarity index 100% rename from Modules/Adapters/ITKPendingPatches/include/otbWarpImageFilter.h rename to Modules/ThirdParty/ITK/include/otbWarpImageFilter.h diff --git a/Modules/Adapters/ITKPendingPatches/include/otbWarpImageFilter.txx b/Modules/ThirdParty/ITK/include/otbWarpImageFilter.txx similarity index 100% rename from Modules/Adapters/ITKPendingPatches/include/otbWarpImageFilter.txx rename to Modules/ThirdParty/ITK/include/otbWarpImageFilter.txx