From 4e0cc719be60bbcde22ee3be269544713727b6a2 Mon Sep 17 00:00:00 2001
From: Vicente Adolfo Bolea Sanchez <vicente.bolea@kitware.com>
Date: Wed, 30 Oct 2024 14:04:37 -0400
Subject: [PATCH] cmake: correct java artifacts cache vars
---
.gitlab/ci/configure_fedora39_java.cmake | 2 +-
.gitlab/ci/configure_macos_arm64_java.cmake | 2 +-
.gitlab/ci/configure_macos_x86_64_java.cmake | 2 +-
.gitlab/ci/configure_windows_vs2022_java.cmake | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/.gitlab/ci/configure_fedora39_java.cmake b/.gitlab/ci/configure_fedora39_java.cmake
index 7730670a912..9e655296018 100644
--- a/.gitlab/ci/configure_fedora39_java.cmake
+++ b/.gitlab/ci/configure_fedora39_java.cmake
@@ -3,7 +3,7 @@ set(VTK_JAVA_TARGET_VERSION $ENV{VTK_JAVA_VERSION} CACHE STRING "" FORCE)
include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora39.cmake")
-set(MAVEN_LOCAL_NATIVE_NAME "Linux-amd64")
+set(MAVEN_LOCAL_NATIVE_NAME "Linux-amd64" CACHE STRING "" FORCE)
set(VTK_GENERATE_SPDX OFF CACHE BOOL "" FORCE)
set(VTK_MODULE_ENABLE_VTK_fides NO CACHE STRING "")
diff --git a/.gitlab/ci/configure_macos_arm64_java.cmake b/.gitlab/ci/configure_macos_arm64_java.cmake
index c203228c9ab..dea88772585 100644
--- a/.gitlab/ci/configure_macos_arm64_java.cmake
+++ b/.gitlab/ci/configure_macos_arm64_java.cmake
@@ -3,7 +3,7 @@ set(VTK_JAVA_TARGET_VERSION $ENV{VTK_JAVA_VERSION} CACHE STRING "" FORCE)
include("${CMAKE_CURRENT_LIST_DIR}/configure_macos.cmake")
-set(MAVEN_LOCAL_NATIVE_NAME "Darwin-arm64")
+set(MAVEN_LOCAL_NATIVE_NAME "Darwin-arm64" CACHE STRING "" FORCE)
set(CMAKE_OSX_DEPLOYMENT_TARGET "11.0" CACHE STRING "")
diff --git a/.gitlab/ci/configure_macos_x86_64_java.cmake b/.gitlab/ci/configure_macos_x86_64_java.cmake
index cb5a54abbe2..2f37aede563 100644
--- a/.gitlab/ci/configure_macos_x86_64_java.cmake
+++ b/.gitlab/ci/configure_macos_x86_64_java.cmake
@@ -3,7 +3,7 @@ set(VTK_JAVA_TARGET_VERSION $ENV{VTK_JAVA_VERSION} CACHE STRING "" FORCE)
include("${CMAKE_CURRENT_LIST_DIR}/configure_macos.cmake")
-set(MAVEN_LOCAL_NATIVE_NAME "Darwin-amd64")
+set(MAVEN_LOCAL_NATIVE_NAME "Darwin-amd64" CACHE STRING "" FORCE)
# Ensure that we're targeting 11.0.
set(CMAKE_OSX_DEPLOYMENT_TARGET "11.0" CACHE STRING "")
diff --git a/.gitlab/ci/configure_windows_vs2022_java.cmake b/.gitlab/ci/configure_windows_vs2022_java.cmake
index 3c5fdb0d9dc..96c3055d0b8 100644
--- a/.gitlab/ci/configure_windows_vs2022_java.cmake
+++ b/.gitlab/ci/configure_windows_vs2022_java.cmake
@@ -5,6 +5,6 @@ set(VTK_MODULE_ENABLE_VTK_vtkvtkm NO CACHE STRING "") # Java Wrap errors in wind
include("${CMAKE_CURRENT_LIST_DIR}/configure_windows.cmake")
-set(MAVEN_LOCAL_NATIVE_NAME "Windows-amd64")
+set(MAVEN_LOCAL_NATIVE_NAME "Windows-amd64" CACHE STRING "" FORCE)
set(JOGL_GLUE "$ENV{GIT_CLONE_PATH}/.gitlab/m2/org/jogamp/gluegen/gluegen-rt/2.3.2/gluegen-rt-2.3.2.jar" CACHE FILEPATH "")
set(JOGL_LIB "$ENV{GIT_CLONE_PATH}/.gitlab/m2/org/jogamp/jogl/jogl-all/2.3.2/jogl-all-2.3.2.jar" CACHE FILEPATH "")
--
GitLab