Commit a387e3e6 authored by Cory Quammen's avatar Cory Quammen Committed by Kitware Robot

Merge topic 'backport-master-changes' into release

41115e05 mdl: fix windows install rules (use correct dll name)
3dc2f6f0 visrtx: provide help findin MDL + OptiX on Windows
dbd910d9 visrtx: update revision
c45cf074 baseline: due to updates to matplotlib for Python3
76791ad3 pywin32: python3 fixes
9703ad05 python3: support non-sytem python3 on unix/windows
492e8ece python3 fixes
88e6e6ee win32/paraview.bundle: fix Python3 install rules
...
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Acked-by: Utkarsh Ayachit's avatarUtkarsh Ayachit <utkarsh.ayachit@kitware.com>
Merge-request: !630
parents 349723db 41115e05
Pipeline #143278 running with stage
...@@ -33,7 +33,9 @@ function (superbuild_find_projects var) ...@@ -33,7 +33,9 @@ function (superbuild_find_projects var)
cxx11 cxx11
paraview paraview
paraviewpluginsexternal paraviewpluginsexternal
python) python
python2
python3)
option(USE_NONFREE_COMPONENTS "Enable the non-free parts of the superbuild" OFF) option(USE_NONFREE_COMPONENTS "Enable the non-free parts of the superbuild" OFF)
mark_as_advanced(USE_NONFREE_COMPONENTS) mark_as_advanced(USE_NONFREE_COMPONENTS)
...@@ -46,7 +48,6 @@ function (superbuild_find_projects var) ...@@ -46,7 +48,6 @@ function (superbuild_find_projects var)
freetype freetype
hdf5 hdf5
ispc ispc
lapack
las las
matplotlib matplotlib
mpi mpi
...@@ -62,12 +63,14 @@ function (superbuild_find_projects var) ...@@ -62,12 +63,14 @@ function (superbuild_find_projects var)
paraviewwebflow paraviewwebflow
paraviewwebvisualizer paraviewwebvisualizer
png png
pythonattrs
pythonautobahn pythonautobahn
pythonconstantly pythonconstantly
pythoncycler pythoncycler
pythondateutil pythondateutil
pythonhyperlink pythonhyperlink
pythonincremental pythonincremental
pythonkiwisolver
pythonmako pythonmako
pythonpygments pythonpygments
pythonpyparsing pythonpyparsing
...@@ -94,9 +97,11 @@ function (superbuild_find_projects var) ...@@ -94,9 +97,11 @@ function (superbuild_find_projects var)
list(APPEND projects list(APPEND projects
adios adios
cosmotools cosmotools
ffi
ffmpeg ffmpeg
fortran fortran
genericio genericio
lapack
libxml2 libxml2
mili mili
mxml mxml
......
...@@ -94,7 +94,7 @@ endif () ...@@ -94,7 +94,7 @@ endif ()
if (python_enabled) if (python_enabled)
file(GLOB egg_dirs file(GLOB egg_dirs
"${superbuild_install_location}/lib/python2.7/site-packages/*.egg/") "${superbuild_install_location}/lib/python${superbuild_python_version}/site-packages/*.egg/")
superbuild_apple_install_python( superbuild_apple_install_python(
"\${CMAKE_INSTALL_PREFIX}" "\${CMAKE_INSTALL_PREFIX}"
"${paraview_appname}" "${paraview_appname}"
...@@ -104,7 +104,7 @@ if (python_enabled) ...@@ -104,7 +104,7 @@ if (python_enabled)
${python_modules} ${python_modules}
MODULE_DIRECTORIES MODULE_DIRECTORIES
"${superbuild_install_location}/Applications/paraview.app/Contents/Python" "${superbuild_install_location}/Applications/paraview.app/Contents/Python"
"${superbuild_install_location}/lib/python2.7/site-packages" "${superbuild_install_location}/lib/python${superbuild_python_version}/site-packages"
${egg_dirs} ${egg_dirs}
SEARCH_DIRECTORIES SEARCH_DIRECTORIES
"${superbuild_install_location}/Applications/paraview.app/Contents/Libraries" "${superbuild_install_location}/Applications/paraview.app/Contents/Libraries"
...@@ -112,7 +112,7 @@ if (python_enabled) ...@@ -112,7 +112,7 @@ if (python_enabled)
if (matplotlib_enabled) if (matplotlib_enabled)
install( install(
DIRECTORY "${superbuild_install_location}/lib/python2.7/site-packages/matplotlib/mpl-data/" DIRECTORY "${superbuild_install_location}/lib/python${superbuild_python_version}/site-packages/matplotlib/mpl-data/"
DESTINATION "${paraview_appname}/Contents/Python/matplotlib/mpl-data" DESTINATION "${paraview_appname}/Contents/Python/matplotlib/mpl-data"
COMPONENT superbuild) COMPONENT superbuild)
endif () endif ()
......
...@@ -68,7 +68,10 @@ endmacro () ...@@ -68,7 +68,10 @@ endmacro ()
check_for_python_module(numpy numpy) check_for_python_module(numpy numpy)
check_for_python_module(numpy pkg_resources) check_for_python_module(numpy pkg_resources)
check_for_python_module(scipy scipy) check_for_python_module(scipy scipy)
check_for_python_module(pythonkiwisolver kiwisolver)
check_for_python_module(matplotlib matplotlib) check_for_python_module(matplotlib matplotlib)
check_for_python_module(matplotlib mpl_toolkits)
check_for_python_module(pythonattrs attr)
check_for_python_module(pythonpygments pygments) check_for_python_module(pythonpygments pygments)
check_for_python_module(pythonsix six) check_for_python_module(pythonsix six)
check_for_python_module(pythonautobahn autobahn) check_for_python_module(pythonautobahn autobahn)
...@@ -88,7 +91,11 @@ if (WIN32) ...@@ -88,7 +91,11 @@ if (WIN32)
check_for_python_module(pywin32 adodbapi) check_for_python_module(pywin32 adodbapi)
check_for_python_module(pywin32 isapi) check_for_python_module(pywin32 isapi)
check_for_python_module(pywin32 pythoncom) check_for_python_module(pywin32 pythoncom)
check_for_python_module(pywin32 pythonwin)
check_for_python_module(pywin32 pywin32_system32)
check_for_python_module(pywin32 win32)
check_for_python_module(pywin32 win32com) check_for_python_module(pywin32 win32com)
check_for_python_module(pywin32 win32comext)
endif () endif ()
function (paraview_add_plugin output) function (paraview_add_plugin output)
......
...@@ -104,7 +104,9 @@ if (USE_NONFREE_COMPONENTS AND (WIN32 OR (UNIX AND NOT APPLE))) ...@@ -104,7 +104,9 @@ if (USE_NONFREE_COMPONENTS AND (WIN32 OR (UNIX AND NOT APPLE)))
endif () endif ()
set(PARAVIEW_ENABLE_PYTHON ${python_enabled}) set(PARAVIEW_ENABLE_PYTHON ${python_enabled})
if (python_enabled AND USE_SYSTEM_python AND NOT python_FIND_LIBRARIES) if (python_enabled AND
((USE_SYSTEM_python2 AND NOT python2_FIND_LIBRARIES) OR
(USE_SYSTEM_python3 AND NOT python3_FIND_LIBRARIES)))
set(PARAVIEW_ENABLE_PYTHON OFF) set(PARAVIEW_ENABLE_PYTHON OFF)
endif() endif()
...@@ -143,7 +145,7 @@ superbuild_add_project(paraview ...@@ -143,7 +145,7 @@ superbuild_add_project(paraview
hdf5 hdf5
DEPENDS_OPTIONAL DEPENDS_OPTIONAL
cuda boost matplotlib mpi numpy png cuda boost matplotlib mpi numpy png
python qt5 visitbridge zlib silo las python python2 python3 qt5 visitbridge zlib silo las
xdmf3 ospray vrpn vtkm tbb netcdf xdmf3 ospray vrpn vtkm tbb netcdf
nlohmannjson nlohmannjson
paraviewgettingstartedguide paraviewgettingstartedguide
...@@ -163,7 +165,7 @@ superbuild_add_project(paraview ...@@ -163,7 +165,7 @@ superbuild_add_project(paraview
-DPARAVIEW_BUILD_QT_GUI:BOOL=${qt5_enabled} -DPARAVIEW_BUILD_QT_GUI:BOOL=${qt5_enabled}
-DPARAVIEW_ENABLE_FFMPEG:BOOL=${ffmpeg_enabled} -DPARAVIEW_ENABLE_FFMPEG:BOOL=${ffmpeg_enabled}
-DPARAVIEW_ENABLE_PYTHON:BOOL=${PARAVIEW_ENABLE_PYTHON} -DPARAVIEW_ENABLE_PYTHON:BOOL=${PARAVIEW_ENABLE_PYTHON}
-DPARAVIEW_PYTHON_VERSION:STRING=2 -DPARAVIEW_PYTHON_VERSION:STRING=${python_version}
-DPARAVIEW_ENABLE_COSMOTOOLS:BOOL=${cosmotools_enabled} -DPARAVIEW_ENABLE_COSMOTOOLS:BOOL=${cosmotools_enabled}
-DPARAVIEW_ENABLE_XDMF3:BOOL=${xdmf3_enabled} -DPARAVIEW_ENABLE_XDMF3:BOOL=${xdmf3_enabled}
-DPARAVIEW_ENABLE_LAS:BOOL=${las_enabled} -DPARAVIEW_ENABLE_LAS:BOOL=${las_enabled}
......
...@@ -17,6 +17,11 @@ else () ...@@ -17,6 +17,11 @@ else ()
"${CMAKE_SYSTEM_NAME}") "${CMAKE_SYSTEM_NAME}")
endif () endif ()
if (python_enabled)
list(APPEND package_suffix_items
"Python${superbuild_python_version}")
endif ()
# On Windows, we put add MSVC compiler version in the package name # On Windows, we put add MSVC compiler version in the package name
if (WIN32 AND MSVC) if (WIN32 AND MSVC)
if (MSVC_VERSION LESS 1800) # 1800 == VS2013 if (MSVC_VERSION LESS 1800) # 1800 == VS2013
......
...@@ -136,12 +136,18 @@ endif () ...@@ -136,12 +136,18 @@ endif ()
if (python_enabled) if (python_enabled)
file(GLOB egg_dirs file(GLOB egg_dirs
"${superbuild_install_location}/lib/python2.7/site-packages/*.egg/") "${superbuild_install_location}/lib/python${superbuild_python_version}/site-packages/*.egg/")
include(python.functions) if (python2_built_by_superbuild)
superbuild_install_superbuild_python( include(python2.functions)
LIBSUFFIX "/python2.7") superbuild_install_superbuild_python2(
LIBSUFFIX "/python${superbuild_python_version}")
elseif (python3_built_by_superbuild)
include(python3.functions)
superbuild_install_superbuild_python3(
LIBSUFFIX "/python${superbuild_python_version}")
endif ()
# Add extra paths to MODULE_DIRECTORIES here (.../local/lib/python2.7/dist-packages) # Add extra paths to MODULE_DIRECTORIES here (.../local/lib/python${superbuild_python_version}/dist-packages)
# is a workaround to an issue when building against system python. When we move to # is a workaround to an issue when building against system python. When we move to
# Python3, we should make sure all the python modules get installed to the same # Python3, we should make sure all the python modules get installed to the same
# location to begin with. # location to begin with.
...@@ -155,14 +161,14 @@ if (python_enabled) ...@@ -155,14 +161,14 @@ if (python_enabled)
${python_modules} ${python_modules}
INCLUDE_REGEXES ${include_regexes} INCLUDE_REGEXES ${include_regexes}
EXCLUDE_REGEXES ${exclude_regexes} EXCLUDE_REGEXES ${exclude_regexes}
MODULE_DIRECTORIES "${superbuild_install_location}/lib/python2.7/site-packages" MODULE_DIRECTORIES "${superbuild_install_location}/lib/python${superbuild_python_version}/site-packages"
${egg_dirs} ${egg_dirs}
LOADER_PATHS "${library_paths}") LOADER_PATHS "${library_paths}")
if (matplotlib_built_by_superbuild) if (matplotlib_built_by_superbuild)
install( install(
DIRECTORY "${superbuild_install_location}/lib/python2.7/site-packages/matplotlib/mpl-data/" DIRECTORY "${superbuild_install_location}/lib/python${superbuild_python_version}/site-packages/matplotlib/mpl-data/"
DESTINATION "lib/python2.7/site-packages/matplotlib/mpl-data" DESTINATION "lib/python${superbuild_python_version}/site-packages/matplotlib/mpl-data"
COMPONENT superbuild) COMPONENT superbuild)
endif () endif ()
endif () endif ()
......
...@@ -31,8 +31,8 @@ endforeach () ...@@ -31,8 +31,8 @@ endforeach ()
if (python_enabled) if (python_enabled)
# Install ParaView Python libraries and any non-ParaView Python libraries. # Install ParaView Python libraries and any non-ParaView Python libraries.
install( install(
DIRECTORY "${superbuild_install_location}/lib/python2.7/" DIRECTORY "${superbuild_install_location}/lib/python${superbuild_python_version}/"
DESTINATION "lib/python2.7/" DESTINATION "lib/python${superbuild_python_version}/"
COMPONENT superbuild COMPONENT superbuild
USE_SOURCE_PERMISSIONS USE_SOURCE_PERMISSIONS
PATTERN "__pycache__" EXCLUDE PATTERN "__pycache__" EXCLUDE
...@@ -42,7 +42,7 @@ if (python_enabled) ...@@ -42,7 +42,7 @@ if (python_enabled)
# Install python binaries and symlinks # Install python binaries and symlinks
if (python_built_by_superbuild) if (python_built_by_superbuild)
install( install(
PROGRAMS "${superbuild_install_location}/bin/python2.7-config" PROGRAMS "${superbuild_install_location}/bin/python${superbuild_python_version}-config"
"${superbuild_install_location}/bin/python2" "${superbuild_install_location}/bin/python2"
"${superbuild_install_location}/bin/python2-config" "${superbuild_install_location}/bin/python2-config"
"${superbuild_install_location}/bin/python" "${superbuild_install_location}/bin/python"
...@@ -50,7 +50,7 @@ if (python_enabled) ...@@ -50,7 +50,7 @@ if (python_enabled)
DESTINATION bin DESTINATION bin
COMPONENT superbuild) COMPONENT superbuild)
list(APPEND binaries_to_install list(APPEND binaries_to_install
"${superbuild_install_location}/bin/python2.7") "${superbuild_install_location}/bin/python${superbuild_python_version}")
endif() endif()
endif() endif()
...@@ -83,9 +83,9 @@ list(REMOVE_DUPLICATES libraries_referenced_by_cmake) ...@@ -83,9 +83,9 @@ list(REMOVE_DUPLICATES libraries_referenced_by_cmake)
if (python_enabled) if (python_enabled)
# Now grab extra python SOs # Now grab extra python SOs
file(GLOB_RECURSE paraview_python_modules file(GLOB_RECURSE paraview_python_modules
"${real_superbuild_install_location}/lib/python2.7/site-packages/*${CMAKE_SHARED_MODULE_SUFFIX}") "${real_superbuild_install_location}/lib/python${superbuild_python_version}/site-packages/*${CMAKE_SHARED_MODULE_SUFFIX}")
file(GLOB_RECURSE python_modules file(GLOB_RECURSE python_modules
"${real_superbuild_install_location}/lib/python2.7/*${CMAKE_SHARED_MODULE_SUFFIX}") "${real_superbuild_install_location}/lib/python${superbuild_python_version}/*${CMAKE_SHARED_MODULE_SUFFIX}")
else () else ()
set(paraview_python_modules) set(paraview_python_modules)
set(python_modules) set(python_modules)
...@@ -174,9 +174,9 @@ include(GetPrerequisites) ...@@ -174,9 +174,9 @@ include(GetPrerequisites)
set(all_binaries) set(all_binaries)
set(dependency_search_paths set(dependency_search_paths
"${real_superbuild_install_location}/lib" "${real_superbuild_install_location}/lib"
"${real_superbuild_install_location}/lib/python2.7" "${real_superbuild_install_location}/lib/python${superbuild_python_version}"
"${real_superbuild_install_location}/lib/python2.7/site-packages" "${real_superbuild_install_location}/lib/python${superbuild_python_version}/site-packages"
"${real_superbuild_install_location}/lib/python2.7/lib-dynload") "${real_superbuild_install_location}/lib/python${superbuild_python_version}/lib-dynload")
if(libraries_to_install) if(libraries_to_install)
list(SORT libraries_to_install) list(SORT libraries_to_install)
endif() endif()
......
...@@ -2,3 +2,8 @@ set(nvidiamdl_libdir nt-x86-64/lib) ...@@ -2,3 +2,8 @@ set(nvidiamdl_libdir nt-x86-64/lib)
set(nvidiamdl_libdest bin) set(nvidiamdl_libdest bin)
include(nvidiamdl.common) 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) ...@@ -6,3 +6,11 @@ set(nvidiaoptix_bindest bin)
set(nvidiaoptix_binsuffix .dll) set(nvidiaoptix_binsuffix .dll)
include(nvidiaoptix.common) 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)
...@@ -25,12 +25,22 @@ set(pvpython_description "pvpython ${paraview_version_full} (Python Shell)") ...@@ -25,12 +25,22 @@ set(pvpython_description "pvpython ${paraview_version_full} (Python Shell)")
#set(CPACK_NSIS_MUI_FINISHPAGE_RUN "bin/paraview.exe") #set(CPACK_NSIS_MUI_FINISHPAGE_RUN "bin/paraview.exe")
set(library_paths "lib") set(library_paths "lib")
if (Qt5_DIR) if (Qt5_DIR)
list(APPEND library_paths list(APPEND library_paths
"${Qt5_DIR}/../../../bin") "${Qt5_DIR}/../../../bin")
endif () endif ()
set(exclude_regexes)
if (python3_enabled)
if (python3_built_by_superbuild)
list(APPEND library_paths
"${superbuild_install_location}/Python")
else()
list(APPEND exclude_regexes
".*python3[0-9]+.dll")
endif()
endif ()
# Install paraview executables to bin. # Install paraview executables to bin.
foreach (executable IN LISTS paraview_executables) foreach (executable IN LISTS paraview_executables)
if (DEFINED "${executable}_description") if (DEFINED "${executable}_description")
...@@ -38,14 +48,16 @@ foreach (executable IN LISTS paraview_executables) ...@@ -38,14 +48,16 @@ foreach (executable IN LISTS paraview_executables)
"bin/${executable}.exe" "${${executable}_description}") "bin/${executable}.exe" "${${executable}_description}")
endif () endif ()
superbuild_windows_install_program("${executable}" "bin" SEARCH_DIRECTORIES superbuild_windows_install_program("${executable}" "bin"
"${library_paths}") SEARCH_DIRECTORIES "${library_paths}"
EXCLUDE_REGEXES ${exclude_regexes})
endforeach() endforeach()
foreach (paraview_plugin IN LISTS paraview_plugins) foreach (paraview_plugin IN LISTS paraview_plugins)
superbuild_windows_install_plugin("${paraview_plugin}.dll" superbuild_windows_install_plugin("${paraview_plugin}.dll"
"${paraview_plugin_path}/${paraview_plugin}" "${paraview_plugin_path}/${paraview_plugin}" SEARCH_DIRECTORIES "${paraview_plugin_path}/${paraview_plugin}" "${paraview_plugin_path}/${paraview_plugin}"
"${paraview_plugin_path}/${paraview_plugin}" "${library_paths}" "${superbuild_install_location}/bin") SEARCH_DIRECTORIES "${paraview_plugin_path}/${paraview_plugin}" "${library_paths}" "${superbuild_install_location}/bin"
EXCLUDE_REGEXES ${exclude_regexes})
endforeach () endforeach ()
set(plugins_file "${CMAKE_CURRENT_BINARY_DIR}/paraview.plugins") set(plugins_file "${CMAKE_CURRENT_BINARY_DIR}/paraview.plugins")
...@@ -103,7 +115,7 @@ if (visrtx_enabled) ...@@ -103,7 +115,7 @@ if (visrtx_enabled)
VisRTX VisRTX
dds dds
nv_freeimage nv_freeimage
mdl_sdk) libmdl_sdk)
foreach (visrtxextra_library IN LISTS visrtxextra_libraries) foreach (visrtxextra_library IN LISTS visrtxextra_libraries)
superbuild_windows_install_plugin("${visrtxextra_library}.dll" superbuild_windows_install_plugin("${visrtxextra_library}.dll"
...@@ -113,39 +125,57 @@ if (visrtx_enabled) ...@@ -113,39 +125,57 @@ if (visrtx_enabled)
endif () endif ()
if (python_enabled) if (python_enabled)
include(python.functions) if (python2_built_by_superbuild)
superbuild_install_superbuild_python() include(python2.functions)
superbuild_install_superbuild_python2()
elseif (python3_built_by_superbuild)
include(python3.functions)
superbuild_install_superbuild_python3()
endif ()
if (python3_enabled)
set(python_prefix "Python")
else()
set(python_prefix "bin")
endif()
superbuild_windows_install_python( superbuild_windows_install_python(
MODULES paraview MODULES paraview
vtk vtk
vtkmodules vtkmodules
${python_modules} ${python_modules}
MODULE_DIRECTORIES "${superbuild_install_location}/bin/Lib/site-packages" MODULE_DIRECTORIES "${superbuild_install_location}/${python_prefix}/Lib/site-packages"
"${superbuild_install_location}/bin/Lib/site-packages"
"${superbuild_install_location}/lib/site-packages" "${superbuild_install_location}/lib/site-packages"
"${superbuild_install_location}/lib/python2.7/site-packages" "${superbuild_install_location}/lib/python${superbuild_python_version}/site-packages"
"${superbuild_install_location}/lib/paraview-${paraview_version_major}.${paraview_version_minor}/site-packages" "${superbuild_install_location}/lib/paraview-${paraview_version_major}.${paraview_version_minor}/site-packages"
SEARCH_DIRECTORIES "${superbuild_install_location}/lib" SEARCH_DIRECTORIES "${superbuild_install_location}/lib"
"${superbuild_install_location}/bin") "${superbuild_install_location}/bin"
"${superbuild_install_location}/${python_prefix}"
EXCLUDE_REGEXES ${exclude_regexes})
if (matplotlib_enabled) if (matplotlib_built_by_superbuild)
install( install(
DIRECTORY "${superbuild_install_location}/bin/Lib/site-packages/matplotlib/mpl-data/" DIRECTORY "${superbuild_install_location}/${python_prefix}/Lib/site-packages/matplotlib/mpl-data/"
DESTINATION "bin/Lib/site-packages/matplotlib/mpl-data" DESTINATION "bin/Lib/site-packages/matplotlib/mpl-data"
COMPONENT superbuild) COMPONENT superbuild)
endif () endif ()
if (pywin32_built_by_superbuild)
install(
DIRECTORY "${superbuild_install_location}/${python_prefix}/Lib/site-packages/win32"
DESTINATION "bin/Lib/site-packages"
COMPONENT "superbuild")
install(
FILES "${superbuild_install_location}/${python_prefix}/Lib/site-packages/pywin32.pth"
"${superbuild_install_location}/${python_prefix}/Lib/site-packages/pywin32.version.txt"
DESTINATION "bin/Lib/site-packages"
COMPONENT "superbuild")
endif ()
endif () endif ()
if (paraviewweb_enabled) if (paraviewweb_enabled)
install(
DIRECTORY "${superbuild_install_location}/bin/Lib/site-packages/win32"
DESTINATION "bin/Lib/site-packages"
COMPONENT "superbuild")
install(
FILES "${superbuild_install_location}/bin/Lib/site-packages/pywin32.pth"
"${superbuild_install_location}/bin/Lib/site-packages/pywin32.version.txt"
DESTINATION "bin/Lib/site-packages"
COMPONENT "superbuild")
install( install(
DIRECTORY "${superbuild_install_location}/share/paraview/web" DIRECTORY "${superbuild_install_location}/share/paraview/web"
DESTINATION "share/paraview-${paraview_version}" DESTINATION "share/paraview-${paraview_version}"
......
Subproject commit b33d663ed7299fdbfdac118a377f57dcb2c710f7 Subproject commit 7bf369b5dafd89c292e83f0b6b18164883e09a1e
...@@ -189,7 +189,7 @@ superbuild_set_revision(nvidiamdl ...@@ -189,7 +189,7 @@ superbuild_set_revision(nvidiamdl
superbuild_set_revision(visrtx superbuild_set_revision(visrtx
GIT_REPOSITORY "https://github.com/NVIDIA/VisRTX.git" 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 superbuild_set_revision(mili
URL "https://www.paraview.org/files/dependencies/mili-15.1.tar.gz" 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