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

Merge topic 'index-2.4' into release

8baa259e index: add a note about new versions
6c4db96a index: add 2.4 tarballs
de524cbf

 index: add a script which extracts IndeX tarball drops
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Acked-by: Cory Quammen's avatarCory Quammen <cory.quammen@kitware.com>
Merge-request: !692
parents d6b7cb20 8baa259e
#!/bin/sh
set -e
set -x
usage () {
echo "Usage: $0 <version> <index tarball> [count]" >&2
exit 0
}
readonly version="$1"
shift || usage
readonly tarball="$1"
shift || usage
if [ -n "$1" ]; then
count_suffix=".$1"
shift
else
count_suffix=
fi
readonly count_suffix
readonly dirname="$( basename "$tarball" ".tgz" )"
readonly date="$( date "+%Y%m%d" )"
tar xf "$tarball"
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"
mv "linux-x86-64/lib" "$linux_dir/"
mv "nt-x86-64/lib" "$windows_dir/"
cp EULA.pdf license.txt README.txt "$linux_dir/"
cp EULA.pdf license.txt README.txt "$windows_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"
rm -rf "$dirname"
......@@ -80,14 +80,15 @@ if (nvidiaindex_enabled)
libdice
libnvindex)
# Need different nvrtc-builtins library depending on whether we are building
# with IndeX 2.1 or 2.2.
# Need different nvrtc-builtins library depending on the version of IndeX.
if (nvidiaindex_SOURCE_SELECTION STREQUAL "2.1")
list(APPEND nvidiaindex_libraries nvrtc-builtins64_80)
elseif (nvidiaindex_SOURCE_SELECTION STREQUAL "2.2")
list(APPEND nvidiaindex_libraries nvrtc-builtins64_90)
elseif (nvidiaindex_SOURCE_SELECTION STREQUAL "2.3")
list(APPEND nvidiaindex_libraries nvrtc-builtins64_101)
elseif (nvidiaindex_SOURCE_SELECTION STREQUAL "2.4")
list(APPEND nvidiaindex_libraries nvrtc-builtins64_102)
else ()
message(FATAL_ERROR
"Unknown nvrtc-builtins64 library for ${nvidiaindex_SOURCE_SELECTION}.")
......
......@@ -138,14 +138,21 @@ if (WIN32)
set(nvidiaindex_2_1_md5 "f6efc09092771eb0bfb375a503a95c04")
set(nvidiaindex_2_2_md5 "93bb894e7951227862ea308f7d6e2e18")
set(nvidiaindex_2_3_md5 "f7374dfe3eec789b07957e4924fa029f")
set(nvidiaindex_2_4_md5 "5e558630494c86e30fa40fa42d78924c")
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 "cc795e80048fab1ba1c9f25603d22779")
endif ()
superbuild_set_selectable_source(nvidiaindex
SELECT 2.3 DEFAULT
# XXX(index): Adding a new version? The Windows bundle script needs to know
# too (nvrtc-builtins).
SELECT 2.4 DEFAULT
URL "http://www.paraview.org/files/dependencies/nvidia-index-libs-2.4.20200124-${nvidiaindex_platform}.tar.bz2"
URL_MD5 "${nvidiaindex_2_4_md5}"
SELECT 2.3
URL "http://www.paraview.org/files/dependencies/nvidia-index-libs-2.3.20190820-${nvidiaindex_platform}.tar.bz2"
URL_MD5 "${nvidiaindex_2_3_md5}"
SELECT 2.2
......
Markdown is supported
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