Skip to content
Snippets Groups Projects
Commit d7f64c02 authored by Ben Boeckel's avatar Ben Boeckel Committed by Kitware Robot
Browse files

Merge topic 'fix-java-artifacts-cache-vars'


4e0cc719 cmake: correct java artifacts cache vars

Acked-by: default avatarKitware Robot <kwrobot@kitware.com>
Acked-by: default avatarbuildbot <buildbot@kitware.com>
Reviewed-by: default avatarBen Boeckel <ben.boeckel@kitware.com>
Merge-request: !11608
parents e73d1df4 4e0cc719
No related branches found
No related tags found
No related merge requests found
......@@ -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 "")
......
......@@ -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 "")
......
......@@ -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 "")
......
......@@ -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 "")
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment