Commit 6990ce2c authored by Utkarsh Ayachit's avatar Utkarsh Ayachit Committed by Kitware Robot

Merge topic 'force-enable-visrtx'

5eb1ab01 mdl: fix windows install rules (use correct dll name)
8376767f visrtx: provide help findin MDL + OptiX on Windows
3d9338f2 visrtx: update revision
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Acked-by: David E. DeMarle's avatarDavid E. DeMarle <dave.demarle@kitware.com>
Merge-request: !625
parents 404a3111 5eb1ab01
Pipeline #142982 failed with stage
in 0 seconds
......@@ -2,3 +2,8 @@ set(nvidiamdl_libdir nt-x86-64/lib)
set(nvidiamdl_libdest bin)
include(nvidiamdl.common)
superbuild_add_extra_cmake_args(
-Ddds_LIBRARY:FILEPATH=<INSTALL_DIR>/bin/dds.dll
-Dlibmdl_sdk_LIBRARY:FILEPATH=<INSTALL_DIR>/bin/libmdl_sdk.dll
-Dnv_freeimage_LIBRARY:FILEPATH=<INSTALL_DIR>/bin/nv_freeimage.dll)
......@@ -6,3 +6,11 @@ set(nvidiaoptix_bindest bin)
set(nvidiaoptix_binsuffix .dll)
include(nvidiaoptix.common)
superbuild_add_extra_cmake_args(
-Doptix_DLL:FILEPATH=<INSTALL_DIR>/bin/optix.6.0.0.dll
-Doptix_LIBRARY:FILEPATH=<INSTALL_DIR>/lib/optix.6.0.0.lib
-Doptix_prime_DLL:FILEPATH=<INSTALL_DIR>/bin/optix_prime.6.0.0.dll
-Doptix_prime_LIBRARY:FILEPATH=<INSTALL_DIR>/lib/optix_prime.6.0.0.lib
-Doptixu_DLL:FILEPATH=<INSTALL_DIR>/bin/optixu.6.0.0.dll
-Doptixu_LIBRARY:FILEPATH=<INSTALL_DIR>/lib/optixu.6.0.0.lib)
......@@ -115,7 +115,7 @@ if (visrtx_enabled)
VisRTX
dds
nv_freeimage
mdl_sdk)
libmdl_sdk)
foreach (visrtxextra_library IN LISTS visrtxextra_libraries)
superbuild_windows_install_plugin("${visrtxextra_library}.dll"
......
......@@ -181,7 +181,7 @@ superbuild_set_revision(nvidiamdl
superbuild_set_revision(visrtx
GIT_REPOSITORY "https://github.com/NVIDIA/VisRTX.git"
GIT_TAG "44fb1a93e44e3af4312f5ee20ba38ab138948acc") # 0.1.5 + patches
GIT_TAG "0e2497d6a7dcbb03d159980c067bd7b12fd2ab72") # 0.1.5 + patches
superbuild_set_revision(mili
URL "https://www.paraview.org/files/dependencies/mili-15.1.tar.gz"
......
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