Skip to content
  • Utkarsh Ayachit's avatar
    Merge remote branch 'origin/master' into Collaboration2 · 3c3924ad
    Utkarsh Ayachit authored
    * origin/master: (446 commits)
      SuperBuild: Add external project step for building ParaView.
      SuperBuild: Set MPI variables to pass into ParaView.
      SuperBuild: Style fixes.
      SuperBuild: Indentation fixes and use C/CXX flags with warnings disabled.
      SuperBuild: Configure NUMPY to build with either LAPACK or CLAPACK.
      SuperBuild: If on Windows build with CMake otherwise ./configure.
      SuperBuild: Fix source dir project prefixes.
      SuperBuild: Add logic to build LAPACK if there is a fortran compiler.
      Link to Winmm on Windows and export vtkMantaTexture.
      SuperBuild: Make it easier to customize C and CXX Flags.
      Move the VTK submodule forward to fix BUG #11618
      Link to Winmm on Windows and export vtkMantaTexture.
      SuperBuild: Build LAPACK when a fortran compiler is available.
      SuperBuild: Enable building Manta and OpenMPI.
      SuperBuild: Add a custom install step for NUMPY.
      SuperBuild: Switch to using pv_tpl_compiler_args which disable warnings.
      Fixed 3D widgets new only representation is present.
      BUG: Remove VisIt plugin again as it was a merge error.
      Forwarding VTK to bring in fixes to hardware selector.
      Fixed BUG #11587. Point selections weren't working in parallel.
      ...
    
    Conflicts:
    	Servers/Common/vtkProcessModule.cxx
    	Servers/Common/vtkProcessModule.h
    	Servers/Filters/CMakeLists.txt
    	Servers/Filters/vtkPVHardwareSelector.cxx
    	Servers/Filters/vtkPVHardwareSelector.h
    	Servers/Filters/vtkPVPostFilter.cxx
    	Servers/Filters/vtkPVRenderView.cxx
    	Servers/Filters/vtkPVSynchronizedRenderWindows.cxx
    	Servers/Filters/vtkPVSynchronizedRenderer.cxx
    	Servers/Filters/vtkPVView.cxx
    	Servers/ServerManager/Resources/readers.xml
    	Servers/ServerManager/vtkInitializationHelper.cxx
    	Servers/ServerManager/vtkSMDoubleVectorProperty.cxx
    	Servers/ServerManager/vtkSMNewWidgetRepresentationProxy.cxx
    	Servers/ServerManager/vtkSMPVRepresentationProxy.cxx
    	Servers/ServerManager/vtkSMRenderViewProxy.cxx
    	Utilities/VTKPythonWrapping/Executable/CMakeLists.txt
    	Utilities/VTKPythonWrapping/paraview/servermanager.py
    	VTK
    3c3924ad