diff --git a/.github/workflows/ElastixGitHubActions.yml b/.github/workflows/ElastixGitHubActions.yml index 5b07aceaa..fac70b15c 100644 --- a/.github/workflows/ElastixGitHubActions.yml +++ b/.github/workflows/ElastixGitHubActions.yml @@ -15,7 +15,7 @@ jobs: cxx-compiler: "g++" libtorch-cpu-url: "https://download.pytorch.org/libtorch/cpu/libtorch-shared-with-deps-2.8.0%2Bcpu.zip" cuda-version: "cpu" - itk-git-tag: "v5.4.5" + itk-git-tag: "v5.4.6" cmake-build-type: "Release" libs: - elastix-build/bin/libelx-ANNlib.so @@ -25,7 +25,7 @@ jobs: cxx-compiler: "cl.exe" libtorch-cpu-url: "https://download.pytorch.org/libtorch/cpu/libtorch-win-shared-with-deps-2.8.0%2Bcpu.zip" cuda-version: "cpu" - itk-git-tag: "v5.4.5" + itk-git-tag: "v5.4.6" cmake-build-type: "Release" libs: - elastix-build/bin/elx-ANNlib.dll @@ -36,7 +36,7 @@ jobs: cxx-compiler: "clang++" libtorch-cpu-url: "https://download.pytorch.org/libtorch/cpu/libtorch-macos-arm64-2.8.0.zip" cuda-version: "cpu" - itk-git-tag: "v5.4.5" + itk-git-tag: "v5.4.6" cmake-build-type: "Release" libs: - elastix-build/bin/libelx-ANNlib.dylib diff --git a/.github/workflows/publish-elastix.yml b/.github/workflows/publish-elastix.yml index 8e61ac49d..25f499077 100644 --- a/.github/workflows/publish-elastix.yml +++ b/.github/workflows/publish-elastix.yml @@ -15,7 +15,7 @@ jobs: libtorch-cpu-url: "https://download.pytorch.org/libtorch/cpu/libtorch-shared-with-deps-2.8.0%2Bcpu.zip" libtorch-cuda-url: "https://download.pytorch.org/libtorch/cu128/libtorch-shared-with-deps-2.8.0%2Bcu128.zip" cuda_toolkit_version: '12.8.0' - itk-git-tag: "v5.4.5" + itk-git-tag: "v5.4.6" c-compiler: "gcc" cxx-compiler: "g++" cmake-build-type: "Release" @@ -25,7 +25,7 @@ jobs: libtorch-cpu-url: "https://download.pytorch.org/libtorch/cpu/libtorch-win-shared-with-deps-2.8.0%2Bcpu.zip" libtorch-cuda-url: "https://download.pytorch.org/libtorch/cu128/libtorch-win-shared-with-deps-2.8.0%2Bcu128.zip" cuda_toolkit_version: '12.8.0' - itk-git-tag: "v5.4.5" + itk-git-tag: "v5.4.6" c-compiler: "cl.exe" cxx-compiler: "cl.exe" cmake-build-type: "Release" @@ -36,7 +36,7 @@ jobs: c-compiler: "clang" cxx-compiler: "clang++" libtorch-cpu-url: "https://download.pytorch.org/libtorch/cpu/libtorch-macos-arm64-2.8.0.zip" - itk-git-tag: "v5.4.5" + itk-git-tag: "v5.4.6" cmake-build-type: "Release" libs: - elastix-build/bin/libelx-ANNlib.dylib diff --git a/Common/GTesting/CMakeLists.txt b/Common/GTesting/CMakeLists.txt index d10d1bbc8..a24713ece 100644 --- a/Common/GTesting/CMakeLists.txt +++ b/Common/GTesting/CMakeLists.txt @@ -35,7 +35,7 @@ target_compile_definitions(CommonGTest PRIVATE ELX_CMAKE_CURRENT_BINARY_DIR="${CMAKE_CURRENT_BINARY_DIR}" ) -if (ITK_VERSION VERSION_LESS_EQUAL 5.4.5) +if (ITK_VERSION VERSION_LESS_EQUAL 5.4.6) target_link_libraries(CommonGTest GTest::GTest GTest::Main diff --git a/Core/Main/GTesting/CMakeLists.txt b/Core/Main/GTesting/CMakeLists.txt index f2bd9d210..f01c28c7d 100644 --- a/Core/Main/GTesting/CMakeLists.txt +++ b/Core/Main/GTesting/CMakeLists.txt @@ -12,7 +12,7 @@ target_compile_definitions(ElastixLibGTest PRIVATE _USE_MATH_DEFINES # For M_PI. ) -if (ITK_VERSION VERSION_LESS_EQUAL 5.4.5) +if (ITK_VERSION VERSION_LESS_EQUAL 5.4.6) target_link_libraries(ElastixLibGTest GTest::GTest GTest::Main diff --git a/Testing/CI/Azure/ci.yml b/Testing/CI/Azure/ci.yml index 626a1be6e..db065e6a1 100644 --- a/Testing/CI/Azure/ci.yml +++ b/Testing/CI/Azure/ci.yml @@ -1,5 +1,5 @@ variables: - ITKv5_VERSION: v5.4.5 + ITKv5_VERSION: v5.4.6 ITK_GIT_URL: https://github.com/InsightSoftwareConsortium/ITK LIBTORCH_BINARY_URL_WIN: https://download.pytorch.org/libtorch/cpu/libtorch-win-shared-with-deps-2.6.0%2Bcpu.zip LIBTORCH_BINARY_URL_LINUX: https://download.pytorch.org/libtorch/cpu/libtorch-cxx11-abi-shared-with-deps-2.6.0%2Bcpu.zip