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

Merge topic 'fix-index-nvrtc-dlls' into release

59311925

 nvidiaindex: install correct version of nvrtc-builtins64 DLL
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel's avatarBen Boeckel <ben.boeckel@kitware.com>
Merge-request: !496
parents 54db8446 59311925
......@@ -214,6 +214,7 @@ function (superbuild_add_packaging)
list(APPEND superbuild_export_variables
mesa_USE_SWR
mesa_SWR_ARCH
nvidiaindex_SOURCE_SELECTION
PARAVIEW_DEFAULT_SYSTEM_GL
PARAVIEW_PACKAGE_SUFFIX
PARAVIEW_CATALYST_EDITION)
......
......@@ -58,8 +58,15 @@ install(
if (nvidiaindex_enabled)
set(nvidiaindex_libraries
libdice
libnvindex
nvrtc-builtins64_80)
libnvindex)
# Need different nvrtc-builtins library depending on whether we are building
# with IndeX 2.1 or 2.2.
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)
endif()
foreach (nvidiaindex_library IN LISTS nvidiaindex_libraries)
superbuild_windows_install_plugin("${nvidiaindex_library}.dll"
......
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