Skip to content

Commit

Permalink
COMP: Upgrade from ITK 5.4.0 to ITK 5.4.1
Browse files Browse the repository at this point in the history
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:
InsightSoftwareConsortium/ITK@v5.4.0...v5.4.1
  • Loading branch information
N-Dekker committed Jan 2, 2025
1 parent f928159 commit 26abd4f
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ElastixGitHubActions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Testing/CI/Azure/ci.yml
Original file line number Diff line number Diff line change
@@ -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
Expand Down

0 comments on commit 26abd4f

Please sign in to comment.