Merge topic 'paraviewsdk-hierarchy-files' into release

7d7ea32c paraviewsdk: fix test suite
0bdb45e4 paraviewsdk: install VTK hierarchy files

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !802

projects/unix/paraviewsdk.bundle.cmake

@@ -15,6 +15,13 @@ install(
   COMPONENT   superbuild
   USE_SOURCE_PERMISSIONS)
 
+# Install VTK module hierarchy files
+install(
+  DIRECTORY   "${superbuild_install_location}/lib/vtk/hierarchy"
+  DESTINATION lib/vtk
+  COMPONENT   superbuild
+  USE_SOURCE_PERMISSIONS)
+
 # Install ParaView headers
 install(
   DIRECTORY   "${superbuild_install_location}/include/paraview-${paraview_version}"

tests/paraviewsdk.test.cmake

@@ -77,36 +77,33 @@ if (mpi_enabled)
   add_paraviewsdk_example_catalyst_test(CxxMultiPieceExample)
   add_paraviewsdk_example_catalyst_test(CxxPVSMPipelineExample)
   add_paraviewsdk_example_catalyst_test(MPISubCommunicatorExample)
+  add_paraviewsdk_example_catalyst_test(CFullExample2)
+  add_paraviewsdk_example_catalyst_test(CxxFullExample)
+  add_paraviewsdk_example_catalyst_test(CxxNonOverlappingAMRExample)
+  add_paraviewsdk_example_catalyst_test(CxxOverlappingAMRExample)
+  add_paraviewsdk_example_catalyst_test(CxxParticlePathExample)
+  add_paraviewsdk_example_catalyst_test(CxxSOADataArrayExample)
+  add_paraviewsdk_example_catalyst_test(CxxVTKPipelineExample)
+  if (NOT CMAKE_GENERATOR MATCHES "Ninja")
+    add_paraviewsdk_example_catalyst_test(Fortran90FullExample)
+    add_paraviewsdk_example_catalyst_test(FortranPoissonSolver)
+  endif ()
+  add_paraviewsdk_example_catalyst_test(PythonDolfinExample)
 endif ()
 
-add_paraviewsdk_example_catalyst_test(CFullExample2)
-add_paraviewsdk_example_catalyst_test(CxxFullExample)
-add_paraviewsdk_example_catalyst_test(CxxNonOverlappingAMRExample)
-add_paraviewsdk_example_catalyst_test(CxxOverlappingAMRExample)
-add_paraviewsdk_example_catalyst_test(CxxParticlePathExample)
-add_paraviewsdk_example_catalyst_test(CxxSOADataArrayExample)
-add_paraviewsdk_example_catalyst_test(CxxVTKPipelineExample)
-if (NOT CMAKE_GENERATOR MATCHES "Ninja")
-  add_paraviewsdk_example_catalyst_test(Fortran90FullExample)
-  add_paraviewsdk_example_catalyst_test(FortranPoissonSolver)
-endif ()
-add_paraviewsdk_example_catalyst_test(PythonDolfinExample)
-
 if (gui_enabled)
   add_paraviewsdk_example_plugin_test(Autostart)
   add_paraviewsdk_example_plugin_test(RepresentationBehavior)
 endif ()
 add_paraviewsdk_example_plugin_test(DockWidget)
-add_paraviewsdk_example_plugin_test(Filter)
-add_paraviewsdk_example_plugin_test(GUIToolBar)
-add_paraviewsdk_example_plugin_test(HiddenLinesRemoval)
-add_paraviewsdk_example_plugin_test(ParametricSource)
+add_paraviewsdk_example_plugin_test(ElevationFilter)
+add_paraviewsdk_example_plugin_test(GUIMyToolBar)
+add_paraviewsdk_example_plugin_test(MyPNGReader)
+add_paraviewsdk_example_plugin_test(MyTiffWriter)
 add_paraviewsdk_example_plugin_test(PropertyWidgets)
-add_paraviewsdk_example_plugin_test(Reader)
 add_paraviewsdk_example_plugin_test(ReaderXMLOnly)
-add_paraviewsdk_example_plugin_test(SMProxy)
+add_paraviewsdk_example_plugin_test(SMMyProxy)
 add_paraviewsdk_example_plugin_test(SourceToolbar)
 if (visitbridge_enabled)
   add_paraviewsdk_example_plugin_test(VisItReader)
 endif ()
-add_paraviewsdk_example_plugin_test(Writer)