Commit 4f5fa329 authored by Ben Boeckel's avatar Ben Boeckel Committed by Kitware Robot
Browse files

Merge topic 'nvidia-index-5.9'

7c21f6a0 Set hashes for NVIDIA IndeX 329100.8100.2146 / 20201028 and default to 5.9.
e4645160 Add new libnvindex_builtins library to NVIDIA IndeX plugin installation.
1155bbcd Apply 1 suggestion(s) to 1 file(s)
c6c0d586 Apply 1 suggestion(s) to 1 file(s)
4730f339

 Prepare superbuild for adding NVIDIA IndeX libraries for ParaView 5.9
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel's avatarBen Boeckel <ben.boeckel@kitware.com>
Merge-request: !790
parents 08edde64 7c21f6a0
......@@ -26,22 +26,39 @@ readonly dirname="$( basename "$tarball" ".tgz" )"
readonly date="$( date "+%Y%m%d" )"
tar xf "$tarball"
chmod -R u+rw "$dirname"
cd "$dirname"
readonly dirprefix="nvidia-index-libs-$version.$date$count_suffix"
readonly linux_dir="$dirprefix-linux"
readonly windows_dir="$dirprefix-windows-x64"
mkdir "$linux_dir" "$windows_dir"
for arch in linux-x86-64 linux-ppc64le nt-x86-64; do
case "$arch" in
linux-x86-64)
dir="$dirprefix-linux"
;;
linux-ppc64le)
if ! [ -d "$arch" ]; then
# This architecture is optional, ignore if it's missing from the tarball.
continue
fi
dir="$dirprefix-linux-ppc64le"
;;
nt-x86-64)
dir="$dirprefix-windows-x64"
;;
*)
echo "Unsupported arch '$arch'"
exit 1
;;
esac
mv "linux-x86-64/lib" "$linux_dir/"
mv "nt-x86-64/lib" "$windows_dir/"
mkdir "$dir"
cp EULA.pdf license.txt README.txt "$linux_dir/"
cp EULA.pdf license.txt README.txt "$windows_dir/"
mv "$arch/lib" "$dir/"
cp EULA.pdf license.txt README.txt "$dir/"
chmod -R a+rX "$linux_dir" "$windows_dir"
tar cjf "../$linux_dir.tar.bz2" "$linux_dir"
tar cjf "../$windows_dir.tar.bz2" "$windows_dir"
chmod -R a+rX "$dir"
tar cjf "../$dir.tar.bz2" "$dir"
done
rm -rf "$dirname"
......@@ -131,6 +131,10 @@ if (nvidiaindex_enabled)
nvindex
nvrtc-builtins)
if (nvidiaindex_SOURCE_SELECTION STREQUAL "5.9")
list(APPEND nvidiaindex_libraries nvindex_builtins)
endif ()
foreach (nvidiaindex_library IN LISTS nvidiaindex_libraries)
file(GLOB lib_filenames
RELATIVE "${superbuild_install_location}/lib"
......
......@@ -90,6 +90,9 @@ if (nvidiaindex_enabled)
list(APPEND nvidiaindex_libraries nvrtc-builtins64_101)
elseif (nvidiaindex_SOURCE_SELECTION STREQUAL "2.4")
list(APPEND nvidiaindex_libraries nvrtc-builtins64_102)
elseif (nvidiaindex_SOURCE_SELECTION STREQUAL "5.9")
list(APPEND nvidiaindex_libraries libnvindex_builtins)
list(APPEND nvidiaindex_libraries nvrtc-builtins64_102)
else ()
message(FATAL_ERROR
"Unknown nvrtc-builtins64 library for ${nvidiaindex_SOURCE_SELECTION}.")
......
......@@ -154,17 +154,27 @@ if (WIN32)
set(nvidiaindex_2_2_md5 "93bb894e7951227862ea308f7d6e2e18")
set(nvidiaindex_2_3_md5 "f7374dfe3eec789b07957e4924fa029f")
set(nvidiaindex_2_4_md5 "a11b9056683c52efe9f1d706e2926235")
set(nvidiaindex_5_9_md5 "379dbad08655f974da52722fdbda3e7d")
elseif (UNIX AND NOT APPLE)
set(nvidiaindex_platform "linux")
set(nvidiaindex_2_1_md5 "9fd5af702af6a6a6f2aba3a960703fb3")
set(nvidiaindex_2_2_md5 "b97518f8b5d05497455e90ba5a0712f1")
set(nvidiaindex_2_3_md5 "9c57d22f065f2ac7c978e6e6e06ebb69")
set(nvidiaindex_2_4_md5 "39bb55a5bb5f8ba1e8f44fa68dc703d3")
if (CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "ppc64le")
set(nvidiaindex_platform "linux-ppc64le")
set(nvidiaindex_5_9_md5 "77f34c10fef03d09a75695aabd7b3929")
else ()
set(nvidiaindex_platform "linux")
set(nvidiaindex_2_1_md5 "9fd5af702af6a6a6f2aba3a960703fb3")
set(nvidiaindex_2_2_md5 "b97518f8b5d05497455e90ba5a0712f1")
set(nvidiaindex_2_3_md5 "9c57d22f065f2ac7c978e6e6e06ebb69")
set(nvidiaindex_2_4_md5 "39bb55a5bb5f8ba1e8f44fa68dc703d3")
set(nvidiaindex_5_9_md5 "2c1368f0510e3696dbac740aab8ebc14")
endif ()
endif ()
superbuild_set_selectable_source(nvidiaindex
# XXX(index): Adding a new version? The Windows bundle script needs to know
# too (nvrtc-builtins).
SELECT 2.4 DEFAULT
SELECT 5.9 DEFAULT
URL "http://www.paraview.org/files/dependencies/nvidia-index-libs-5.9.20201028-${nvidiaindex_platform}.tar.bz2"
URL_MD5 "${nvidiaindex_5_9_md5}"
SELECT 2.4
URL "http://www.paraview.org/files/dependencies/nvidia-index-libs-2.4.20200424-${nvidiaindex_platform}.tar.bz2"
URL_MD5 "${nvidiaindex_2_4_md5}"
SELECT 2.3
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment