Skip to content

Commit 76b2c2c

Browse files
authored
REL: DREAM3D-NX v7.0.0-RC13 Release (#1038)
* Update dependent library versions for conda build. * CONDA: MacOS ARM64 can now generate a conda package * Linux: Update GCC Compiler Version to 11.4.0 * MacOS: Update compiler to clang version 16 instead of 17 * VCPKG updates to now use ITK 5.4.0 --------- Signed-off-by: Michael Jackson <[email protected]>
1 parent 755dfc7 commit 76b2c2c

File tree

9 files changed

+146
-139
lines changed

9 files changed

+146
-139
lines changed

conda/bld.bat

Lines changed: 54 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@ cmake -S "%SRC_DIR%/EbsdLib" -B . -G "Ninja" ^
6363
-D EbsdLib_BUILD_H5SUPPORT:BOOL=OFF ^
6464
-D TBB_STATUS_PRINTED:BOOL=ON ^
6565
-D CMP_HDF5_USE_CONFIG:BOOL=OFF ^
66-
-D GVS_GIT_HASH:STRING="6c0e5ec992472eeae5df9d627de524b59b971fab" ^
67-
-D H5Support_DIR:PATH="%lib_prefix%/share/H5Support"
66+
-D GVS_GIT_HASH:STRING="d7db8a3a5f11b97ca56b9864de710f552d9dccf4" ^
67+
-D H5Support_DIR:PATH="%LIBRARY_PREFIX%/share/H5Support"
6868
if errorlevel 1 exit 1
6969

7070
cmake --build . --target all
@@ -155,61 +155,61 @@ mkdir itk_build
155155
cd itk_build
156156

157157
cmake -S "%SRC_DIR%/itk" -B . -G "Ninja" $CMAKE_ARGS ^
158-
-DCMAKE_BUILD_TYPE:STRING=Release ^
158+
-D CMAKE_BUILD_TYPE:STRING=Release ^
159159
-D CMAKE_INSTALL_PREFIX:PATH="%LIBRARY_PREFIX%" ^
160160
-D CMAKE_SYSTEM_PREFIX_PATH:PATH="%LIBRARY_PREFIX%" ^
161161
-D Eigen3_DIR=%lib_prefix%/share/eigen3/cmake ^
162-
-DBUILD_SHARED_LIBS:STRING=ON ^
163-
-DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=11.0 ^
164-
-DCMAKE_SKIP_INSTALL_RPATH:BOOL=OFF ^
165-
-DCMAKE_SKIP_RPATH:BOOL=OFF ^
166-
-DCMAKE_CXX_STANDARD:STRING=17 ^
167-
-DCMAKE_CXX_STANDARD_REQUIRED:BOOL=ON ^
168-
-DBUILD_DOCUMENTATION:BOOL=OFF ^
169-
-DBUILD_EXAMPLES:BOOL=OFF ^
170-
-DBUILD_TESTING:BOOL=OFF ^
171-
-DKWSYS_USE_MD5:BOOL=ON ^
172-
-DITK_LEGACY_REMOVE:BOOL=ON ^
173-
-DITK_FUTURE_LEGACY_REMOVE:BOOL=ON ^
174-
-DITK_LEGACY_SILENT:BOOL=OFF ^
175-
-DITKV4_COMPATIBILITY:BOOL=OFF ^
176-
-DITK_USE_SYSTEM_EIGEN:BOOL=ON ^
177-
-DITK_USE_SYSTEM_HDF5:BOOL=ON ^
178-
-DITKGroup_Core:BOOL=ON ^
179-
-DITKGroup_Filtering:BOOL=ON ^
180-
-DITKGroup_Registration:BOOL=ON ^
181-
-DITKGroup_Segmentation:BOOL=ON ^
182-
-DITK_BUILD_DEFAULT_MODULES:BOOL=OFF ^
183-
-DModule_ITKTestKernel:BOOL=OFF ^
184-
-DModule_ITKReview:BOOL=OFF ^
185-
-DModule_SCIFIO=OFF ^
186-
-DModule_ITKMetricsv4:BOOL=OFF ^
187-
-DModule_ITKOptimizersv4:BOOL=OFF ^
188-
-DModule_ITKRegistrationMethodsv4:BOOL=OFF ^
189-
-DModule_ITKConvolution:BOOL=ON ^
190-
-DModule_ITKDenoising:BOOL=ON ^
191-
-DModule_ITKImageNoise:BOOL=ON ^
192-
-DITKGroup_IO:BOOL=OFF ^
193-
-DITKGroup_Core:BOOL=OFF ^
194-
-DModule_ITKGDCM:BOOL=OFF ^
195-
-DModule_ITKIOBioRad:BOOL=ON ^
196-
-DModule_ITKIOBMP:BOOL=ON ^
197-
-DModule_ITKIOGE:BOOL=ON ^
198-
-DModule_ITKIOGIPL:BOOL=ON ^
199-
-DModule_ITKIOImageBase:BOOL=ON ^
200-
-DModule_ITKIOIPL:BOOL=ON ^
201-
-DModule_ITKIOJPEG:BOOL=ON ^
202-
-DModule_ITKIOMeta:BOOL=ON ^
203-
-DModule_ITKIOMRC:BOOL=ON ^
204-
-DModule_ITKIONIFTI:BOOL=ON ^
205-
-DModule_ITKIONRRD:BOOL=ON ^
206-
-DModule_ITKIOPNG:BOOL=ON ^
207-
-DModule_ITKIOStimulate:BOOL=ON ^
208-
-DModule_ITKIOTIFF:BOOL=ON ^
209-
-DModule_ITKIOVTK:BOOL=ON ^
210-
-DModule_ITKIOTransformBase:BOOL=ON ^
211-
-DITK_SKIP_PATH_LENGTH_CHECKS:BOOL=ON ^
212-
-DITK_CUSTOM_LIBRARY_SUFFIX:STRING="-NX-$ITK_VERSION"
162+
-D BUILD_SHARED_LIBS:STRING=ON ^
163+
-D CMAKE_OSX_DEPLOYMENT_TARGET:STRING=11.0 ^
164+
-D CMAKE_SKIP_INSTALL_RPATH:BOOL=OFF ^
165+
-D CMAKE_SKIP_RPATH:BOOL=OFF ^
166+
-D CMAKE_CXX_STANDARD:STRING=17 ^
167+
-D CMAKE_CXX_STANDARD_REQUIRED:BOOL=ON ^
168+
-D BUILD_DOCUMENTATION:BOOL=OFF ^
169+
-D BUILD_EXAMPLES:BOOL=OFF ^
170+
-D BUILD_TESTING:BOOL=OFF ^
171+
-D KWSYS_USE_MD5:BOOL=ON ^
172+
-D ITK_LEGACY_REMOVE:BOOL=ON ^
173+
-D ITK_FUTURE_LEGACY_REMOVE:BOOL=ON ^
174+
-D ITK_LEGACY_SILENT:BOOL=OFF ^
175+
-D ITKV4_COMPATIBILITY:BOOL=OFF ^
176+
-D ITK_USE_SYSTEM_EIGEN:BOOL=ON ^
177+
-D ITK_USE_SYSTEM_HDF5:BOOL=ON ^
178+
-D ITKGroup_Core:BOOL=ON ^
179+
-D ITKGroup_Filtering:BOOL=ON ^
180+
-D ITKGroup_Registration:BOOL=ON ^
181+
-D ITKGroup_Segmentation:BOOL=ON ^
182+
-D ITK_BUILD_DEFAULT_MODULES:BOOL=OFF ^
183+
-D Module_ITKTestKernel:BOOL=OFF ^
184+
-D Module_ITKReview:BOOL=OFF ^
185+
-D Module_SCIFIO=OFF ^
186+
-D Module_ITKMetricsv4:BOOL=OFF ^
187+
-D Module_ITKOptimizersv4:BOOL=OFF ^
188+
-D Module_ITKRegistrationMethodsv4:BOOL=OFF ^
189+
-D Module_ITKConvolution:BOOL=ON ^
190+
-D Module_ITKDenoising:BOOL=ON ^
191+
-D Module_ITKImageNoise:BOOL=ON ^
192+
-D ITKGroup_IO:BOOL=OFF ^
193+
-D ITKGroup_Core:BOOL=OFF ^
194+
-D Module_ITKGDCM:BOOL=OFF ^
195+
-D Module_ITKIOBioRad:BOOL=ON ^
196+
-D Module_ITKIOBMP:BOOL=ON ^
197+
-D Module_ITKIOGE:BOOL=ON ^
198+
-D Module_ITKIOGIPL:BOOL=ON ^
199+
-D Module_ITKIOImageBase:BOOL=ON ^
200+
-D Module_ITKIOIPL:BOOL=ON ^
201+
-D Module_ITKIOJPEG:BOOL=ON ^
202+
-D Module_ITKIOMeta:BOOL=ON ^
203+
-D Module_ITKIOMRC:BOOL=ON ^
204+
-D Module_ITKIONIFTI:BOOL=ON ^
205+
-D Module_ITKIONRRD:BOOL=ON ^
206+
-D Module_ITKIOPNG:BOOL=ON ^
207+
-D Module_ITKIOStimulate:BOOL=ON ^
208+
-D Module_ITKIOTIFF:BOOL=ON ^
209+
-D Module_ITKIOVTK:BOOL=ON ^
210+
-D Module_ITKIOTransformBase:BOOL=ON ^
211+
-D ITK_SKIP_PATH_LENGTH_CHECKS:BOOL=ON ^
212+
-D ITK_CUSTOM_LIBRARY_SUFFIX:STRING="-NX-%ITK_VERSION%"
213213

214214
if errorlevel 1 exit 1
215215

conda/build.sh

Lines changed: 55 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,8 @@ cmake -S "../EbsdLib" -B . -G "Ninja" $CMAKE_ARGS \
6767
-D EbsdLib_BUILD_H5SUPPORT:BOOL=OFF \
6868
-D TBB_STATUS_PRINTED:BOOL=ON \
6969
-D CMP_HDF5_USE_CONFIG:BOOL=OFF \
70-
-D GVS_GIT_HASH:STRING="6c0e5ec992472eeae5df9d627de524b59b971fab" \
71-
-D H5Support_DIR:PATH="$SRC_DIR/sdk/H5Support/share/H5Support"
70+
-D GVS_GIT_HASH:STRING="d7db8a3a5f11b97ca56b9864de710f552d9dccf4" \
71+
-D H5Support_DIR:PATH="$PREFIX/share/H5Support"
7272

7373
cmake --build . --target all
7474

@@ -145,62 +145,61 @@ mkdir itk_build
145145
cd itk_build
146146

147147
cmake -S "../itk" -B . -G "Ninja" $CMAKE_ARGS \
148-
-DCMAKE_BUILD_TYPE:STRING=Release \
148+
-D CMAKE_BUILD_TYPE:STRING=Release \
149149
-D CMAKE_INSTALL_PREFIX:PATH="$PREFIX" \
150-
-DCMAKE_SYSTEM_PREFIX_PATH:PATH="$PREFIX" \
151-
-DEigen3_DIR=${PREFIX}/share/eigen3/cmake \
152-
-DBUILD_SHARED_LIBS:STRING=ON \
153-
-DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=11.0 \
154-
-DCMAKE_SKIP_INSTALL_RPATH:BOOL=OFF \
155-
-DCMAKE_SKIP_RPATH:BOOL=OFF \
156-
-DCMAKE_CXX_STANDARD:STRING=17 \
157-
-DCMAKE_CXX_STANDARD_REQUIRED:BOOL=ON \
158-
-DBUILD_DOCUMENTATION:BOOL=OFF \
159-
-DBUILD_EXAMPLES:BOOL=OFF \
160-
-DBUILD_TESTING:BOOL=OFF \
161-
-DKWSYS_USE_MD5:BOOL=ON \
162-
-DITK_LEGACY_REMOVE:BOOL=ON \
163-
-DITK_FUTURE_LEGACY_REMOVE:BOOL=ON \
164-
-DITK_LEGACY_SILENT:BOOL=OFF \
165-
-DITKV4_COMPATIBILITY:BOOL=OFF \
166-
-DITK_USE_SYSTEM_EIGEN:BOOL=ON \
167-
-DITK_USE_SYSTEM_HDF5:BOOL=ON \
168-
-DITKGroup_Core:BOOL=ON \
169-
-DITKGroup_Filtering:BOOL=ON \
170-
-DITKGroup_Registration:BOOL=ON \
171-
-DITKGroup_Segmentation:BOOL=ON \
172-
-DITK_BUILD_DEFAULT_MODULES:BOOL=OFF \
173-
-DModule_ITKTestKernel:BOOL=OFF \
174-
-DModule_ITKReview:BOOL=OFF \
175-
-DModule_SCIFIO=OFF \
176-
-DModule_ITKMetricsv4:BOOL=OFF \
177-
-DModule_ITKOptimizersv4:BOOL=OFF \
178-
-DModule_ITKRegistrationMethodsv4:BOOL=OFF \
179-
-DModule_ITKConvolution:BOOL=ON \
180-
-DModule_ITKDenoising:BOOL=ON \
181-
-DModule_ITKImageNoise:BOOL=ON \
182-
-DITKGroup_IO:BOOL=OFF \
183-
-DITKGroup_Core:BOOL=OFF \
184-
-DModule_ITKGDCM:BOOL=OFF \
185-
-DModule_ITKIOBioRad:BOOL=ON \
186-
-DModule_ITKIOBMP:BOOL=ON \
187-
-DModule_ITKIOGE:BOOL=ON \
188-
-DModule_ITKIOGIPL:BOOL=ON \
189-
-DModule_ITKIOImageBase:BOOL=ON \
190-
-DModule_ITKIOIPL:BOOL=ON \
191-
-DModule_ITKIOJPEG:BOOL=ON \
192-
-DModule_ITKIOMeta:BOOL=ON \
193-
-DModule_ITKIOMRC:BOOL=ON \
194-
-DModule_ITKIONIFTI:BOOL=ON \
195-
-DModule_ITKIONRRD:BOOL=ON \
196-
-DModule_ITKIOPNG:BOOL=ON \
197-
-DModule_ITKIOStimulate:BOOL=ON \
198-
-DModule_ITKIOTIFF:BOOL=ON \
199-
-DModule_ITKIOVTK:BOOL=ON \
200-
-DModule_ITKIOTransformBase:BOOL=ON \
150+
-D CMAKE_SYSTEM_PREFIX_PATH:PATH="$PREFIX" \
151+
-D Eigen3_DIR=${PREFIX}/share/eigen3/cmake \
152+
-D BUILD_SHARED_LIBS:STRING=ON \
153+
-D CMAKE_OSX_DEPLOYMENT_TARGET:STRING=11.0 \
154+
-D CMAKE_SKIP_INSTALL_RPATH:BOOL=OFF \
155+
-D CMAKE_SKIP_RPATH:BOOL=OFF \
156+
-D CMAKE_CXX_STANDARD:STRING=17 \
157+
-D CMAKE_CXX_STANDARD_REQUIRED:BOOL=ON \
158+
-D BUILD_DOCUMENTATION:BOOL=OFF \
159+
-D BUILD_EXAMPLES:BOOL=OFF \
160+
-D BUILD_TESTING:BOOL=OFF \
161+
-D KWSYS_USE_MD5:BOOL=ON \
162+
-D ITK_LEGACY_REMOVE:BOOL=ON \
163+
-D ITK_FUTURE_LEGACY_REMOVE:BOOL=ON \
164+
-D ITK_LEGACY_SILENT:BOOL=OFF \
165+
-D ITKV4_COMPATIBILITY:BOOL=OFF \
166+
-D ITK_USE_SYSTEM_EIGEN:BOOL=ON \
167+
-D ITK_USE_SYSTEM_HDF5:BOOL=ON \
168+
-D ITKGroup_Core:BOOL=ON \
169+
-D ITKGroup_Filtering:BOOL=ON \
170+
-D ITKGroup_Registration:BOOL=ON \
171+
-D ITKGroup_Segmentation:BOOL=ON \
172+
-D ITK_BUILD_DEFAULT_MODULES:BOOL=OFF \
173+
-D Module_ITKTestKernel:BOOL=OFF \
174+
-D Module_ITKReview:BOOL=OFF \
175+
-D Module_SCIFIO=OFF \
176+
-D Module_ITKMetricsv4:BOOL=OFF \
177+
-D Module_ITKOptimizersv4:BOOL=OFF \
178+
-D Module_ITKRegistrationMethodsv4:BOOL=OFF \
179+
-D Module_ITKConvolution:BOOL=ON \
180+
-D Module_ITKDenoising:BOOL=ON \
181+
-D Module_ITKImageNoise:BOOL=ON \
182+
-D ITKGroup_IO:BOOL=OFF \
183+
-D ITKGroup_Core:BOOL=OFF \
184+
-D Module_ITKGDCM:BOOL=OFF \
185+
-D Module_ITKIOBioRad:BOOL=ON \
186+
-D Module_ITKIOBMP:BOOL=ON \
187+
-D Module_ITKIOGE:BOOL=ON \
188+
-D Module_ITKIOGIPL:BOOL=ON \
189+
-D Module_ITKIOImageBase:BOOL=ON \
190+
-D Module_ITKIOIPL:BOOL=ON \
191+
-D Module_ITKIOJPEG:BOOL=ON \
192+
-D Module_ITKIOMeta:BOOL=ON \
193+
-D Module_ITKIOMRC:BOOL=ON \
194+
-D Module_ITKIONIFTI:BOOL=ON \
195+
-D Module_ITKIONRRD:BOOL=ON \
196+
-D Module_ITKIOPNG:BOOL=ON \
197+
-D Module_ITKIOStimulate:BOOL=ON \
198+
-D Module_ITKIOTIFF:BOOL=ON \
199+
-D Module_ITKIOVTK:BOOL=ON \
200+
-D Module_ITKIOTransformBase:BOOL=ON \
201201
-DITK_CUSTOM_LIBRARY_SUFFIX:STRING="-NX-$ITK_VERSION"
202202

203-
204203
#if errorlevel 1 exit 1
205204

206205
cmake --build . --target all
@@ -220,7 +219,7 @@ mkdir build
220219
cd build
221220

222221
cmake --preset $SIMPLNX_CMAKE_PRESET ../simplnx $CMAKE_ARGS \
223-
-D CMAKE_OSX_DEPLOYMENT_TARGET:STRING="11.0"\
222+
-D CMAKE_OSX_DEPLOYMENT_TARGET:STRING="11.0" \
224223
-D CMAKE_INSTALL_PREFIX:PATH="$PREFIX" \
225224
-D Python3_EXECUTABLE:FILEPATH=$PREFIX/bin/python3
226225

conda/conda_build_config.yaml

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,27 @@
1+
# Some clients of the conda package are still compiling on VS2019 (v142) tools.
2+
# DO NOT CHANGE THIS Value unless those clients are able to move up to a newer
3+
# toolset. There is no ETA on this.
14
cxx_compiler:
25
- vs2019 # [win]
36

7+
# The OS X compiler version needs to stay at 16.0.6 due to issues generating code
8+
# with anything newer. If you _THINK_ you want to update this compiler version
9+
# you MUST run a full `conda build .` on a MacOS machine (Both ARM64 and x64) running
10+
# at least MacOS 14.5 Sonoma with Xcode 15.4
411
c_compiler_version: # [unix]
5-
- 10.4.0 # [linux]
6-
- 17.0.6 # [osx]
12+
- 11.4.0 # [linux]
13+
- 16.0.6 # [osx]
714

15+
# The OS X compiler version needs to stay at 16.0.6 due to issues generating code
16+
# with anything newer. If you _THINK_ you want to update this compiler version
17+
# you MUST run a full `conda build .` on a MacOS machine (Both ARM64 and x64) running
18+
# at least MacOS 14.5 Sonoma with Xcode 15.4
819
cxx_compiler_version:
9-
- 10.4.0 # [linux]
10-
- 17.0.6 # [osx]
20+
- 11.4.0 # [linux]
21+
- 16.0.6 # [osx]
1122

1223
python:
13-
- 3.12
14-
24+
- 3.12 # [osx and arm64]
25+
- 3.12 # [win64 or linux]
26+
- 3.11
27+

conda/meta.yaml

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{% set name = "simplnx" %}
2-
{% set version = "1.5.0" %}
2+
{% set version = "24.08.03" %}
33

44
package:
55
name: {{ name|lower }}
@@ -9,24 +9,24 @@ source:
99
- path: ../
1010
folder: simplnx
1111
- git_url: https://github.com/BlueQuartzSoftware/EbsdLib
12-
git_rev: v1.0.29
12+
git_rev: v1.0.30
1313
folder: EbsdLib
1414
- git_url: https://github.com/BlueQuartzSoftware/H5Support
1515
git_rev: v1.0.13
1616
folder: H5Support
1717
- git_url: https://github.com/martinmoene/expected-lite
18-
git_rev: v0.6.3
18+
git_rev: v0.8.0
1919
folder: expected-lite
2020
- git_url: https://github.com/fr00b0/nod
21-
git_rev: v0.5.3
21+
git_rev: v0.5.4
2222
folder: nod
2323
- git_url: https://github.com/martinmoene/span-lite
2424
git_rev: v0.11.0
2525
folder: span-lite
2626
- url: https://raw.githubusercontent.com/BlueQuartzSoftware/simplnx-registry/9a5db7b5fa02b2495eb51654cbaab3c63820c779/ports/nod/CMakeLists.txt
2727
folder: nod
2828
- git_url: https://github.com/insightsoftwareconsortium/ITK
29-
git_rev: v5.2.1
29+
git_rev: v5.4.0
3030
folder: itk
3131

3232
build:
@@ -35,7 +35,7 @@ build:
3535
- SIMPLNX_CMAKE_PRESET=conda-win # [win]
3636
- SIMPLNX_CMAKE_PRESET=conda-linux # [linux]
3737
- SIMPLNX_CMAKE_PRESET=conda-osx # [osx]
38-
- ITK_VERSION=5.2.1
38+
- ITK_VERSION=5.4.0
3939

4040
requirements:
4141
build:
@@ -50,8 +50,7 @@ requirements:
5050
- boost_mp11
5151
- eigen
5252
- fmt =10
53-
- hdf5 >=1.14.3 # [py>=312]
54-
- hdf5 =1.12 # [py<=311]
53+
- hdf5 >=1.14.3
5554
- nlohmann_json
5655
- pybind11 >=2.10
5756
- reproc-cpp
@@ -67,8 +66,7 @@ requirements:
6766
- python
6867
- numpy
6968
- fmt =10
70-
- hdf5 >=1.14.3 # [py>=312]
71-
- hdf5 =1.12 # [py<=311]
69+
- hdf5 >=1.14.3
7270
- reproc-cpp
7371
- tbb
7472
- zlib

src/Plugins/ITKImageProcessing/CMakeLists.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,6 @@ set(ItkComponents
3636
ITKWatersheds
3737
)
3838

39-
if(ITK_VERSION_MAJOR EQUAL 5 AND ITK_VERSION_MINOR EQUAL 2)
40-
list(APPEND ItkComponents ITKMathematicalMorphology)
41-
endif()
42-
4339
find_package(ITK COMPONENTS ${ItkComponents} REQUIRED)
4440

4541
get_property(GENERATOR_IS_MULTI_CONFIG GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)

src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Common/ITKDream3DFilterInterruption.hpp

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,6 @@
22

33
#include "itkConfigure.h"
44

5-
#if defined(ITK_VERSION_MAJOR) && ITK_VERSION_MAJOR == 4
6-
#ifdef __clang__
7-
#pragma clang diagnostic push
8-
#pragma clang diagnostic ignored "-Wself-assign-field"
9-
#endif
10-
#endif
11-
125
#include <itkCommand.h>
136
#include <itkProcessObject.h>
147

@@ -39,7 +32,11 @@ class Dream3DFilterInterruption : public Command
3932
}
4033

4134
/** Run-time type information (and related methods). */
35+
#if defined(ITK_VERSION_MAJOR) && ITK_VERSION_MAJOR == 5 && defined(ITK_VERSION_MINOR) && ITK_VERSION_MINOR == 2
4236
itkTypeMacro(Dream3DFilterInterruption, itk::Command);
37+
#else
38+
itkOverrideGetNameOfClassMacro(Dream3DFilterInterruption);
39+
#endif
4340

4441
void Execute(Object* caller, const EventObject& event) override
4542
{

0 commit comments

Comments
 (0)