Merge topic 'smtk-superbuild-marker'

848af648 ci: exclude test failing due to VTK's Python 3.8 support
ecc5dc58

 smtk: pass the install dir to SMTK

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: David Thompson <david.thompson@kitware.com>
Merge-request: !726

.gitlab/ci/ctest_test.cmake

@@ -34,6 +34,8 @@ endif ()
 
 if ("$ENV{CI_JOB_NAME}" MATCHES "windows")
   list(APPEND test_exclusions
+    # Needs vtk/vtk!7594
+    "openSMTKFileInParaViewPy"
     # Zoomed in somehow?
     "displayAuxiliaryGeometry"
     # Rendering changes.

projects/smtk.cmake

@@ -53,6 +53,11 @@ superbuild_add_project(smtk
     # Windows needs help finding the ZeroMQ from the install.
     -DSMTK_RELOCATABLE_INSTALL:BOOL=OFF
 
+    # DLL path loading help for the build tree.
+    -D_smtk_superbuild_prefix:PATH=<INSTALL_DIR>
+    # Not needed for the install tree.
+    -DSMTK_UNIFIED_INSTALL_TREE:BOOL=ON
+
     ${smtk_extra_cmake_args}
     -DBUILD_SHARED_LIBS:BOOL=ON
     -DCMAKE_INSTALL_LIBDIR:STRING=lib

versions.cmake

@@ -27,6 +27,9 @@ superbuild_set_selectable_source(paraview
     # COPY THE COMMIT MESSAGE OF THE SHA. EXPLAIN WHY SMTK/CMB/AEVA NEED
     # THE NEW PARAVIEW VERSION.
     #
+    # XXX: If the ParaView update includes vtk/vtk!7594, remove the marked
+    # exclusion in `.gitlab/ci/ctest_test.cmake`.
+    #
     # What: master @ Mon Nov 23 15:29:33 2020 +0000
     # Why:  Multiple issues addressed in master after 5.9.0-rc1
     GIT_TAG         "c3529d8e24fd95f2a3c697a4b7078301e1d8b1f7"