ENH: Use function scoping for wrapping

Limit the scope of global variable namespace polution
by using an enclosing function instead of
macros.

Modules/Bridge/NumPy/wrapping/CMakeLists.txt

@@ -2,6 +2,5 @@ if(ITK_WRAP_PYTHON)
   itk_wrap_module(ITKBridgeNumPy)
   set(WRAPPER_SUBMODULE_ORDER itkPyBuffer itkPyVectorContainer)
   set(WRAPPER_SWIG_LIBRARY_FILES ${WRAPPER_SWIG_LIBRARY_FILES} "${CMAKE_CURRENT_BINARY_DIR}/PyBuffer.i")
-  itk_auto_load_submodules()
-  itk_end_wrap_module()
+  itk_auto_load_and_end_wrap_submodules()
 endif()

Modules/Bridge/VTK/wrapping/CMakeLists.txt

@@ -1,3 +1,2 @@
 itk_wrap_module(ITKVTK)
-itk_auto_load_submodules()
-itk_end_wrap_module()
+itk_auto_load_and_end_wrap_submodules()

Modules/Bridge/VtkGlue/wrapping/CMakeLists.txt

@@ -19,6 +19,5 @@ itk_wrap_module(ITKVtkGlue)
 
     set(WRAPPER_LIBRARY_LINK_LIBRARIES ${ITK_LIBRARIES})
 
-    itk_auto_load_submodules()
+    itk_auto_load_and_end_wrap_submodules()
   endif()
-itk_end_wrap_module()

Modules/Core/Common/wrapping/CMakeLists.txt

@@ -57,6 +57,6 @@ set(WRAPPER_SUBMODULE_ORDER
 #  itkVertexCell
 #  itkLineCell
 )
-itk_auto_load_submodules()
 
-itk_end_wrap_module()
+
+itk_auto_load_and_end_wrap_submodules()

Modules/Core/FiniteDifference/wrapping/CMakeLists.txt

@@ -1,3 +1,2 @@
 itk_wrap_module(ITKFiniteDifference)
-itk_auto_load_submodules()
-itk_end_wrap_module()
+itk_auto_load_and_end_wrap_submodules()

Modules/Core/GPUCommon/wrapping/CMakeLists.txt

@@ -8,7 +8,6 @@ set(WRAPPER_SUBMODULE_ORDER
   itkGPUImage
   itkGPUImageToImageFilter
 )
-itk_auto_load_submodules()
-itk_end_wrap_module()
+itk_auto_load_and_end_wrap_submodules()
 
 endif()

Modules/Core/GPUFiniteDifference/wrapping/CMakeLists.txt

@@ -1,5 +1,4 @@
 if(ITK_USE_GPU OR NOT ITK_SOURCE_DIR)
 itk_wrap_module(ITKGPUFiniteDifference)
-itk_auto_load_submodules()
-itk_end_wrap_module()
+itk_auto_load_and_end_wrap_submodules()
 endif()

Modules/Core/ImageFunction/wrapping/CMakeLists.txt

@@ -2,5 +2,4 @@ itk_wrap_module(ITKImageFunction)
 set(WRAPPER_SUBMODULE_ORDER
   itkImageFunctionBase
 )
-itk_auto_load_submodules()
-itk_end_wrap_module()
+itk_auto_load_and_end_wrap_submodules()

Modules/Core/Mesh/wrapping/CMakeLists.txt

@@ -8,5 +8,4 @@ set(WRAPPER_SUBMODULE_ORDER
   itkVTKPolyDataReader
   itkVTKPolyDataWriter
 )
-itk_auto_load_submodules()
-itk_end_wrap_module()
+itk_auto_load_and_end_wrap_submodules()

Modules/Core/QuadEdgeMesh/wrapping/CMakeLists.txt

@@ -11,5 +11,4 @@ set(WRAPPER_SUBMODULE_ORDER
   # itkQuadEdgeMesh
   itkQuadEdgeMeshToQuadEdgeMeshFilter
 )
-itk_auto_load_submodules()
-itk_end_wrap_module()
+itk_auto_load_and_end_wrap_submodules()

Modules/Core/SpatialObjects/wrapping/CMakeLists.txt

@@ -28,5 +28,4 @@ set(WRAPPER_SUBMODULE_ORDER
   itkSpatialObjectToImageFilter
   itkCastSpatialObjectFilter
 )
-itk_auto_load_submodules()
-itk_end_wrap_module()
+itk_auto_load_and_end_wrap_submodules()

Modules/Core/TestKernel/wrapping/CMakeLists.txt

@@ -1,3 +1,2 @@
 itk_wrap_module(ITKTestKernel)
-itk_auto_load_submodules()
-itk_end_wrap_module()
+itk_auto_load_and_end_wrap_submodules()

Modules/Core/Transform/wrapping/CMakeLists.txt

@@ -17,5 +17,4 @@ set(WRAPPER_SUBMODULE_ORDER
   itkKernelTransform
   itkTransformGeometryImageFilter
 )
-itk_auto_load_submodules()
-itk_end_wrap_module()
+itk_auto_load_and_end_wrap_submodules()

Modules/Filtering/AnisotropicSmoothing/wrapping/CMakeLists.txt

@@ -1,3 +1,2 @@
 itk_wrap_module(ITKAnisotropicSmoothing)
-itk_auto_load_submodules()
-itk_end_wrap_module()
+itk_auto_load_and_end_wrap_submodules()

Modules/Filtering/AntiAlias/wrapping/CMakeLists.txt

@@ -1,3 +1,2 @@
 itk_wrap_module(ITKAntiAlias)
-itk_auto_load_submodules()
-itk_end_wrap_module()
+itk_auto_load_and_end_wrap_submodules()

Modules/Filtering/BiasCorrection/wrapping/CMakeLists.txt

@@ -1,3 +1,2 @@
 itk_wrap_module(ITKBiasCorrection)
-itk_auto_load_submodules()
-itk_end_wrap_module()
+itk_auto_load_and_end_wrap_submodules()

Modules/Filtering/BinaryMathematicalMorphology/wrapping/CMakeLists.txt

@@ -1,3 +1,2 @@
 itk_wrap_module(ITKBinaryMathematicalMorphology)
-itk_auto_load_submodules()
-itk_end_wrap_module()
+itk_auto_load_and_end_wrap_submodules()

Modules/Filtering/Colormap/wrapping/CMakeLists.txt

@@ -1,3 +1,2 @@
 itk_wrap_module(ITKColormap)
-itk_auto_load_submodules()
-itk_end_wrap_module()
+itk_auto_load_and_end_wrap_submodules()

Modules/Filtering/Convolution/wrapping/CMakeLists.txt

@@ -2,5 +2,4 @@ itk_wrap_module(ITKConvolution)
 set(WRAPPER_SUBMODULE_ORDER
   itkConvolutionImageFilterBase
 )
-itk_auto_load_submodules()
-itk_end_wrap_module()
+itk_auto_load_and_end_wrap_submodules()

Modules/Filtering/CurvatureFlow/wrapping/CMakeLists.txt

@@ -4,5 +4,4 @@ set(WRAPPER_SUBMODULE_ORDER
   itkCurvatureFlowImageFilter
   itkMinMaxCurvatureFlowImageFilter
 )
-itk_auto_load_submodules()
-itk_end_wrap_module()
+itk_auto_load_and_end_wrap_submodules()

Modules/Filtering/Deconvolution/wrapping/CMakeLists.txt

@@ -2,5 +2,4 @@ itk_wrap_module(ITKDeconvolution)
 set(WRAPPER_SUBMODULE_ORDER
   itkIterativeDeconvolutionImageFilter
 )
-itk_auto_load_submodules()
-itk_end_wrap_module()
+itk_auto_load_and_end_wrap_submodules()

Modules/Filtering/DisplacementField/wrapping/CMakeLists.txt

@@ -2,5 +2,4 @@ itk_wrap_module(ITKDisplacementField)
 set(WRAPPER_SUBMODULE_ORDER
   itkTimeVaryingVelocityFieldTransform
 )
-itk_auto_load_submodules()
-itk_end_wrap_module()
+itk_auto_load_and_end_wrap_submodules()

Modules/Filtering/DistanceMap/wrapping/CMakeLists.txt

@@ -1,3 +1,2 @@
 itk_wrap_module(ITKDistanceMap)
-itk_auto_load_submodules()
-itk_end_wrap_module()
+itk_auto_load_and_end_wrap_submodules()

Modules/Filtering/FFT/wrapping/CMakeLists.txt

@@ -1,3 +1,2 @@
 itk_wrap_module("ITKFFT")
-itk_auto_load_submodules()
-itk_end_wrap_module()
+itk_auto_load_and_end_wrap_submodules()

Modules/Filtering/FastMarching/wrapping/CMakeLists.txt

@@ -7,5 +7,4 @@ set(WRAPPER_SUBMODULE_ORDER
   ITKFastMarchingBase
   itkFastMarchingImageFilterBase
 )
-itk_auto_load_submodules()
-itk_end_wrap_module()
+itk_auto_load_and_end_wrap_submodules()

Modules/Filtering/GPUAnisotropicSmoothing/wrapping/CMakeLists.txt

@@ -1,5 +1,4 @@
 if(ITK_USE_GPU OR NOT ITK_SOURCE_DIR)
 itk_wrap_module(ITKGPUAnisotropicSmoothing)
-itk_auto_load_submodules()
-itk_end_wrap_module()
+itk_auto_load_and_end_wrap_submodules()
 endif()

Modules/Filtering/GPUImageFilterBase/wrapping/CMakeLists.txt

@@ -1,5 +1,4 @@
 if(ITK_USE_GPU OR NOT ITK_SOURCE_DIR)
 itk_wrap_module(ITKGPUImageFilterBase)
-itk_auto_load_submodules()
-itk_end_wrap_module()
+itk_auto_load_and_end_wrap_submodules()
 endif()

Modules/Filtering/GPUSmoothing/wrapping/CMakeLists.txt

@@ -1,5 +1,4 @@
 if(ITK_USE_GPU OR NOT ITK_SOURCE_DIR)
 itk_wrap_module(ITKGPUSmoothing)
-itk_auto_load_submodules()
-itk_end_wrap_module()
+itk_auto_load_and_end_wrap_submodules()
 endif()

Modules/Filtering/ImageCompare/wrapping/CMakeLists.txt

@@ -1,3 +1,2 @@
 itk_wrap_module(ITKImageCompare)
-itk_auto_load_submodules()
-itk_end_wrap_module()
+itk_auto_load_and_end_wrap_submodules()

Modules/Filtering/ImageCompose/wrapping/CMakeLists.txt

@@ -1,3 +1,2 @@
 itk_wrap_module(ITKImageCompose)
-itk_auto_load_submodules()
-itk_end_wrap_module()
+itk_auto_load_and_end_wrap_submodules()

Modules/Filtering/ImageFeature/wrapping/CMakeLists.txt

@@ -3,5 +3,4 @@ itk_wrap_module(ITKImageFeature)
 set(WRAPPER_SUBMODULE_ORDER
   itkHessianRecursiveGaussianImageFilter
 )
-itk_auto_load_submodules()
-itk_end_wrap_module()
+itk_auto_load_and_end_wrap_submodules()

Modules/Filtering/ImageFilterBase/wrapping/CMakeLists.txt

@@ -1,3 +1,2 @@
 itk_wrap_module(ITKImageFilterBase)
-itk_auto_load_submodules()
-itk_end_wrap_module()
+itk_auto_load_and_end_wrap_submodules()

Modules/Filtering/ImageFrequency/wrapping/CMakeLists.txt

@@ -1,4 +1,3 @@
 itk_wrap_module(ITKImageFrequency)
 
-itk_auto_load_submodules()
-itk_end_wrap_module()
+itk_auto_load_and_end_wrap_submodules()

Modules/Filtering/ImageFusion/wrapping/CMakeLists.txt

@@ -7,8 +7,7 @@ set(tmp_default_includes ${WRAPPER_DEFAULT_INCLUDE})
 # (but it maybe should)
 list(APPEND WRAPPER_DEFAULT_INCLUDE "itkStatisticsLabelObject.h")
 
-itk_auto_load_submodules()
-itk_end_wrap_module()
+itk_auto_load_and_end_wrap_submodules()
 
 # Reset the WRAPPER_DEFAULT_INCLUDE to original value
 set(WRAPPER_DEFAULT_INCLUDE ${tmp_default_includes})

Modules/Filtering/ImageGradient/wrapping/CMakeLists.txt

@@ -1,3 +1,2 @@
 itk_wrap_module(ITKImageGradient)
-itk_auto_load_submodules()
-itk_end_wrap_module()
+itk_auto_load_and_end_wrap_submodules()

Modules/Filtering/ImageGrid/wrapping/CMakeLists.txt

@@ -4,5 +4,4 @@ set(WRAPPER_SUBMODULE_ORDER
   itkPadImageFilterBase
   itkPadImageFilter
 )
-itk_auto_load_submodules()
-itk_end_wrap_module()
+itk_auto_load_and_end_wrap_submodules()

Modules/Filtering/ImageIntensity/wrapping/CMakeLists.txt

@@ -1,3 +1,2 @@
 itk_wrap_module(ITKImageIntensity)
-itk_auto_load_submodules()
-itk_end_wrap_module()
+itk_auto_load_and_end_wrap_submodules()

Modules/Filtering/ImageLabel/wrapping/CMakeLists.txt

@@ -1,3 +1,2 @@
 itk_wrap_module(ITKImageLabel)
-itk_auto_load_submodules()
-itk_end_wrap_module()
+itk_auto_load_and_end_wrap_submodules()

Modules/Filtering/ImageNoise/wrapping/CMakeLists.txt

@@ -1,3 +1,2 @@
 itk_wrap_module(ITKImageNoise)
-itk_auto_load_submodules()
-itk_end_wrap_module()
+itk_auto_load_and_end_wrap_submodules()

Modules/Filtering/ImageSources/wrapping/CMakeLists.txt

@@ -1,5 +1,3 @@
 itk_wrap_module(ITKImageSources)
 
-itk_auto_load_submodules()
-
-itk_end_wrap_module()
+itk_auto_load_and_end_wrap_submodules()

Modules/Filtering/ImageStatistics/wrapping/CMakeLists.txt

@@ -1,3 +1,2 @@
 itk_wrap_module(ITKImageStatistics)
-itk_auto_load_submodules()
-itk_end_wrap_module()
+itk_auto_load_and_end_wrap_submodules()

Modules/Filtering/LabelMap/wrapping/CMakeLists.txt

@@ -18,8 +18,7 @@ set(tmp_default_includes ${WRAPPER_DEFAULT_INCLUDE})
 # (but it maybe should)
 list(APPEND WRAPPER_DEFAULT_INCLUDE "itkStatisticsLabelObject.h")
 
-itk_auto_load_submodules()
-itk_end_wrap_module()
+itk_auto_load_and_end_wrap_submodules()
 
 # Reset the WRAPPER_DEFAULT_INCLUDE to original value
 set(WRAPPER_DEFAULT_INCLUDE ${tmp_default_includes})

Modules/Filtering/MathematicalMorphology/wrapping/CMakeLists.txt

@@ -3,5 +3,4 @@ itk_wrap_module(ITKMathematicalMorphology)
 set(WRAPPER_SUBMODULE_ORDER
   itkFlatStructuringElement
   )
-itk_auto_load_submodules()
-itk_end_wrap_module()
+itk_auto_load_and_end_wrap_submodules()

Modules/Filtering/Path/wrapping/CMakeLists.txt

@@ -7,6 +7,4 @@ set(WRAPPER_SUBMODULE_ORDER
   itkParametricPath
   itkImageToPathFilter
 )
-itk_auto_load_submodules()
-
-itk_end_wrap_module()
+itk_auto_load_and_end_wrap_submodules()

Modules/Filtering/QuadEdgeMeshFiltering/wrapping/CMakeLists.txt

@@ -1,3 +1,2 @@
 itk_wrap_module(ITKQuadEdgeMeshFiltering)
-itk_auto_load_submodules()
-itk_end_wrap_module()
+itk_auto_load_and_end_wrap_submodules()

Modules/Filtering/Smoothing/wrapping/CMakeLists.txt

@@ -1,3 +1,2 @@
 itk_wrap_module(ITKSmoothing)
-itk_auto_load_submodules()
-itk_end_wrap_module()
+itk_auto_load_and_end_wrap_submodules()

Modules/Filtering/Thresholding/wrapping/CMakeLists.txt

@@ -4,5 +4,4 @@ set(WRAPPER_SUBMODULE_ORDER
   itkHistogramThresholdCalculator
   itkHistogramThresholdImageFilter
 )
-itk_auto_load_submodules()
-itk_end_wrap_module()
+itk_auto_load_and_end_wrap_submodules()

Modules/IO/BMP/wrapping/CMakeLists.txt

@@ -1,3 +1,2 @@
 itk_wrap_module(ITKIOBMP)
-itk_auto_load_submodules()
-itk_end_wrap_module()
+itk_auto_load_and_end_wrap_submodules()

Modules/IO/BioRad/wrapping/CMakeLists.txt

@@ -1,3 +1,2 @@
 itk_wrap_module(ITKIOBioRad)
-itk_auto_load_submodules()
-itk_end_wrap_module()
+itk_auto_load_and_end_wrap_submodules()

Modules/IO/Bruker/wrapping/CMakeLists.txt

@@ -1,3 +1,2 @@
 itk_wrap_module(ITKIOBruker)
-itk_auto_load_submodules()
-itk_end_wrap_module()
+itk_auto_load_and_end_wrap_submodules()

Modules/IO/DCMTK/wrapping/CMakeLists.txt

@@ -1,3 +1,2 @@
 itk_wrap_module(ITKIODCMTK)
