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

ci: remove duplicated MAVEN_NATIVE_ARTIFACTS

The reason of this change being done in a different commit since this
change cannot be merged to master due to a conflict in an unrelated but
adjacent line at configure_options.cmake.

(cherry picked from commit 7a350f5b)
parent a75f5cc3
No related branches found
No related tags found
1 merge request!11950java,maven: Backport commit fixing naming of native libs
Pipeline #435704 failed
......@@ -49,9 +49,20 @@ configuration_flag(VTK_JAVA_INSTALL "java")
if ("$ENV{CMAKE_CONFIGURATION}" MATCHES "java")
set(BUILD_TESTING OFF CACHE BOOL "" FORCE)
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 "darwin-amd;darwin-arm;linux-amd;windows-amd" CACHE STRING "" FORCE)
# Naming is <arch-platform-build_type> we avoid adding numbers in the arch
# such as 64/86 since some maven versions fail to properly parse it.
string(TOLOWER "${CMAKE_BUILD_TYPE}" build_type)
set(native_artifacts
darwin-amd-${build_type}
darwin-arm-${build_type}
linux-amd-${build_type}
windows-amd-${build_type}
)
set(MAVEN_NATIVE_ARTIFACTS "${native_artifacts}" CACHE STRING "" FORCE)
unset(build_type)
unset(native_artifacts)
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.
......
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