diff --git a/conda/bld.bat b/conda/bld.bat index 6b3e157f13..8f8039e92d 100644 --- a/conda/bld.bat +++ b/conda/bld.bat @@ -63,8 +63,8 @@ cmake -S "%SRC_DIR%/EbsdLib" -B . -G "Ninja" ^ -D EbsdLib_BUILD_H5SUPPORT:BOOL=OFF ^ -D TBB_STATUS_PRINTED:BOOL=ON ^ -D CMP_HDF5_USE_CONFIG:BOOL=OFF ^ - -D GVS_GIT_HASH:STRING="6c0e5ec992472eeae5df9d627de524b59b971fab" ^ - -D H5Support_DIR:PATH="%lib_prefix%/share/H5Support" + -D GVS_GIT_HASH:STRING="d7db8a3a5f11b97ca56b9864de710f552d9dccf4" ^ + -D H5Support_DIR:PATH="%LIBRARY_PREFIX%/share/H5Support" if errorlevel 1 exit 1 cmake --build . --target all @@ -155,61 +155,61 @@ mkdir itk_build cd itk_build cmake -S "%SRC_DIR%/itk" -B . -G "Ninja" $CMAKE_ARGS ^ - -DCMAKE_BUILD_TYPE:STRING=Release ^ + -D CMAKE_BUILD_TYPE:STRING=Release ^ -D CMAKE_INSTALL_PREFIX:PATH="%LIBRARY_PREFIX%" ^ -D CMAKE_SYSTEM_PREFIX_PATH:PATH="%LIBRARY_PREFIX%" ^ -D Eigen3_DIR=%lib_prefix%/share/eigen3/cmake ^ - -DBUILD_SHARED_LIBS:STRING=ON ^ - -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=11.0 ^ - -DCMAKE_SKIP_INSTALL_RPATH:BOOL=OFF ^ - -DCMAKE_SKIP_RPATH:BOOL=OFF ^ - -DCMAKE_CXX_STANDARD:STRING=17 ^ - -DCMAKE_CXX_STANDARD_REQUIRED:BOOL=ON ^ - -DBUILD_DOCUMENTATION:BOOL=OFF ^ - -DBUILD_EXAMPLES:BOOL=OFF ^ - -DBUILD_TESTING:BOOL=OFF ^ - -DKWSYS_USE_MD5:BOOL=ON ^ - -DITK_LEGACY_REMOVE:BOOL=ON ^ - -DITK_FUTURE_LEGACY_REMOVE:BOOL=ON ^ - -DITK_LEGACY_SILENT:BOOL=OFF ^ - -DITKV4_COMPATIBILITY:BOOL=OFF ^ - -DITK_USE_SYSTEM_EIGEN:BOOL=ON ^ - -DITK_USE_SYSTEM_HDF5:BOOL=ON ^ - -DITKGroup_Core:BOOL=ON ^ - -DITKGroup_Filtering:BOOL=ON ^ - -DITKGroup_Registration:BOOL=ON ^ - -DITKGroup_Segmentation:BOOL=ON ^ - -DITK_BUILD_DEFAULT_MODULES:BOOL=OFF ^ - -DModule_ITKTestKernel:BOOL=OFF ^ - -DModule_ITKReview:BOOL=OFF ^ - -DModule_SCIFIO=OFF ^ - -DModule_ITKMetricsv4:BOOL=OFF ^ - -DModule_ITKOptimizersv4:BOOL=OFF ^ - -DModule_ITKRegistrationMethodsv4:BOOL=OFF ^ - -DModule_ITKConvolution:BOOL=ON ^ - -DModule_ITKDenoising:BOOL=ON ^ - -DModule_ITKImageNoise:BOOL=ON ^ - -DITKGroup_IO:BOOL=OFF ^ - -DITKGroup_Core:BOOL=OFF ^ - -DModule_ITKGDCM:BOOL=OFF ^ - -DModule_ITKIOBioRad:BOOL=ON ^ - -DModule_ITKIOBMP:BOOL=ON ^ - -DModule_ITKIOGE:BOOL=ON ^ - -DModule_ITKIOGIPL:BOOL=ON ^ - -DModule_ITKIOImageBase:BOOL=ON ^ - -DModule_ITKIOIPL:BOOL=ON ^ - -DModule_ITKIOJPEG:BOOL=ON ^ - -DModule_ITKIOMeta:BOOL=ON ^ - -DModule_ITKIOMRC:BOOL=ON ^ - -DModule_ITKIONIFTI:BOOL=ON ^ - -DModule_ITKIONRRD:BOOL=ON ^ - -DModule_ITKIOPNG:BOOL=ON ^ - -DModule_ITKIOStimulate:BOOL=ON ^ - -DModule_ITKIOTIFF:BOOL=ON ^ - -DModule_ITKIOVTK:BOOL=ON ^ - -DModule_ITKIOTransformBase:BOOL=ON ^ - -DITK_SKIP_PATH_LENGTH_CHECKS:BOOL=ON ^ - -DITK_CUSTOM_LIBRARY_SUFFIX:STRING="-NX-$ITK_VERSION" + -D BUILD_SHARED_LIBS:STRING=ON ^ + -D CMAKE_OSX_DEPLOYMENT_TARGET:STRING=11.0 ^ + -D CMAKE_SKIP_INSTALL_RPATH:BOOL=OFF ^ + -D CMAKE_SKIP_RPATH:BOOL=OFF ^ + -D CMAKE_CXX_STANDARD:STRING=17 ^ + -D CMAKE_CXX_STANDARD_REQUIRED:BOOL=ON ^ + -D BUILD_DOCUMENTATION:BOOL=OFF ^ + -D BUILD_EXAMPLES:BOOL=OFF ^ + -D BUILD_TESTING:BOOL=OFF ^ + -D KWSYS_USE_MD5:BOOL=ON ^ + -D ITK_LEGACY_REMOVE:BOOL=ON ^ + -D ITK_FUTURE_LEGACY_REMOVE:BOOL=ON ^ + -D ITK_LEGACY_SILENT:BOOL=OFF ^ + -D ITKV4_COMPATIBILITY:BOOL=OFF ^ + -D ITK_USE_SYSTEM_EIGEN:BOOL=ON ^ + -D ITK_USE_SYSTEM_HDF5:BOOL=ON ^ + -D ITKGroup_Core:BOOL=ON ^ + -D ITKGroup_Filtering:BOOL=ON ^ + -D ITKGroup_Registration:BOOL=ON ^ + -D ITKGroup_Segmentation:BOOL=ON ^ + -D ITK_BUILD_DEFAULT_MODULES:BOOL=OFF ^ + -D Module_ITKTestKernel:BOOL=OFF ^ + -D Module_ITKReview:BOOL=OFF ^ + -D Module_SCIFIO=OFF ^ + -D Module_ITKMetricsv4:BOOL=OFF ^ + -D Module_ITKOptimizersv4:BOOL=OFF ^ + -D Module_ITKRegistrationMethodsv4:BOOL=OFF ^ + -D Module_ITKConvolution:BOOL=ON ^ + -D Module_ITKDenoising:BOOL=ON ^ + -D Module_ITKImageNoise:BOOL=ON ^ + -D ITKGroup_IO:BOOL=OFF ^ + -D ITKGroup_Core:BOOL=OFF ^ + -D Module_ITKGDCM:BOOL=OFF ^ + -D Module_ITKIOBioRad:BOOL=ON ^ + -D Module_ITKIOBMP:BOOL=ON ^ + -D Module_ITKIOGE:BOOL=ON ^ + -D Module_ITKIOGIPL:BOOL=ON ^ + -D Module_ITKIOImageBase:BOOL=ON ^ + -D Module_ITKIOIPL:BOOL=ON ^ + -D Module_ITKIOJPEG:BOOL=ON ^ + -D Module_ITKIOMeta:BOOL=ON ^ + -D Module_ITKIOMRC:BOOL=ON ^ + -D Module_ITKIONIFTI:BOOL=ON ^ + -D Module_ITKIONRRD:BOOL=ON ^ + -D Module_ITKIOPNG:BOOL=ON ^ + -D Module_ITKIOStimulate:BOOL=ON ^ + -D Module_ITKIOTIFF:BOOL=ON ^ + -D Module_ITKIOVTK:BOOL=ON ^ + -D Module_ITKIOTransformBase:BOOL=ON ^ + -D ITK_SKIP_PATH_LENGTH_CHECKS:BOOL=ON ^ + -D ITK_CUSTOM_LIBRARY_SUFFIX:STRING="-NX-%ITK_VERSION%" if errorlevel 1 exit 1 diff --git a/conda/build.sh b/conda/build.sh index 32f187b1a7..f90d27c418 100644 --- a/conda/build.sh +++ b/conda/build.sh @@ -68,7 +68,7 @@ cmake -S "../EbsdLib" -B . -G "Ninja" $CMAKE_ARGS \ -D TBB_STATUS_PRINTED:BOOL=ON \ -D CMP_HDF5_USE_CONFIG:BOOL=OFF \ -D GVS_GIT_HASH:STRING="d7db8a3a5f11b97ca56b9864de710f552d9dccf4" \ - -D H5Support_DIR:PATH="$PREFIX/share/H5Support/H5Support" + -D H5Support_DIR:PATH="$PREFIX/share/H5Support" cmake --build . --target all diff --git a/conda/conda_build_config.yaml b/conda/conda_build_config.yaml index c589e4f966..1aec107332 100644 --- a/conda/conda_build_config.yaml +++ b/conda/conda_build_config.yaml @@ -21,5 +21,7 @@ cxx_compiler_version: - 16.0.6 # [osx] python: - - 3.12 - - 3.11 + - 3.12 # [osx and arm64] + - 3.12 # [win64 or linux] + - 3.11 + \ No newline at end of file diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Common/ITKDream3DFilterInterruption.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Common/ITKDream3DFilterInterruption.hpp index 9be471c402..c4306cd7ef 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Common/ITKDream3DFilterInterruption.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Common/ITKDream3DFilterInterruption.hpp @@ -2,7 +2,6 @@ #include "itkConfigure.h" - #include #include @@ -33,7 +32,7 @@ class Dream3DFilterInterruption : public Command } /** Run-time type information (and related methods). */ -#if defined(ITK_VERSION_MAJOR) && ITK_VERSION_MINOR == 2 +#if defined(ITK_VERSION_MAJOR) && ITK_VERSION_MAJOR == 5 && defined(ITK_VERSION_MINOR) && ITK_VERSION_MINOR == 2 itkTypeMacro(Dream3DFilterInterruption, itk::Command); #else itkOverrideGetNameOfClassMacro(Dream3DFilterInterruption); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Common/ITKProgressObserver.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Common/ITKProgressObserver.hpp index d6b6d4c37c..8f86fee871 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Common/ITKProgressObserver.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Common/ITKProgressObserver.hpp @@ -34,13 +34,12 @@ class ProgressObserver : public itk::Command } /** Run-time type information (and related methods). */ -#if defined(ITK_VERSION_MAJOR) && ITK_VERSION_MINOR == 2 +#if defined(ITK_VERSION_MAJOR) && ITK_VERSION_MAJOR == 5 && defined(ITK_VERSION_MINOR) && ITK_VERSION_MINOR == 2 itkTypeMacro(ProgressObserver, itk::Command); #else itkOverrideGetNameOfClassMacro(ProgressObserver); #endif - void Execute(itk::Object* caller, const itk::EventObject& event) override { Execute((const itk::Object*)caller, event);