-itk_auto_load_submodules()
-itk_end_wrap_module()
+itk_auto_load_and_end_wrap_submodules()

Modules/IO/GDCM/wrapping/CMakeLists.txt

@@ -1,3 +1,2 @@
 itk_wrap_module(ITKIOGDCM)
-itk_auto_load_submodules()
-itk_end_wrap_module()
+itk_auto_load_and_end_wrap_submodules()

Modules/IO/GE/wrapping/CMakeLists.txt

@@ -1,3 +1,2 @@
 itk_wrap_module(ITKIOGE)
-itk_auto_load_submodules()
-itk_end_wrap_module()
+itk_auto_load_and_end_wrap_submodules()

Modules/IO/GIPL/wrapping/CMakeLists.txt

@@ -1,3 +1,2 @@
 itk_wrap_module(ITKIOGIPL)
-itk_auto_load_submodules()
-itk_end_wrap_module()
+itk_auto_load_and_end_wrap_submodules()

Modules/IO/HDF5/wrapping/CMakeLists.txt

@@ -1,3 +1,2 @@
 itk_wrap_module(ITKIOHDF5)
-itk_auto_load_submodules()
-itk_end_wrap_module()
+itk_auto_load_and_end_wrap_submodules()

Modules/IO/IPL/wrapping/CMakeLists.txt

@@ -1,3 +1,2 @@
 itk_wrap_module(ITKIOIPL)
-itk_auto_load_submodules()
-itk_end_wrap_module()
+itk_auto_load_and_end_wrap_submodules()

Modules/IO/ImageBase/wrapping/CMakeLists.txt

@@ -3,5 +3,4 @@ itk_wrap_module(ITKIOImageBase)
 set(WRAPPER_SUBMODULE_ORDER
   ITKIOImageBaseBase
 )
-itk_auto_load_submodules()
-itk_end_wrap_module()
+itk_auto_load_and_end_wrap_submodules()

Modules/IO/JPEG/wrapping/CMakeLists.txt

@@ -1,3 +1,2 @@
 itk_wrap_module(ITKIOJPEG)
-itk_auto_load_submodules()
-itk_end_wrap_module()
+itk_auto_load_and_end_wrap_submodules()

Modules/IO/JPEG2000/wrapping/CMakeLists.txt

@@ -1,3 +1,2 @@
 itk_wrap_module(ITKIOJPEG2000)
-itk_auto_load_submodules()
-itk_end_wrap_module()
+itk_auto_load_and_end_wrap_submodules()

Modules/IO/LSM/wrapping/CMakeLists.txt

@@ -1,3 +1,2 @@
 itk_wrap_module(ITKIOLSM)
-itk_auto_load_submodules()
-itk_end_wrap_module()
+itk_auto_load_and_end_wrap_submodules()

Modules/IO/MINC/wrapping/CMakeLists.txt

@@ -1,3 +1,2 @@
 itk_wrap_module(ITKIOMINC)
-itk_auto_load_submodules()
-itk_end_wrap_module()
+itk_auto_load_and_end_wrap_submodules()

Modules/IO/MRC/wrapping/CMakeLists.txt

@@ -1,3 +1,2 @@
 itk_wrap_module(ITKIOMRC)
-itk_auto_load_submodules()
-itk_end_wrap_module()
+itk_auto_load_and_end_wrap_submodules()

Modules/IO/MeshBYU/wrapping/CMakeLists.txt

@@ -1,3 +1,2 @@
 itk_wrap_module(ITKIOMeshBYU)
-itk_auto_load_submodules()
-itk_end_wrap_module()
+itk_auto_load_and_end_wrap_submodules()

Modules/IO/MeshBase/wrapping/CMakeLists.txt

@@ -4,5 +4,4 @@ set(WRAPPER_SUBMODULE_ORDER
   itkMeshIOBase
   itkMeshIOFactory
 )
-itk_auto_load_submodules()
-itk_end_wrap_module()
+itk_auto_load_and_end_wrap_submodules()

Modules/IO/MeshFreeSurfer/wrapping/CMakeLists.txt

@@ -1,3 +1,2 @@
 itk_wrap_module(ITKIOMeshFreeSurfer)
-itk_auto_load_submodules()
-itk_end_wrap_module()
+itk_auto_load_and_end_wrap_submodules()

Modules/IO/MeshGifti/wrapping/CMakeLists.txt

@@ -1,3 +1,2 @@
 itk_wrap_module(ITKIOMeshGifti)
-itk_auto_load_submodules()
-itk_end_wrap_module()
+itk_auto_load_and_end_wrap_submodules()