Merge topic 'vtkmpi-inclusion-fun'

52e30b0 vtkMPI: include vtkMPI before making libraries

Author: utkarshayachit

ParaViewCore/ClientServerCore/Core/CMakeLists.txt

@@ -112,10 +112,13 @@ set_source_files_properties(
   vtkSession
   ABSTRACT)
 
+if(PARAVIEW_USE_MPI)
+  include(vtkMPI)
+endif()
+
 # Use a custom hints file for this module.
 set(${vtk-module}_WRAP_HINTS "${CMAKE_CURRENT_SOURCE_DIR}/hints")
 vtk_module_library(vtkPVClientServerCoreCore ${Module_SRCS})
 if(PARAVIEW_USE_MPI)
-  include(vtkMPI)
   vtk_mpi_link(${vtk-module})
 endif()

ParaViewCore/VTKExtensions/Rendering/CMakeLists.txt

@@ -146,8 +146,10 @@ foreach (file vtkIceTCompositeZPassShader_fs.glsl)
 endforeach()
 #---------------------------------------------------------
 
-vtk_module_library(vtkPVVTKExtensionsRendering ${Module_SRCS})
 if(PARAVIEW_USE_MPI)
   include(vtkMPI)
+endif()
+vtk_module_library(vtkPVVTKExtensionsRendering ${Module_SRCS})
+if(PARAVIEW_USE_MPI)
   vtk_mpi_link(${vtk-module})
 endif()

Plugins/CatalystScriptGenerator/CMakeLists.txt

@@ -65,6 +65,10 @@ ADD_PARAVIEW_AUTO_START(
   CLASS_NAME pqCPPluginManager)
 
 
+if(PARAVIEW_USE_MPI)
+  include(vtkMPI)
+endif()
+
 ADD_PARAVIEW_PLUGIN(
   CatalystScriptGeneratorPlugin
   #"${Catalyst_VERSION_MAJOR}.${Catalyst_VERSION_MINOR}.${Catalyst_VERSION_PATCH}"
@@ -100,6 +104,5 @@ IF (BUILD_TESTING)
 ENDIF ()
 
 if(PARAVIEW_USE_MPI)
-  include(vtkMPI)
   vtk_mpi_link(CatalystScriptGeneratorPlugin)
 endif()

Plugins/GMVReader/CMakeLists.txt

@@ -63,6 +63,10 @@ ELSEIF (UNIX)
   ENDIF ()
 ENDIF ()
 
+if(PARAVIEW_USE_MPI)
+  include(vtkMPI)
+endif()
+
 # ---------------------------------------------------------------------------
 # Combined plugin
 # -----------------------------------------------------------------------------
@@ -101,6 +105,5 @@ IF (BUILD_TESTING)
 ENDIF ()
 
 if(PARAVIEW_USE_MPI)
-  include(vtkMPI)
   vtk_mpi_link(GMVReader)
 endif()

Plugins/H5PartReader/CMakeLists.txt

@@ -19,6 +19,10 @@ ADD_DEFINITIONS(-DH5_USE_16_API)
 # needed for mpich
 add_definitions("-DMPICH_IGNORE_CXX_SEEK")
 
+if(PARAVIEW_USE_MPI)
+  include(vtkMPI)
+endif()
+
 ADD_PARAVIEW_PLUGIN(H5PartReader "1.0"
   SERVER_MANAGER_SOURCES
     vtkH5PartReader.cxx
@@ -38,7 +42,6 @@ target_link_libraries(H5PartReader LINK_PRIVATE
   vtksys)
 
 if(PARAVIEW_USE_MPI)
-  include(vtkMPI)
   vtk_mpi_link(H5PartReader)
 endif()
 

Plugins/SciberQuestToolKit/ParaViewPlugin/CMakeLists.txt

@@ -89,6 +89,10 @@ set (SQTK_SM_XML
 
 include_directories(${VTK_INCLUDE_DIRS} ${MPI_CXX_INCLUDE_PATH})
 
+if(PARAVIEW_USE_MPI)
+  include(vtkMPI)
+endif()
+
 # Generate the plugin, servermanager and wrapped language bindings.
 add_paraview_plugin(
   SciberQuestToolKit "${SQTK_VERSION}"
@@ -110,6 +114,5 @@ install(TARGETS SciberQuestToolKit
   LIBRARY DESTINATION ${VTK_INSTALL_LIBRARY_DIR})
 
 if(PARAVIEW_USE_MPI)
-  include(vtkMPI)
   vtk_mpi_link(SciberQuestToolKit)
 endif()

Plugins/SciberQuestToolKit/SciberQuest/CMakeLists.txt

@@ -137,6 +137,10 @@ if (SQTK_DEBUG)
   add_definitions(-DSQTK_DEBUG)
 endif()
 
+if(PARAVIEW_USE_MPI)
+  include(vtkMPI)
+endif()
+
 vtk_module_library(vtkSciberQuest ${CXX_SOURCES})
 
 if (SQTK_CUDA AND CUDA_FOUND)
@@ -150,6 +154,5 @@ install(TARGETS vtkSciberQuest
    LIBRARY DESTINATION ${VTK_INSTALL_LIBRARY_DIR})
 
 if(PARAVIEW_USE_MPI)
-  include(vtkMPI)
   vtk_mpi_link(vtkSciberQuest)
 endif()