From 26abd4fb35a3ae45535308534b04f86c7bc2e0e7 Mon Sep 17 00:00:00 2001 From: Niels Dekker Date: Mon, 23 Dec 2024 11:55:19 +0100 Subject: [PATCH] COMP: Upgrade from ITK 5.4.0 to ITK 5.4.1 Aims to fix errors on Azure Pipelines (Windows), saying: > itktiff-5.4.lib(tif_luv.obj) : error LNK2005: __ucrt_int_to_float already defined in itktiff-5.4.lib The releases of ITK version 5.4.0 and version 5.4.1 are still to be announced, but they are already tagged, officially. ITK 5.4.1 was tagged on December 14, 2024. Comparison between the two versions: https://github.com/InsightSoftwareConsortium/ITK/compare/v5.4.0...v5.4.1 --- .github/workflows/ElastixGitHubActions.yml | 6 +++--- CMakeLists.txt | 2 +- Testing/CI/Azure/ci.yml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ElastixGitHubActions.yml b/.github/workflows/ElastixGitHubActions.yml index 9c826f578..2da9436e7 100644 --- a/.github/workflows/ElastixGitHubActions.yml +++ b/.github/workflows/ElastixGitHubActions.yml @@ -18,21 +18,21 @@ jobs: - os: ubuntu-22.04 c-compiler: "gcc" cxx-compiler: "g++" - itk-git-tag: "v5.4.0" + itk-git-tag: "v5.4.1" cmake-build-type: "Release" ANNLib: "libANNlib-5.2.so" ANNLib2: "libANNlib-5.2.so.1" - os: windows-2022 c-compiler: "cl.exe" cxx-compiler: "cl.exe" - itk-git-tag: "v5.4.0" + itk-git-tag: "v5.4.1" cmake-build-type: "Release" ANNLib: "ANNlib-5.2.dll" vcvars64: "C:/Program Files/Microsoft Visual Studio/2022/Enterprise/VC/Auxiliary/Build/vcvars64.bat" - os: macos-13 c-compiler: "clang" cxx-compiler: "clang++" - itk-git-tag: "v5.4.0" + itk-git-tag: "v5.4.1" cmake-build-type: "Release" ANNLib: "libANNlib-5.2.1.dylib" ANNLib2: "libANNlib-5.2.dylib" diff --git a/CMakeLists.txt b/CMakeLists.txt index 9f68472dc..7808577f0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -32,7 +32,7 @@ if(ELASTIX_USE_OPENCL) endif() # Find ITK. -find_package(ITK 5.4 REQUIRED COMPONENTS +find_package(ITK 5.4.1 REQUIRED COMPONENTS ITKCommon ITKDisplacementField ITKDistanceMap diff --git a/Testing/CI/Azure/ci.yml b/Testing/CI/Azure/ci.yml index a9da1f87a..bafceaa46 100644 --- a/Testing/CI/Azure/ci.yml +++ b/Testing/CI/Azure/ci.yml @@ -1,5 +1,5 @@ variables: - ITKv5_VERSION: v5.4.0 + ITKv5_VERSION: v5.4.1 ITK_GIT_URL: https://github.com/InsightSoftwareConsortium/ITK ITK_SOURCE_DIR: $(Agent.BuildDirectory)/ITK-source ITK_BINARY_DIR: $(Agent.BuildDirectory)/ITK-build