From 6b373592bd09511d6e6257c4da5f8cab4935dcd6 Mon Sep 17 00:00:00 2001
From: Julien Michel <julien.michel@orfeo-toolbox.org>
Date: Thu, 5 Mar 2015 17:36:50 +0100
Subject: [PATCH] ENH: Removing ITKPendingPatches module and moving headers to
the include dir in ITK module (hopefully it will fix the path order in
include_directories)
---
Modules/Adapters/ITKPendingPatches/CMakeLists.txt | 2 --
.../Adapters/ITKPendingPatches/otb-module.cmake | 10 ----------
Modules/Core/Common/otb-module.cmake | 1 -
Modules/Core/ImageBase/otb-module.cmake | 1 -
Modules/Core/Streaming/otb-module.cmake | 1 -
Modules/Core/Transform/otb-module.cmake | 1 -
Modules/Detection/CloudDetection/otb-module.cmake | 7 +++----
Modules/Feature/Descriptors/otb-module.cmake | 11 +++++------
Modules/Feature/Edge/otb-module.cmake | 1 -
Modules/Filtering/ColorMap/otb-module.cmake | 1 -
.../Filtering/ImageManipulation/otb-module.cmake | 1 -
Modules/Filtering/Polarimetry/otb-module.cmake | 5 ++---
Modules/Filtering/Projection/otb-module.cmake | 1 -
Modules/Filtering/Statistics/otb-module.cmake | 1 -
Modules/IO/ImageIO/otb-module.cmake | 1 -
Modules/Learning/SOM/otb-module.cmake | 1 -
Modules/Radiometry/Indices/otb-module.cmake | 15 +++++++--------
.../Radiometry/LandSatClassifier/otb-module.cmake | 1 -
.../Radiometry/SARCalibration/otb-module.cmake | 11 +++++------
.../Registration/DisparityMap/otb-module.cmake | 1 -
Modules/Registration/Stereo/otb-module.cmake | 1 -
Modules/Segmentation/Labelling/otb-module.cmake | 9 ++++-----
.../itkImageRegionMultidimensionalSplitter.h | 0
.../itkImageRegionMultidimensionalSplitter.hxx | 0
.../ITK}/include/itkImageRegionSplitter.h | 0
.../ITK}/include/itkImageRegionSplitter.hxx | 0
.../itkTransformToDisplacementFieldSource.h | 0
.../itkTransformToDisplacementFieldSource.hxx | 0
.../ITK}/include/itkUnaryFunctorImageFilter.h | 0
.../ITK}/include/itkUnaryFunctorImageFilter.hxx | 0
.../ITK}/include/otbWarpImageFilter.h | 0
.../ITK}/include/otbWarpImageFilter.txx | 0
32 files changed, 26 insertions(+), 58 deletions(-)
delete mode 100644 Modules/Adapters/ITKPendingPatches/CMakeLists.txt
delete mode 100644 Modules/Adapters/ITKPendingPatches/otb-module.cmake
rename Modules/{Adapters/ITKPendingPatches => ThirdParty/ITK}/include/itkImageRegionMultidimensionalSplitter.h (100%)
rename Modules/{Adapters/ITKPendingPatches => ThirdParty/ITK}/include/itkImageRegionMultidimensionalSplitter.hxx (100%)
rename Modules/{Adapters/ITKPendingPatches => ThirdParty/ITK}/include/itkImageRegionSplitter.h (100%)
rename Modules/{Adapters/ITKPendingPatches => ThirdParty/ITK}/include/itkImageRegionSplitter.hxx (100%)
rename Modules/{Adapters/ITKPendingPatches => ThirdParty/ITK}/include/itkTransformToDisplacementFieldSource.h (100%)
rename Modules/{Adapters/ITKPendingPatches => ThirdParty/ITK}/include/itkTransformToDisplacementFieldSource.hxx (100%)
rename Modules/{Adapters/ITKPendingPatches => ThirdParty/ITK}/include/itkUnaryFunctorImageFilter.h (100%)
rename Modules/{Adapters/ITKPendingPatches => ThirdParty/ITK}/include/itkUnaryFunctorImageFilter.hxx (100%)
rename Modules/{Adapters/ITKPendingPatches => ThirdParty/ITK}/include/otbWarpImageFilter.h (100%)
rename Modules/{Adapters/ITKPendingPatches => ThirdParty/ITK}/include/otbWarpImageFilter.txx (100%)
diff --git a/Modules/Adapters/ITKPendingPatches/CMakeLists.txt b/Modules/Adapters/ITKPendingPatches/CMakeLists.txt
deleted file mode 100644
index 3a2c1e4b23..0000000000
--- 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 c830c03ed6..0000000000
--- 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 c41a7f43df..cefb91fd23 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 ff10f7620e..c76c9484fc 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 cdfe8be43e..00615c856b 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 c4eeabda0b..3c4b916ae0 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 2bfd11ac9b..aaa9c99217 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 4e755fed33..756732f8da 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 0502ac6293..86116471a7 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 ee09403de9..3e0b3f9c32 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 4e0237a0f8..ca49464420 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 b69409a21a..b6dd509ec3 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 47edda57a7..723a642cd3 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 71ae3a9b4d..8031c401fe 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 729927bacd..14338539c6 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 a2dee9e426..1e51cfce25 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 d79c13129b..4ac4efc026 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 b527c89bdb..64e7853988 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 3391e86b6c..018f255ca1 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 7239035d6a..b2d3243e56 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 7cd7134a4a..39f0eac8ac 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 4dbc6d4307..f3931d251a 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
--
GitLab