diff --git a/.gitlab/ci/configure_fedora39_java.cmake b/.gitlab/ci/configure_fedora39_java.cmake index 14a835351ad4d1ac21c04b07e9e530838c196344..12d1d9c9b30ce9763c27c101f0f91481d2e4ca7e 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 "amd64-linux" CACHE STRING "" FORCE) +set(MAVEN_LOCAL_NATIVE_NAME "linux-amd" 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 1d3b76f0d7e6d76a491a84f9ea527ebeab49aad2..f590c264b30a25a876ed7e8bde1e4eb2232cb846 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 "arm64-darwin" CACHE STRING "" FORCE) +set(MAVEN_LOCAL_NATIVE_NAME "darwin-arm" 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 8ded23a22f69fea3883ae8a880f13b96cbe07d61..ff5e7ca4f30112a137c95ce316a0d8ffa5e6e444 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 "amd64-darwin" CACHE STRING "" FORCE) +set(MAVEN_LOCAL_NATIVE_NAME "darwin-amd" 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_options.cmake b/.gitlab/ci/configure_options.cmake index e3f63f5d379ffb2ebd7f51e83a997087ace762f2..59b3d0c29b3271ac802fbae80841afbe72c70c3f 100644 --- a/.gitlab/ci/configure_options.cmake +++ b/.gitlab/ci/configure_options.cmake @@ -52,7 +52,7 @@ if ("$ENV{CMAKE_CONFIGURATION}" MATCHES "java") set(JOGL_VERSION "2.3.2" CACHE STRING "") # Naming is <arch-platform> since some maven versions fail to properly parse # the artifact name when numbers are trailing in the classifer name. - set(MAVEN_NATIVE_ARTIFACTS "amd64-darwin;arm64-darwin;amd64-linux;amd64-windows" CACHE STRING "" FORCE) + set(MAVEN_NATIVE_ARTIFACTS "darwin-amd;darwin-arm;linux-amd;windows-amd" CACHE STRING "" FORCE) set(MAVEN_VTK_ARTIFACT_SUFFIX "-java${VTK_JAVA_TARGET_VERSION}" CACHE STRING "") # Disable snapshots for tag releases and also when the env variable # VTK_JAVA_FORCE_RELEASE is defined through the Gitlab schedule pipeline UI. diff --git a/.gitlab/ci/configure_windows_vs2022_java.cmake b/.gitlab/ci/configure_windows_vs2022_java.cmake index 8405ec3c6548c9e128d101652802fafb1a5b8109..f68bfb2126d6ffaf998936c6cd20e1edfeb86e11 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 "amd64-windows" CACHE STRING "" FORCE) +set(MAVEN_LOCAL_NATIVE_NAME "windows-amd" 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 "")