Skip to content
Snippets Groups Projects
Commit 9b854cff authored by Vicente Bolea's avatar Vicente Bolea
Browse files

java: remove numbers from classifier names

parent e37480d5
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) ...@@ -3,7 +3,7 @@ set(VTK_JAVA_TARGET_VERSION $ENV{VTK_JAVA_VERSION} CACHE STRING "" FORCE)
include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora39.cmake") 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_GENERATE_SPDX OFF CACHE BOOL "" FORCE)
set(VTK_MODULE_ENABLE_VTK_fides NO CACHE STRING "") 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) ...@@ -3,7 +3,7 @@ set(VTK_JAVA_TARGET_VERSION $ENV{VTK_JAVA_VERSION} CACHE STRING "" FORCE)
include("${CMAKE_CURRENT_LIST_DIR}/configure_macos.cmake") 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 "") 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) ...@@ -3,7 +3,7 @@ set(VTK_JAVA_TARGET_VERSION $ENV{VTK_JAVA_VERSION} CACHE STRING "" FORCE)
include("${CMAKE_CURRENT_LIST_DIR}/configure_macos.cmake") 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. # Ensure that we're targeting 11.0.
set(CMAKE_OSX_DEPLOYMENT_TARGET "11.0" CACHE STRING "") set(CMAKE_OSX_DEPLOYMENT_TARGET "11.0" CACHE STRING "")
......
...@@ -52,7 +52,7 @@ if ("$ENV{CMAKE_CONFIGURATION}" MATCHES "java") ...@@ -52,7 +52,7 @@ if ("$ENV{CMAKE_CONFIGURATION}" MATCHES "java")
set(JOGL_VERSION "2.3.2" CACHE STRING "") set(JOGL_VERSION "2.3.2" CACHE STRING "")
# Naming is <arch-platform> since some maven versions fail to properly parse # Naming is <arch-platform> since some maven versions fail to properly parse
# the artifact name when numbers are trailing in the classifer name. # 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 "") set(MAVEN_VTK_ARTIFACT_SUFFIX "-java${VTK_JAVA_TARGET_VERSION}" CACHE STRING "")
# Disable snapshots for tag releases and also when the env variable # Disable snapshots for tag releases and also when the env variable
# VTK_JAVA_FORCE_RELEASE is defined through the Gitlab schedule pipeline UI. # VTK_JAVA_FORCE_RELEASE is defined through the Gitlab schedule pipeline UI.
......
...@@ -5,6 +5,6 @@ set(VTK_MODULE_ENABLE_VTK_vtkvtkm NO CACHE STRING "") # Java Wrap errors in wind ...@@ -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") 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_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 "") 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