Commit 4e9a5f80 authored by Ben Boeckel's avatar Ben Boeckel
Browse files

python3.8: pass down DLL paths for Qt if available

parent 0f155d57
...@@ -36,6 +36,13 @@ else () ...@@ -36,6 +36,13 @@ else ()
set(paraview_matplotlib_selection NO) set(paraview_matplotlib_selection NO)
endif () endif ()
set(paraview_dll_paths)
if (qt5_dllpath)
list(APPEND paraview_dll_paths
"${qt5_dllpath}")
endif ()
string(REPLACE ";" "${_superbuild_list_separator}" paraview_dll_paths "${paraview_dll_paths}")
superbuild_add_project(paraview superbuild_add_project(paraview
DEBUGGABLE DEBUGGABLE
DEPENDS DEPENDS
...@@ -69,6 +76,9 @@ superbuild_add_project(paraview ...@@ -69,6 +76,9 @@ superbuild_add_project(paraview
# enable VisIt bridge for additional file readers # enable VisIt bridge for additional file readers
-DPARAVIEW_ENABLE_VISITBRIDGE:BOOL=ON -DPARAVIEW_ENABLE_VISITBRIDGE:BOOL=ON
-DPARAVIEW_UNIFIED_INSTALL_TREE:BOOL=ON
-DVTK_DLL_PATHS:STRING=${paraview_dll_paths}
#CMB needs geovis enabled to provide the gdal reader #CMB needs geovis enabled to provide the gdal reader
-DVTK_MODULE_ENABLE_VTK_GeovisCore:STRING=YES -DVTK_MODULE_ENABLE_VTK_GeovisCore:STRING=YES
-DVTK_MODULE_ENABLE_VTK_ViewsInfovis:STRING=YES -DVTK_MODULE_ENABLE_VTK_ViewsInfovis:STRING=YES
......
...@@ -39,6 +39,13 @@ else () ...@@ -39,6 +39,13 @@ else ()
set(smtk_step_keyword INDEPENDENT_STEP_TARGETS) set(smtk_step_keyword INDEPENDENT_STEP_TARGETS)
endif () endif ()
set(smtk_dll_paths)
if (qt5_dllpath)
list(APPEND smtk_dll_paths
"${qt5_dllpath}")
endif ()
string(REPLACE ";" "${_superbuild_list_separator}" smtk_dll_paths "${smtk_dll_paths}")
#explicitly depend on gdal so we inherit the location of the GDAL library #explicitly depend on gdal so we inherit the location of the GDAL library
#which FindGDAL.cmake fails to find, even when given GDAL_DIR. #which FindGDAL.cmake fails to find, even when given GDAL_DIR.
superbuild_add_project(smtk superbuild_add_project(smtk
...@@ -57,6 +64,8 @@ superbuild_add_project(smtk ...@@ -57,6 +64,8 @@ superbuild_add_project(smtk
-D_smtk_superbuild_prefix:PATH=<INSTALL_DIR> -D_smtk_superbuild_prefix:PATH=<INSTALL_DIR>
# Not needed for the install tree. # Not needed for the install tree.
-DSMTK_UNIFIED_INSTALL_TREE:BOOL=ON -DSMTK_UNIFIED_INSTALL_TREE:BOOL=ON
# Additional DLL paths required for SMTK.
-DSMTK_DLL_PATHS:STRING=${smtk_dll_paths}
${smtk_extra_cmake_args} ${smtk_extra_cmake_args}
-DBUILD_SHARED_LIBS:BOOL=ON -DBUILD_SHARED_LIBS:BOOL=ON
......
...@@ -20,6 +20,13 @@ if (python_enabled) ...@@ -20,6 +20,13 @@ if (python_enabled)
set(vtkonly_python_req YES) set(vtkonly_python_req YES)
endif () endif ()
set(vtk_dll_paths)
if (qt5_dllpath)
list(APPEND vtk_dll_paths
"${qt5_dllpath}")
endif ()
string(REPLACE ";" "${_superbuild_list_separator}" vtk_dll_paths "${vtk_dll_paths}")
superbuild_add_project(vtkonly superbuild_add_project(vtkonly
DEBUGGABLE DEBUGGABLE
DEPENDS DEPENDS
...@@ -37,6 +44,9 @@ superbuild_add_project(vtkonly ...@@ -37,6 +44,9 @@ superbuild_add_project(vtkonly
-DVTK_PYTHON_VERSION:STRING=${python_version} -DVTK_PYTHON_VERSION:STRING=${python_version}
-DVTK_ENABLE_KITS:BOOL=ON -DVTK_ENABLE_KITS:BOOL=ON
-DVTK_UNIFIED_INSTALL_TREE:BOOL=ON
-DVTK_DLL_PATHS:STRING=${vtk_dll_paths}
-DVTK_MODULE_ENABLE_VTK_GUISupportQt:STRING=${vtkonly_qt_req} -DVTK_MODULE_ENABLE_VTK_GUISupportQt:STRING=${vtkonly_qt_req}
# CMB needs geovis enabled to provide the gdal reader # CMB needs geovis enabled to provide the gdal reader
-DVTK_MODULE_ENABLE_VTK_CommonArchive:STRING=${vtkonly_libarchive_req} -DVTK_MODULE_ENABLE_VTK_CommonArchive:STRING=${vtkonly_libarchive_req}
......
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