From 76b2c2ca4fd23a5f5d1bff1b23d56518c4ffcdcf Mon Sep 17 00:00:00 2001 From: Michael Jackson Date: Tue, 6 Aug 2024 14:43:44 -0400 Subject: [PATCH] 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 --- conda/bld.bat | 108 ++++++++--------- conda/build.sh | 111 +++++++++--------- conda/conda_build_config.yaml | 25 +++- conda/meta.yaml | 18 ++- src/Plugins/ITKImageProcessing/CMakeLists.txt | 4 - .../Common/ITKDream3DFilterInterruption.hpp | 11 +- .../Common/ITKProgressObserver.hpp | 4 + vcpkg-configuration.json | 2 +- vcpkg.json | 2 +- 9 files changed, 146 insertions(+), 139 deletions(-) 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 c4bd67b7c2..f90d27c418 100644 --- a/conda/build.sh +++ b/conda/build.sh @@ -67,8 +67,8 @@ cmake -S "../EbsdLib" -B . -G "Ninja" $CMAKE_ARGS \ -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="$SRC_DIR/sdk/H5Support/share/H5Support" + -D GVS_GIT_HASH:STRING="d7db8a3a5f11b97ca56b9864de710f552d9dccf4" \ + -D H5Support_DIR:PATH="$PREFIX/share/H5Support" cmake --build . --target all @@ -145,62 +145,61 @@ mkdir itk_build cd itk_build cmake -S "../itk" -B . -G "Ninja" $CMAKE_ARGS \ - -DCMAKE_BUILD_TYPE:STRING=Release \ + -D CMAKE_BUILD_TYPE:STRING=Release \ -D CMAKE_INSTALL_PREFIX:PATH="$PREFIX" \ - -DCMAKE_SYSTEM_PREFIX_PATH:PATH="$PREFIX" \ - -DEigen3_DIR=${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 \ + -D CMAKE_SYSTEM_PREFIX_PATH:PATH="$PREFIX" \ + -D Eigen3_DIR=${PREFIX}/share/eigen3/cmake \ + -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 \ -DITK_CUSTOM_LIBRARY_SUFFIX:STRING="-NX-$ITK_VERSION" - #if errorlevel 1 exit 1 cmake --build . --target all @@ -220,7 +219,7 @@ mkdir build cd build cmake --preset $SIMPLNX_CMAKE_PRESET ../simplnx $CMAKE_ARGS \ - -D CMAKE_OSX_DEPLOYMENT_TARGET:STRING="11.0"\ + -D CMAKE_OSX_DEPLOYMENT_TARGET:STRING="11.0" \ -D CMAKE_INSTALL_PREFIX:PATH="$PREFIX" \ -D Python3_EXECUTABLE:FILEPATH=$PREFIX/bin/python3 diff --git a/conda/conda_build_config.yaml b/conda/conda_build_config.yaml index 839dc3a7a4..1aec107332 100644 --- a/conda/conda_build_config.yaml +++ b/conda/conda_build_config.yaml @@ -1,14 +1,27 @@ +# Some clients of the conda package are still compiling on VS2019 (v142) tools. +# DO NOT CHANGE THIS Value unless those clients are able to move up to a newer +# toolset. There is no ETA on this. cxx_compiler: - vs2019 # [win] +# The OS X compiler version needs to stay at 16.0.6 due to issues generating code +# with anything newer. If you _THINK_ you want to update this compiler version +# you MUST run a full `conda build .` on a MacOS machine (Both ARM64 and x64) running +# at least MacOS 14.5 Sonoma with Xcode 15.4 c_compiler_version: # [unix] - - 10.4.0 # [linux] - - 17.0.6 # [osx] + - 11.4.0 # [linux] + - 16.0.6 # [osx] +# The OS X compiler version needs to stay at 16.0.6 due to issues generating code +# with anything newer. If you _THINK_ you want to update this compiler version +# you MUST run a full `conda build .` on a MacOS machine (Both ARM64 and x64) running +# at least MacOS 14.5 Sonoma with Xcode 15.4 cxx_compiler_version: - - 10.4.0 # [linux] - - 17.0.6 # [osx] + - 11.4.0 # [linux] + - 16.0.6 # [osx] python: - - 3.12 - + - 3.12 # [osx and arm64] + - 3.12 # [win64 or linux] + - 3.11 + \ No newline at end of file diff --git a/conda/meta.yaml b/conda/meta.yaml index 6fa7579945..be5133c56f 100644 --- a/conda/meta.yaml +++ b/conda/meta.yaml @@ -1,5 +1,5 @@ {% set name = "simplnx" %} -{% set version = "1.5.0" %} +{% set version = "24.08.03" %} package: name: {{ name|lower }} @@ -9,16 +9,16 @@ source: - path: ../ folder: simplnx - git_url: https://github.com/BlueQuartzSoftware/EbsdLib - git_rev: v1.0.29 + git_rev: v1.0.30 folder: EbsdLib - git_url: https://github.com/BlueQuartzSoftware/H5Support git_rev: v1.0.13 folder: H5Support - git_url: https://github.com/martinmoene/expected-lite - git_rev: v0.6.3 + git_rev: v0.8.0 folder: expected-lite - git_url: https://github.com/fr00b0/nod - git_rev: v0.5.3 + git_rev: v0.5.4 folder: nod - git_url: https://github.com/martinmoene/span-lite git_rev: v0.11.0 @@ -26,7 +26,7 @@ source: - url: https://raw.githubusercontent.com/BlueQuartzSoftware/simplnx-registry/9a5db7b5fa02b2495eb51654cbaab3c63820c779/ports/nod/CMakeLists.txt folder: nod - git_url: https://github.com/insightsoftwareconsortium/ITK - git_rev: v5.2.1 + git_rev: v5.4.0 folder: itk build: @@ -35,7 +35,7 @@ build: - SIMPLNX_CMAKE_PRESET=conda-win # [win] - SIMPLNX_CMAKE_PRESET=conda-linux # [linux] - SIMPLNX_CMAKE_PRESET=conda-osx # [osx] - - ITK_VERSION=5.2.1 + - ITK_VERSION=5.4.0 requirements: build: @@ -50,8 +50,7 @@ requirements: - boost_mp11 - eigen - fmt =10 - - hdf5 >=1.14.3 # [py>=312] - - hdf5 =1.12 # [py<=311] + - hdf5 >=1.14.3 - nlohmann_json - pybind11 >=2.10 - reproc-cpp @@ -67,8 +66,7 @@ requirements: - python - numpy - fmt =10 - - hdf5 >=1.14.3 # [py>=312] - - hdf5 =1.12 # [py<=311] + - hdf5 >=1.14.3 - reproc-cpp - tbb - zlib diff --git a/src/Plugins/ITKImageProcessing/CMakeLists.txt b/src/Plugins/ITKImageProcessing/CMakeLists.txt index b1506b4cb0..38ada39ffd 100644 --- a/src/Plugins/ITKImageProcessing/CMakeLists.txt +++ b/src/Plugins/ITKImageProcessing/CMakeLists.txt @@ -36,10 +36,6 @@ set(ItkComponents ITKWatersheds ) -if(ITK_VERSION_MAJOR EQUAL 5 AND ITK_VERSION_MINOR EQUAL 2) - list(APPEND ItkComponents ITKMathematicalMorphology) -endif() - find_package(ITK COMPONENTS ${ItkComponents} REQUIRED) get_property(GENERATOR_IS_MULTI_CONFIG GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG) diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Common/ITKDream3DFilterInterruption.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Common/ITKDream3DFilterInterruption.hpp index 28f837e151..c4306cd7ef 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Common/ITKDream3DFilterInterruption.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Common/ITKDream3DFilterInterruption.hpp @@ -2,13 +2,6 @@ #include "itkConfigure.h" -#if defined(ITK_VERSION_MAJOR) && ITK_VERSION_MAJOR == 4 -#ifdef __clang__ -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wself-assign-field" -#endif -#endif - #include #include @@ -39,7 +32,11 @@ class Dream3DFilterInterruption : public Command } /** Run-time type information (and related methods). */ +#if defined(ITK_VERSION_MAJOR) && ITK_VERSION_MAJOR == 5 && defined(ITK_VERSION_MINOR) && ITK_VERSION_MINOR == 2 itkTypeMacro(Dream3DFilterInterruption, itk::Command); +#else + itkOverrideGetNameOfClassMacro(Dream3DFilterInterruption); +#endif void Execute(Object* caller, const EventObject& event) override { diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Common/ITKProgressObserver.hpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Common/ITKProgressObserver.hpp index 66da392c62..8f86fee871 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Common/ITKProgressObserver.hpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Common/ITKProgressObserver.hpp @@ -34,7 +34,11 @@ class ProgressObserver : public itk::Command } /** Run-time type information (and related methods). */ +#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 { diff --git a/vcpkg-configuration.json b/vcpkg-configuration.json index 558b809fa6..7d76abb8e3 100644 --- a/vcpkg-configuration.json +++ b/vcpkg-configuration.json @@ -33,7 +33,7 @@ "zlib", "zstd" ], - "baseline": "ed3fc6a2a4acac755b8006db8752496c585b830c" + "baseline": "09bb3d1ffbbcdc3b541d69690ea2b40213ca470a" } ] } diff --git a/vcpkg.json b/vcpkg.json index e69c822f00..7c19010f17 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -74,7 +74,7 @@ "dependencies": [ { "name": "ebsdlib", - "version>=": "1.0.29" + "version>=": "1.0.30" } ] },