Building paraview target only with VTK_USE_X

Kitware · Mar 16, 2021 · 614b1c3 · 614b1c3
1 parent 31cb196
commit 614b1c3
Show file tree

Hide file tree

Showing 30 changed files with 35 additions and 30 deletions.
diff --git a/Clients/CMakeLists.txt b/Clients/CMakeLists.txt
@@ -1,4 +1,9 @@
 add_subdirectory(CommandLineExecutables)
 if (PARAVIEW_USE_QT)
-  add_subdirectory(ParaView)
+  if (WIN32 OR VTK_USE_X OR VTK_USE_COCOA)
+    add_subdirectory(ParaView)
+  else ()
+    message(WARNING "Enabling Qt while not building with onscreen rendering support has limited support, "
+            "The `paraview` Qt client will not be built.")
+  endif()
 endif ()
diff --git a/Clients/ParaView/Testing/XML/CMakeLists.txt b/Clients/ParaView/Testing/XML/CMakeLists.txt
@@ -1752,7 +1752,7 @@ paraview_add_cave_tests(2 "${CMAKE_CURRENT_SOURCE_DIR}/LeftRight.pvx"
 #------------------------------------------------------------------
 # Add tests that test command line arguments (among other things).
 #------------------------------------------------------------------
-if (TARGET paraview)
+if (TARGET ParaView::paraview)
   # The state file need to point to the correct data file. We do that by
   # configuring the state file.
   configure_file (

diff --git a/Clients/PythonCatalyst/Testing/CMakeLists.txt b/Clients/PythonCatalyst/Testing/CMakeLists.txt
@@ -254,7 +254,7 @@ unset(filedriver_tests)
 #    `vtk_module_test_data` call at the start of this file to include the new
 #    baselines.
 #---------------------------------------------------------------------
-if (PARAVIEW_USE_QT)
+if (TARGET ParaView::paraview)
   include(FindPythonModules)
   find_python_module(pandas pandas_found)
 

diff --git a/Documentation/release/dev/OpenGLOptionsDocumentation.md b/Documentation/release/dev/OpenGLOptionsDocumentation.md
@@ -4,4 +4,4 @@ The documentation about OpenGL options (https://kitware.github.io/paraview-docs/
 has been improved as well as cmake checks of which options are compatible with each other.
 
 PARAVIEW_USE_QT should not be used to detect if the paraview Qt executable
-has been built, instead, TARGET paraview should be used.
+has been built, instead, TARGET ParaView::paraview should be used.
diff --git a/Examples/Plugins/ElevationFilter/Plugin/Testing/CMakeLists.txt b/Examples/Plugins/ElevationFilter/Plugin/Testing/CMakeLists.txt
@@ -1,4 +1,4 @@
-if (PARAVIEW_USE_QT)
+if (TARGET ParaView::paraview)
   set (TestXML_USES_DIRECT_DATA ON)
   paraview_add_client_tests(
     LOAD_PLUGIN ElevationFilter

diff --git a/Plugins/AnalyzeNIfTIReaderWriter/Testing/CMakeLists.txt b/Plugins/AnalyzeNIfTIReaderWriter/Testing/CMakeLists.txt
@@ -2,7 +2,7 @@ set(module_tests
   AnalyzeReaderWriterPlugin.xml
   NiftiReaderWriterPlugin.xml)
 
-if (PARAVIEW_USE_QT AND BUILD_SHARED_LIBS)
+if (TARGET ParaView::paraview AND BUILD_SHARED_LIBS)
   set(_paraview_add_tests_default_test_data_target ParaViewData)
   ExternalData_Expand_Arguments(ParaViewData _
     "DATA{${CMAKE_CURRENT_SOURCE_DIR}/Data/ANALYZE/,REGEX:.*}"

diff --git a/Plugins/BagPlotViewsAndFilters/Testing/CMakeLists.txt b/Plugins/BagPlotViewsAndFilters/Testing/CMakeLists.txt
@@ -1,4 +1,4 @@
-if (PARAVIEW_USE_QT AND BUILD_SHARED_LIBS)
+if (TARGET ParaView::paraview AND BUILD_SHARED_LIBS)
 
   ExternalData_Expand_Arguments("ParaViewData" _
     "DATA{Data/Baseline/BagPlotMatrixView_A.png}")

diff --git a/Plugins/Datamine/Testing/CMakeLists.txt b/Plugins/Datamine/Testing/CMakeLists.txt
@@ -1,4 +1,4 @@
-if (PARAVIEW_USE_QT)
+if (TARGET ParaView::paraview)
   ExternalData_Expand_Arguments("ParaViewData" _
     "DATA{Data/datamine_smallpt.dm}"
     "DATA{Data/datamine_smalltr.dm}"

diff --git a/Plugins/DigitalRockPhysics/Testing/CMakeLists.txt b/Plugins/DigitalRockPhysics/Testing/CMakeLists.txt
@@ -1,4 +1,4 @@
-if (PARAVIEW_USE_QT)
+if (TARGET ParaView::paraview)
   set(_paraview_add_tests_default_test_data_target DigitalRockPhysicsData)
   ExternalData_Expand_Arguments("${_paraview_add_tests_default_test_data_target}" _
     "DATA{Data/rocksample.vti}")

diff --git a/Plugins/EmbossingRepresentations/Testing/CMakeLists.txt b/Plugins/EmbossingRepresentations/Testing/CMakeLists.txt
@@ -1,6 +1,6 @@
 include(ParaViewTesting)
 
-if (PARAVIEW_USE_QT AND BUILD_SHARED_LIBS)
+if (TARGET ParaView::paraview AND BUILD_SHARED_LIBS)
   paraview_add_client_tests(
     LOAD_PLUGIN "EmbossingRepresentations"
     BASELINE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/Data/Baseline"

diff --git a/Plugins/ExplicitStructuredGrid/Testing/CMakeLists.txt b/Plugins/ExplicitStructuredGrid/Testing/CMakeLists.txt
@@ -1,4 +1,4 @@
-if (PARAVIEW_USE_QT AND BUILD_SHARED_LIBS)
+if (TARGET ParaView::paraview AND BUILD_SHARED_LIBS)
 
   ExternalData_Expand_Arguments("ParaViewData" _
     "DATA{Data/explicitStructuredGrid.vtu}")

diff --git a/Plugins/FlipBook/Testing/CMakeLists.txt b/Plugins/FlipBook/Testing/CMakeLists.txt
@@ -1,4 +1,4 @@
-if (PARAVIEW_USE_QT AND BUILD_SHARED_LIBS)
+if (TARGET ParaView::paraview AND BUILD_SHARED_LIBS)
 
   paraview_add_client_tests(
     LOAD_PLUGIN "FlipBookPlugin"

diff --git a/Plugins/GMVReader/Testing/CMakeLists.txt b/Plugins/GMVReader/Testing/CMakeLists.txt
@@ -8,7 +8,7 @@ set(GMV_READER_TESTS
   GMVReaderInvalidFiles${suffix}.xml
 )
 
-if (PARAVIEW_USE_QT)
+if (TARGET ParaView::paraview)
   set(_paraview_add_tests_default_test_data_target ParaViewData)
   ExternalData_Expand_Arguments(ParaViewData _
     "DATA{${CMAKE_CURRENT_SOURCE_DIR}/Data/GMV/,REGEX:.*}"

diff --git a/Plugins/GenericIOReader/Testing/CMakeLists.txt b/Plugins/GenericIOReader/Testing/CMakeLists.txt
@@ -1,4 +1,4 @@
-if (PARAVIEW_USE_QT AND BUILD_SHARED_LIBS)
+if (TARGET ParaView::paraview AND BUILD_SHARED_LIBS)
   set(_paraview_add_tests_default_test_data_target ParaViewData)
   ExternalData_Expand_Arguments(ParaViewData _
     "DATA{${CMAKE_CURRENT_SOURCE_DIR}/Data/Gmsh/,REGEX:viz_*}"

diff --git a/Plugins/GmshIO/Testing/CMakeLists.txt b/Plugins/GmshIO/Testing/CMakeLists.txt
@@ -1,7 +1,7 @@
 set(module_tests
   GmshIOTest.xml)
 
-if (PARAVIEW_USE_QT AND BUILD_SHARED_LIBS)
+if (TARGET ParaView::paraview AND BUILD_SHARED_LIBS)
   set(_paraview_add_tests_default_test_data_target ParaViewData)
 
   ExternalData_Expand_Arguments(ParaViewData _

diff --git a/Plugins/GmshReader/Testing/CMakeLists.txt b/Plugins/GmshReader/Testing/CMakeLists.txt
@@ -1,4 +1,4 @@
-if (PARAVIEW_USE_QT AND BUILD_SHARED_LIBS)
+if (TARGET ParaView::paraview AND BUILD_SHARED_LIBS)
   set(_paraview_add_tests_default_test_data_target ParaViewData)
   ExternalData_Expand_Arguments(ParaViewData _
     "DATA{${CMAKE_CURRENT_SOURCE_DIR}/Data/Gmsh/,REGEX:viz_.*}"

diff --git a/Plugins/InSituExodus/Testing/CMakeLists.txt b/Plugins/InSituExodus/Testing/CMakeLists.txt
@@ -1,4 +1,4 @@
-if (PARAVIEW_USE_QT)
+if (TARGET ParaView::paraview)
   set(test_xmls
     InSituExodusPluginTest.xml
   )

diff --git a/Plugins/LagrangianParticleTracker/Testing/CMakeLists.txt b/Plugins/LagrangianParticleTracker/Testing/CMakeLists.txt
@@ -1,4 +1,4 @@
-if (PARAVIEW_USE_QT AND BUILD_SHARED_LIBS)
+if (TARGET ParaView::paraview AND BUILD_SHARED_LIBS)
   ExternalData_Expand_Arguments("ParaViewData" _
     "DATA{Data/LagrangianParticleTracker/,REGEX:.*}"
     "DATA{Data/LagrangianParticleTracker/flow/,REGEX:.*}"

diff --git a/Plugins/MooseXfemClip/Testing/CMakeLists.txt b/Plugins/MooseXfemClip/Testing/CMakeLists.txt
@@ -1,4 +1,4 @@
-if (PARAVIEW_USE_QT)
+if (TARGET ParaView::paraview)
   ExternalData_Expand_Arguments("ParaViewData" _
     "DATA{Data/,REGEX:init_solution_propagation_out\\.e.*}")
 

diff --git a/Plugins/NetCDFTimeAnnotationPlugin/Testing/CMakeLists.txt b/Plugins/NetCDFTimeAnnotationPlugin/Testing/CMakeLists.txt
@@ -1,4 +1,4 @@
-if (PARAVIEW_USE_QT AND BUILD_SHARED_LIBS)
+if (TARGET ParaView::paraview AND BUILD_SHARED_LIBS)
   ExternalData_Expand_Arguments("ParaViewData" _
     "DATA{Data/tos_O1_2001-2002.nc}")
 

diff --git a/Plugins/NonOrthogonalSource/Testing/CMakeLists.txt b/Plugins/NonOrthogonalSource/Testing/CMakeLists.txt
@@ -1,4 +1,4 @@
-if (PARAVIEW_USE_QT AND BUILD_SHARED_LIBS)
+if (TARGET ParaView::paraview AND BUILD_SHARED_LIBS)
   set (xmls
     NonOrthogonalSliceView.xml
     NonOrthographicOrthographicView.xml

diff --git a/Plugins/PacMan/Testing/CMakeLists.txt b/Plugins/PacMan/Testing/CMakeLists.txt
@@ -1,7 +1,7 @@
 set(module_tests
   LoadPlugins.xml)
 
-if (PARAVIEW_USE_QT AND BUILD_SHARED_LIBS)
+if (TARGET ParaView::paraview AND BUILD_SHARED_LIBS)
   paraview_add_client_tests("pv"
     BASELINE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/Data/Baseline"
     TEST_DATA_TARGET ParaViewData

diff --git a/Plugins/PanoramicProjectionView/Testing/CMakeLists.txt b/Plugins/PanoramicProjectionView/Testing/CMakeLists.txt
@@ -1,4 +1,4 @@
-if (PARAVIEW_USE_QT AND BUILD_SHARED_LIBS)
+if (TARGET ParaView::paraview AND BUILD_SHARED_LIBS)
   paraview_add_client_tests(
     LOAD_PLUGIN "PanoramicProjectionView"
     BASELINE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/Data/Baseline"

diff --git a/Plugins/SLACTools/Testing/CMakeLists.txt b/Plugins/SLACTools/Testing/CMakeLists.txt
@@ -2,7 +2,7 @@ set(module_tests
   SLACTools.xml
 )
 
-if (PARAVIEW_USE_QT AND BUILD_SHARED_LIBS)
+if (TARGET ParaView::paraview AND BUILD_SHARED_LIBS)
   ExternalData_Expand_Arguments("ParaViewData" _
     "DATA{${CMAKE_CURRENT_SOURCE_DIR}/Data/Baseline/,REGEX:.*}"
     "DATA{${CMAKE_CURRENT_SOURCE_DIR}/Data/SLAC/pic-example/,REGEX:.*}"

diff --git a/Plugins/SaveStateAndScreenshot/Testing/CMakeLists.txt b/Plugins/SaveStateAndScreenshot/Testing/CMakeLists.txt
@@ -1,4 +1,4 @@
-if (PARAVIEW_USE_QT AND BUILD_SHARED_LIBS)
+if (TARGET ParaView::paraview AND BUILD_SHARED_LIBS)
 
   ExternalData_Expand_Arguments("ParaViewData" _
     "DATA{Data/Baseline/SaveStateAndScreenshot.png}")

diff --git a/Plugins/StreamLinesRepresentation/Testing/CMakeLists.txt b/Plugins/StreamLinesRepresentation/Testing/CMakeLists.txt
@@ -1,4 +1,4 @@
-if (PARAVIEW_USE_QT AND BUILD_SHARED_LIBS)
+if (TARGET ParaView::paraview AND BUILD_SHARED_LIBS)
   paraview_add_client_tests(
     LOAD_PLUGIN "StreamLinesRepresentation"
     BASELINE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/Data/Baseline"

diff --git a/Plugins/StreamingParticles/Testing/CMakeLists.txt b/Plugins/StreamingParticles/Testing/CMakeLists.txt
@@ -1,4 +1,4 @@
-if (PARAVIEW_USE_QT AND PARAVIEW_ENABLE_COSMOTOOLS)
+if (TARGET ParaView::paraview AND PARAVIEW_ENABLE_COSMOTOOLS)
   ExternalData_Expand_Arguments("ParaViewData" _
     "DATA{${CMAKE_CURRENT_SOURCE_DIR}/Data/adaptive-cosmo/,REGEX:.*}"
     "DATA{${CMAKE_CURRENT_SOURCE_DIR}/Data/multiresolution-streaming/,REGEX:.*}"

diff --git a/Plugins/VTKmFilters/Testing/CMakeLists.txt b/Plugins/VTKmFilters/Testing/CMakeLists.txt
@@ -7,7 +7,7 @@ set(module_tests
   VTKmThreshold.xml
 )
 
-if (PARAVIEW_USE_QT AND BUILD_SHARED_LIBS)
+if (TARGET ParaView::paraview AND BUILD_SHARED_LIBS)
   paraview_add_client_tests(
     LOAD_PLUGIN "VTKmFilters"
     BASELINE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/Data/Baseline"

diff --git a/Plugins/pvNVIDIAIndeX/Testing/CMakeLists.txt b/Plugins/pvNVIDIAIndeX/Testing/CMakeLists.txt
@@ -1,4 +1,4 @@
-if (PARAVIEW_USE_QT)
+if (TARGET ParaView::paraview)
   set(test_xmls
     IndeXRepresentation.xml
   )

diff --git a/Remoting/Application/Testing/Python/CMakeLists.txt b/Remoting/Application/Testing/Python/CMakeLists.txt
@@ -196,7 +196,7 @@ set(paraview_python_state_tests
   ScalarOpacityFunctionPythonState
 )
 foreach(python_state_test ${paraview_python_state_tests})
-  if (PARAVIEW_USE_QT)
+  if (TARGET ParaView::paraview)
     set(tname "ParaView::RemotingApplicationPython-${python_state_test}")
     ExternalData_add_test("${_vtk_build_TEST_DATA_TARGET}" NAME ${tname}
       COMMAND ${CMAKE_COMMAND}