ceph/src/jaegertracing/opentelemetry-cpp/tools/vcpkg/ports/paraview/paraview_build.patch

   1 diff --git a/CMake/ParaViewClient.cmake b/CMake/ParaViewClient.cmake
   2 index 7dadad937..dd271739d 100644
   3 --- a/CMake/ParaViewClient.cmake
   4 +++ b/CMake/ParaViewClient.cmake
   5 @@ -516,6 +516,7 @@ function (paraview_client_documentation)
   6      NAMES xmlpatterns-qt5 xmlpatterns
   7      HINTS "${Qt5_DIR}/../../../bin"
   8            "${Qt5_DIR}/../../../libexec/qt5/bin"
   9 +          "${Qt5_DIR}/../../../tools/qt5/bin"
  10      DOC   "Path to xmlpatterns")
  11    mark_as_advanced(qt_xmlpatterns_executable)
  12
  13 diff --git a/CMake/ParaViewOptions.cmake b/CMake/ParaViewOptions.cmake
  14 index 5e402e9fc..ccb553e8f 100644
  15 --- a/CMake/ParaViewOptions.cmake
  16 +++ b/CMake/ParaViewOptions.cmake
  17 @@ -88,7 +88,7 @@ endif()
  18  #========================================================================
  19
  20  # XXX(VTK): External VTK is not yet actually supported.
  21 -if (FALSE)
  22 +if (TRUE)
  23  option(PARAVIEW_USE_EXTERNAL_VTK "Use an external VTK." OFF)
  24  mark_as_advanced(PARAVIEW_USE_EXTERNAL_VTK)
  25  else ()
  26 diff --git a/CMakeLists.txt b/CMakeLists.txt
  27 index d7e8f1dfe..8b0e7a8c6 100644
  28 --- a/CMakeLists.txt
  29 +++ b/CMakeLists.txt
  30 @@ -73,7 +73,9 @@ if (NOT CMAKE_ARCHIVE_OUTPUT_DIRECTORY)
  31  endif ()
  32
  33  set(paraview_cmake_dir "${CMAKE_CURRENT_SOURCE_DIR}/CMake")
  34 -set(vtk_cmake_dir "${CMAKE_CURRENT_SOURCE_DIR}/VTK/CMake")
  35 +set(vtk_cmake_dir "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/share/vtk")
  36 +string(REPLACE "/debug" "" vtk_cmake_dir "${vtk_cmake_dir}")
  37 +message(STATUS "vtk_cmake_dir:${vtk_cmake_dir}")
  38  list(APPEND CMAKE_MODULE_PATH
  39    "${paraview_cmake_dir}"
  40    "${vtk_cmake_dir}")
  41 @@ -214,6 +216,7 @@ if (NOT WIN32)
  42    endif ()
  43  endif ()
  44
  45 +message(STATUS "PARAVIEW_USE_EXTERNAL_VTK:${PARAVIEW_USE_EXTERNAL_VTK}")
  46  if (PARAVIEW_USE_EXTERNAL_VTK)
  47    find_package(VTK REQUIRED)
  48  else ()
  49 @@ -369,9 +372,73 @@ endif ()
  50
  51  if (PARAVIEW_USE_EXTERNAL_VTK)
  52    if (paraview_required_modules OR paraview_unrecognized_modules)
  53 -    message(FATAL_ERROR
  54 -      "The following modules were requested or required, but not found: "
  55 -      "${paraview_required_modules};${paraview_unrecognized_modules}.")
  56 +    message(STATUS "REQUIRED:${paraview_required_modules}")
  57 +    foreach(mod ${paraview_required_modules})
  58 +        if(NOT TARGET ${mod})
  59 +            message(STATUS "REQUIRED TARGET not defined: ${mod}")
  60 +            list(APPEND modules_notarget ${mod})
  61 +        endif()
  62 +        if(${mod} MATCHES "VTK::") # For better debugging
  63 +            message(STATUS "VTK TARGET found: ${mod}")
  64 +            list(APPEND vtk_modules ${mod})
  65 +        endif()
  66 +    endforeach()
  67 +    foreach(mod ${paraview_unrecognized_modules})
  68 +        if(NOT TARGET ${mod})
  69 +            message(STATUS "UNREC TARGET not defined: ${mod}")
  70 +            list(FIND paraview_rejected_modules ${mod} _found_mod)
  71 +            if(_found_mod GREATER_EQUAL 0)
  72 +                message(STATUS "MODULE ${mod} not necessary; Removing from unrecognized")
  73 +                list(APPEND _to_remove ${mod})
  74 +            endif()
  75 +        else()
  76 +            list(APPEND _to_remove ${mod})
  77 +            #list(APPEND vtk_modules ${mod}) #probably do not need to add unrecognized_modules to the wrapper
  78 +        endif()
  79 +    endforeach()
  80 +    message(STATUS "UNRECOGNIZED:${paraview_unrecognized_modules}")
  81 +    list(REMOVE_ITEM paraview_unrecognized_modules ${_to_remove})
  82 +    message(STATUS "REJECTED MODULES: ${paraview_rejected_modules}")
  83 +    message(STATUS "UNRECOGNIZED WITHOUT REJECTED AND KNOWN TARGETS: ${paraview_unrecognized_modules}")
  84 +    message(STATUS "ALL PROVIDED MODULES: ${paraview_modules}")
  85 +    set(_unnecessary_moduls ${paraview_modules})
  86 +    list(REMOVE_ITEM _unnecessary_moduls ${paraview_required_modules})
  87 +    message(STATUS "Unnecessary MODULES: ${_unnecessary_moduls}")
  88 +    if(modules_notarget)
  89 +        message(FATAL_ERROR
  90 +          "The following modules were requested or required, but not found: "
  91 +          "${modules_notarget}")
  92 +    endif()
  93 +    list(REMOVE_DUPLICATES vtk_modules)
  94 +    macro(search_dependent_targets)
  95 +        set(vtk_mod_dep_list)
  96 +        foreach(vtk_targ ${ARGN})
  97 +            get_target_property(vtk_mod_dep ${vtk_targ} "INTERFACE_vtk_module_depends")
  98 +            if(vtk_mod_dep)
  99 +                list(APPEND vtk_mod_dep_list ${vtk_mod_dep})
 100 +            endif()
 101 +            get_target_property(vtk_mod_pdep ${vtk_targ} "INTERFACE_vtk_module_private_depends")
 102 +            if(vtk_mod_pdep)
 103 +                list(APPEND vtk_mod_dep_list ${vtk_mod_pdep})
 104 +            endif()
 105 +            get_target_property(vtk_mod_odep ${vtk_targ} "INTERFACE_vtk_module_opional_depends")
 106 +            if(vtk_mod_odep)
 107 +                list(APPEND vtk_mod_dep_list ${vtk_mod_odep})
 108 +            endif()
 109 +            if(vtk_mod_dep_list)
 110 +                message(STATUS "Target ${vtk_targ} depends on ${vtk_mod_dep_list}")
 111 +                list(REMOVE_ITEM vtk_mod_dep_list ${vtk_modules})
 112 +                if(vtk_mod_dep_list)
 113 +                    message(STATUS "Newly discovered modules: ${vtk_mod_dep_list}")
 114 +                    list(APPEND vtk_modules ${vtk_mod_dep_list})
 115 +                    search_dependent_targets(${vtk_mod_dep_list})
 116 +                else()
 117 +                    message(STATUS "No new modules discovered!")
 118 +                endif()
 119 +            endif()
 120 +        endforeach()
 121 +    endmacro()
 122 +    search_dependent_targets(${vtk_modules})
 123    endif ()
 124
 125    if (PARAVIEW_USE_PYTHON)
 126 @@ -498,7 +565,7 @@ else ()
 127      TEST_INPUT_DATA_DIRECTORY   "${CMAKE_CURRENT_SOURCE_DIR}/VTK/Testing"
 128      TEST_OUTPUT_DATA_DIRECTORY  "${CMAKE_CURRENT_BINARY_DIR}/ExternalData/VTK/Testing")
 129
 130 -  if (NOT PARAVIEW_USE_EXTERNAL_VTK AND PARAVIEW_INSTALL_DEVELOPMENT_FILES)
 131 +  if (PARAVIEW_INSTALL_DEVELOPMENT_FILES)
 132      set(vtk_cmake_dir
 133        "${CMAKE_CURRENT_SOURCE_DIR}/VTK/CMake")
 134      set(vtk_cmake_destination
 135 @@ -543,9 +610,11 @@ vtk_module_build(
 136    TEST_OUTPUT_DATA_DIRECTORY  "${paraview_test_data_directory_output}")
 137
 138  include(vtkModuleJson)
 139 -vtk_module_json(
 140 -  MODULES "${vtk_modules}"
 141 -  OUTPUT "vtk-modules.json")
 142 +if(NOT PARAVIEW_USE_EXTERNAL_VTK)
 143 +    vtk_module_json(
 144 +      MODULES "${vtk_modules}"
 145 +      OUTPUT "vtk-modules.json")
 146 +endif()
 147  vtk_module_json(
 148    MODULES "${paraview_modules}"
 149    OUTPUT "paraview-modules.json")
 150 diff --git a/Plugins/AnalyzeNIfTIReaderWriter/NIfTIIO/vtkAnalyzeReader.cxx b/Plugins/AnalyzeNIfTIReaderWriter/NIfTIIO/vtkAnalyzeReader.cxx
 151 index be318d6d4..80187dd69 100644
 152 --- a/Plugins/AnalyzeNIfTIReaderWriter/NIfTIIO/vtkAnalyzeReader.cxx
 153 +++ b/Plugins/AnalyzeNIfTIReaderWriter/NIfTIIO/vtkAnalyzeReader.cxx
 154 @@ -1381,8 +1381,8 @@ int vtkAnalyzeReader::CanReadFile(const char* fname)
 155      return false;
 156    }
 157
 158 -  ifstream local_InputStream;
 159 -  local_InputStream.open(HeaderFileName.c_str(), ios::in | ios::binary);
 160 +  std::ifstream local_InputStream;
 161 +  local_InputStream.open(HeaderFileName.c_str(), std::ios::in | std::ios::binary);
 162    if (local_InputStream.fail())
 163    {
 164      return false;
 165 diff --git a/Plugins/AnalyzeNIfTIReaderWriter/NIfTIIO/vtkNIfTIReader.cxx b/Plugins/AnalyzeNIfTIReaderWriter/NIfTIIO/vtkNIfTIReader.cxx
 166 index e7df3dacc..1bae5ae22 100644
 167 --- a/Plugins/AnalyzeNIfTIReaderWriter/NIfTIIO/vtkNIfTIReader.cxx
 168 +++ b/Plugins/AnalyzeNIfTIReaderWriter/NIfTIIO/vtkNIfTIReader.cxx
 169 @@ -1277,8 +1277,8 @@ int vtkNIfTIReader::CanReadFile(const char* fname)
 170      return false;
 171    }
 172
 173 -  ifstream local_InputStream;
 174 -  local_InputStream.open(HeaderFileName.c_str(), ios::in | ios::binary);
 175 +  std::ifstream local_InputStream;
 176 +  local_InputStream.open(HeaderFileName.c_str(), std::ios::in | std::ios::binary);
 177    if (local_InputStream.fail())
 178    {
 179      return false;
 180 diff --git a/Qt/Components/pqCustomFilterManager.cxx b/Qt/Components/pqCustomFilterManager.cxx
 181 index 4c6911ac8..b04828168 100644
 182 --- a/Qt/Components/pqCustomFilterManager.cxx
 183 +++ b/Qt/Components/pqCustomFilterManager.cxx
 184 @@ -214,7 +214,7 @@ void pqCustomFilterManager::exportSelected(const QStringList& files)
 185    QStringList::ConstIterator jter = files.begin();
 186    for (; jter != files.end(); ++jter)
 187    {
 188 -    ofstream os((*jter).toLocal8Bit().data(), ios::out);
 189 +    std::ofstream os((*jter).toLocal8Bit().data(), std::ios::out);
 190      root->PrintXML(os, vtkIndent());
 191    }
 192
 193 diff --git a/Qt/Components/pqPresetDialog.cxx b/Qt/Components/pqPresetDialog.cxx
 194 index 411480e3e..af0195763 100644
 195 --- a/Qt/Components/pqPresetDialog.cxx
 196 +++ b/Qt/Components/pqPresetDialog.cxx
 197 @@ -952,7 +952,7 @@ void pqPresetDialog::exportPresets()
 198    }
 199    assert(presetCollection.size() > 0);
 200
 201 -  ofstream outfs;
 202 +  std::ofstream outfs;
 203    outfs.open(filename.toStdString().c_str());
 204    if (!outfs.is_open())
 205    {
 206 diff --git a/Qt/Core/pqCoreTestUtility.cxx b/Qt/Core/pqCoreTestUtility.cxx
 207 index 95c7df5b6..00f61e2f8 100644
 208 --- a/Qt/Core/pqCoreTestUtility.cxx
 209 +++ b/Qt/Core/pqCoreTestUtility.cxx
 210 @@ -45,7 +45,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 211  #include "QtTestingConfigure.h"
 212
 213  #include "QVTKOpenGLNativeWidget.h"
 214 -#include "QVTKOpenGLWidget.h"
 215 +#include "QVTKOpenGLStereoWidget.h"
 216  #include "pqApplicationCore.h"
 217  #include "pqCollaborationEventPlayer.h"
 218  #include "pqColorButtonEventPlayer.h"
 219 @@ -309,13 +309,13 @@ bool pqCoreTestUtility::CompareImage(QWidget* widget, const QString& referenceIm
 220    }
 221
 222    // try to recover the render window directly
 223 -  QVTKOpenGLWidget* glWidget = qobject_cast<QVTKOpenGLWidget*>(widget);
 224 +  QVTKOpenGLStereoWidget* glWidget = qobject_cast<QVTKOpenGLStereoWidget*>(widget);
 225    if (glWidget)
 226    {
 227      vtkRenderWindow* rw = glWidget->renderWindow();
 228      if (rw)
 229      {
 230 -      cout << "Using QVTKOpenGLWidget RenderWindow API for capture" << endl;
 231 +      cout << "Using QVTKOpenGLStereoWidget RenderWindow API for capture" << endl;
 232        return pqCoreTestUtility::CompareImage(
 233          rw, referenceImage, threshold, std::cerr, tempDirectory, size);
 234      }
 235 diff --git a/Qt/Core/pqQVTKWidgetBase.h b/Qt/Core/pqQVTKWidgetBase.h
 236 index 5f11871de..c6b7dbcbb 100644
 237 --- a/Qt/Core/pqQVTKWidgetBase.h
 238 +++ b/Qt/Core/pqQVTKWidgetBase.h
 239 @@ -43,8 +43,8 @@ using pqQVTKWidgetBase = QVTKOpenGLNativeWidget;
 240  #define PARAVIEW_USING_QVTKOPENGLNATIVEWIDGET 1
 241  #define PARAVIEW_USING_QVTKOPENGLWIDGET 0
 242  #else
 243 -#include "QVTKOpenGLWidget.h"
 244 -using pqQVTKWidgetBase = QVTKOpenGLWidget;
 245 +#include "QVTKOpenGLStereoWidget.h"
 246 +using pqQVTKWidgetBase = QVTKOpenGLStereoWidget;
 247  #define PARAVIEW_USING_QVTKOPENGLNATIVEWIDGET 0
 248  #define PARAVIEW_USING_QVTKOPENGLWIDGET 1
 249  #endif
 250 diff --git a/Qt/Core/pqQVTKWidgetEventPlayer.cxx b/Qt/Core/pqQVTKWidgetEventPlayer.cxx
 251 index 105796d8a..63c0bde5f 100644
 252 --- a/Qt/Core/pqQVTKWidgetEventPlayer.cxx
 253 +++ b/Qt/Core/pqQVTKWidgetEventPlayer.cxx
 254 @@ -37,7 +37,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 255  #include <QtDebug>
 256
 257  #include "QVTKOpenGLNativeWidget.h"
 258 -#include "QVTKOpenGLWidget.h"
 259 +#include "QVTKOpenGLStereoWidget.h"
 260  #include "QVTKOpenGLWindow.h"
 261  #include "pqEventDispatcher.h"
 262
 263 @@ -49,7 +49,7 @@ pqQVTKWidgetEventPlayer::pqQVTKWidgetEventPlayer(QObject* p)
 264  bool pqQVTKWidgetEventPlayer::playEvent(
 265    QObject* Object, const QString& Command, const QString& Arguments, bool& Error)
 266  {
 267 -  QVTKOpenGLWidget* qvtkWidget = qobject_cast<QVTKOpenGLWidget*>(Object);
 268 +  QVTKOpenGLStereoWidget* qvtkWidget = qobject_cast<QVTKOpenGLStereoWidget*>(Object);
 269    QVTKOpenGLNativeWidget* qvtkNativeWidget = qobject_cast<QVTKOpenGLNativeWidget*>(Object);
 270    if (qvtkWidget || qvtkNativeWidget)
 271    {
 272 @@ -92,7 +92,7 @@ bool pqQVTKWidgetEventPlayer::playEvent(
 273
 274          if (qvtkWidget != nullptr)
 275          {
 276 -          // Due to QTBUG-61836 (see QVTKOpenGLWidget::testingEvent()), events should
 277 +          // Due to QTBUG-61836 (see QVTKOpenGLStereoWidget::testingEvent()), events should
 278            // be propagated back to the internal QVTKOpenGLWindow when being fired
 279            // explicitly on the widget instance. We have to use a custom event
 280            // callback in this case to ensure that events are passed to the window.
 281 diff --git a/Qt/Core/pqQVTKWidgetEventTranslator.cxx b/Qt/Core/pqQVTKWidgetEventTranslator.cxx
 282 index f79d5c4e5..77950a0d1 100644
 283 --- a/Qt/Core/pqQVTKWidgetEventTranslator.cxx
 284 +++ b/Qt/Core/pqQVTKWidgetEventTranslator.cxx
 285 @@ -44,7 +44,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 286  #include <QMouseEvent>
 287
 288  #include "QVTKOpenGLNativeWidget.h"
 289 -#include "QVTKOpenGLWidget.h"
 290 +#include "QVTKOpenGLStereoWidget.h"
 291  #include "QVTKOpenGLWindow.h"
 292
 293  pqQVTKWidgetEventTranslator::pqQVTKWidgetEventTranslator(QObject* p)
 294 @@ -70,7 +70,7 @@ bool pqQVTKWidgetEventTranslator::translateEvent(
 295    // Look for a render window in the possible widget types.
 296    vtkRenderWindow* rw = nullptr;
 297
 298 -  if (QVTKOpenGLWidget* const qvtkWidget = qobject_cast<QVTKOpenGLWidget*>(Object))
 299 +  if (QVTKOpenGLStereoWidget* const qvtkWidget = qobject_cast<QVTKOpenGLStereoWidget*>(Object))
 300    {
 301      rw = qvtkWidget->embeddedOpenGLWindow() ? qvtkWidget->renderWindow() : nullptr;
 302    }
 303 diff --git a/Remoting/ClientServerStream/vtkClientServerInterpreter.cxx b/Remoting/ClientServerStream/vtkClientServerInterpreter.cxx
 304 index 487b5ad60..c6c24d81d 100644
 305 --- a/Remoting/ClientServerStream/vtkClientServerInterpreter.cxx
 306 +++ b/Remoting/ClientServerStream/vtkClientServerInterpreter.cxx
 307 @@ -184,7 +184,7 @@ void vtkClientServerInterpreter::SetLogFile(const char* name)
 308    // If a non-empty name was given, open a new log file.
 309    if (name && name[0])
 310    {
 311 -    this->LogFileStream = new ofstream(name);
 312 +    this->LogFileStream = new std::ofstream(name);
 313      if (this->LogFileStream && *this->LogFileStream)
 314      {
 315        this->LogStream = this->LogFileStream;
 316 diff --git a/Remoting/ClientServerStream/vtkClientServerInterpreter.h b/Remoting/ClientServerStream/vtkClientServerInterpreter.h
 317 index 1eafb27f3..1371ef727 100644
 318 --- a/Remoting/ClientServerStream/vtkClientServerInterpreter.h
 319 +++ b/Remoting/ClientServerStream/vtkClientServerInterpreter.h
 320 @@ -195,8 +195,8 @@ protected:
 321    ~vtkClientServerInterpreter() override;
 322
 323    // A stream to which a log is written.
 324 -  ostream* LogStream;
 325 -  ofstream* LogFileStream;
 326 +  std::ostream* LogStream;
 327 +  std::ofstream* LogFileStream;
 328
 329    // Internal message processing functions.
 330    int ProcessCommandNew(const vtkClientServerStream& css, int midx);
 331 diff --git a/Remoting/Core/vtkPVPluginLoader.cxx b/Remoting/Core/vtkPVPluginLoader.cxx
 332 index 5b04b2f00..447d9d63a 100644
 333 --- a/Remoting/Core/vtkPVPluginLoader.cxx
 334 +++ b/Remoting/Core/vtkPVPluginLoader.cxx
 335 @@ -73,12 +73,12 @@ public:
 336      vtkPVXMLOnlyPlugin* instance = new vtkPVXMLOnlyPlugin();
 337      instance->PluginName = vtksys::SystemTools::GetFilenameWithoutExtension(xmlfile);
 338
 339 -    ifstream is;
 340 -    is.open(xmlfile, ios::binary);
 341 +    std::ifstream is;
 342 +    is.open(xmlfile, std::ios::binary);
 343      // get length of file:
 344 -    is.seekg(0, ios::end);
 345 +    is.seekg(0, std::ios::end);
 346      size_t length = is.tellg();
 347 -    is.seekg(0, ios::beg);
 348 +    is.seekg(0, std::ios::beg);
 349
 350      // allocate memory:
 351      char* buffer = new char[length + 1];
 352 diff --git a/Remoting/ServerManager/vtkPVSessionCore.cxx b/Remoting/ServerManager/vtkPVSessionCore.cxx
 353 index 8d36fad37..6ff043967 100644
 354 --- a/Remoting/ServerManager/vtkPVSessionCore.cxx
 355 +++ b/Remoting/ServerManager/vtkPVSessionCore.cxx
 356 @@ -293,7 +293,7 @@ vtkPVSessionCore::vtkPVSessionCore()
 357        {
 358          filename << this->ParallelController->GetLocalProcessId();
 359        }
 360 -      this->LogStream = new ofstream(filename.str().c_str());
 361 +      this->LogStream = new std::ofstream(filename.str().c_str());
 362        LOG("Log for " << options->GetArgv0() << " (" << this->ParallelController->GetLocalProcessId()
 363                       << ")");
 364      }
 365 diff --git a/Remoting/ServerManager/vtkSMSessionProxyManager.cxx b/Remoting/ServerManager/vtkSMSessionProxyManager.cxx
 366 index 8525457e5..05bdfd723 100644
 367 --- a/Remoting/ServerManager/vtkSMSessionProxyManager.cxx
 368 +++ b/Remoting/ServerManager/vtkSMSessionProxyManager.cxx
 369 @@ -1261,7 +1261,7 @@ void vtkSMSessionProxyManager::LoadXMLState(
 370  bool vtkSMSessionProxyManager::SaveXMLState(const char* filename)
 371  {
 372    vtkPVXMLElement* rootElement = this->SaveXMLState();
 373 -  ofstream os(filename, ios::out);
 374 +  std::ofstream os(filename, std::ios::out);
 375    if (!os.is_open())
 376    {
 377      return false;
 378 diff --git a/Remoting/Views/vtkPVRenderView.cxx b/Remoting/Views/vtkPVRenderView.cxx
 379 index de9c50ab3..d7f739192 100644
 380 --- a/Remoting/Views/vtkPVRenderView.cxx
 381 +++ b/Remoting/Views/vtkPVRenderView.cxx
 382 @@ -2514,11 +2514,11 @@ void vtkPVRenderView::UpdateSkybox()
 383      this->CubeMap->SetInputTexture(vtkOpenGLTexture::SafeDownCast(texture));
 384      this->CubeMap->InterpolateOn();
 385      this->GetRenderer()->AddActor(this->Skybox);
 386 -    this->GetRenderer()->SetEnvironmentCubeMap(this->CubeMap, true);
 387 +    this->GetRenderer()->SetEnvironmentTexture(this->CubeMap, true);
 388    }
 389    else
 390    {
 391 -    this->GetRenderer()->SetEnvironmentCubeMap(nullptr);
 392 +    this->GetRenderer()->SetEnvironmentTexture(nullptr);
 393    }
 394  }
 395
 396 diff --git a/Remoting/Views/vtkSMTransferFunctionPresets.cxx b/Remoting/Views/vtkSMTransferFunctionPresets.cxx
 397 index 1151ce58f..21e5a28b7 100644
 398 --- a/Remoting/Views/vtkSMTransferFunctionPresets.cxx
 399 +++ b/Remoting/Views/vtkSMTransferFunctionPresets.cxx
 400 @@ -142,7 +142,7 @@ public:
 401      Json::CharReaderBuilder builder;
 402      builder["collectComments"] = false;
 403      Json::Value root;
 404 -    ifstream file;
 405 +    std::ifstream file;
 406      file.open(filename);
 407      if (!file)
 408      {
 409 @@ -456,7 +456,7 @@ bool vtkSMTransferFunctionPresets::ImportPresets(const char* filename)
 410    if (vtksys::SystemTools::LowerCase(vtksys::SystemTools::GetFilenameLastExtension(filename)) ==
 411      ".xml")
 412    {
 413 -    ifstream in(filename);
 414 +    std::ifstream in(filename);
 415      if (in)
 416      {
 417        std::ostringstream contents;
 418 diff --git a/Remoting/Views/vtkSMTransferFunctionProxy.cxx b/Remoting/Views/vtkSMTransferFunctionProxy.cxx
 419 index efa8e9341..2023ca41b 100644
 420 --- a/Remoting/Views/vtkSMTransferFunctionProxy.cxx
 421 +++ b/Remoting/Views/vtkSMTransferFunctionProxy.cxx
 422 @@ -273,7 +273,7 @@ bool vtkSMTransferFunctionProxy::ExportTransferFunction(
 423
 424    exportCollection.append(transferFunction);
 425
 426 -  ofstream outfs;
 427 +  std::ofstream outfs;
 428    outfs.open(filename);
 429    if (!outfs.is_open())
 430    {
 431 @@ -1370,7 +1370,7 @@ bool vtkSMTransferFunctionProxy::ConvertLegacyColorMapsToJSON(
 432      return false;
 433    }
 434
 435 -  ofstream file;
 436 +  std::ofstream file;
 437    file.open(outjsonfile);
 438    if (file)
 439    {
 440 diff --git a/ThirdParty/protobuf/CMakeLists.txt b/ThirdParty/protobuf/CMakeLists.txt
 441 index 0502ca2d9..25b2e778f 100644
 442 --- a/ThirdParty/protobuf/CMakeLists.txt
 443 +++ b/ThirdParty/protobuf/CMakeLists.txt
 444 @@ -42,7 +42,8 @@ vtk_module_third_party(
 445      PACKAGE Protobuf
 446      VERSION "3.4"
 447      TARGETS protobuf::libprotobuf
 448 -    STANDARD_INCLUDE_DIRS)
 449 +    STANDARD_INCLUDE_DIRS
 450 +    CONFIG_MODE)
 451
 452  if (VTK_MODULE_USE_EXTERNAL_ParaView_protobuf)
 453    # promote protobuf::protoc to GLOBAL to allow to call protobuf_generate from other directories
 454 diff --git a/VTKExtensions/CGNSReader/vtkFileSeriesHelper.cxx b/VTKExtensions/CGNSReader/vtkFileSeriesHelper.cxx
 455 index 66a7d6972..9d314b8ce 100644
 456 --- a/VTKExtensions/CGNSReader/vtkFileSeriesHelper.cxx
 457 +++ b/VTKExtensions/CGNSReader/vtkFileSeriesHelper.cxx
 458 @@ -211,7 +211,7 @@ bool vtkFileSeriesHelper::ReadMetaFile(const char* metafilename)
 459    }
 460
 461    // Open the metafile.
 462 -  ifstream metafile(metafilename);
 463 +  std::ifstream metafile(metafilename);
 464    if (metafile.bad())
 465    {
 466      // vtkErrorMacro("Failed to open meta-file: " << metafilename);
 467 diff --git a/VTKExtensions/IOCore/vtkCSVWriter.cxx b/VTKExtensions/IOCore/vtkCSVWriter.cxx
 468 index 11f777c1a..a1773600c 100644
 469 --- a/VTKExtensions/IOCore/vtkCSVWriter.cxx
 470 +++ b/VTKExtensions/IOCore/vtkCSVWriter.cxx
 471 @@ -97,7 +97,7 @@ namespace
 472  //-----------------------------------------------------------------------------
 473  template <class iterT>
 474  void vtkCSVWriterGetDataString(
 475 -  iterT* iter, vtkIdType tupleIndex, ofstream& stream, vtkCSVWriter* writer, bool* first)
 476 +  iterT* iter, vtkIdType tupleIndex, std::ofstream& stream, vtkCSVWriter* writer, bool* first)
 477  {
 478    int numComps = iter->GetNumberOfComponents();
 479    vtkIdType index = tupleIndex * numComps;
 480 @@ -118,7 +118,7 @@ void vtkCSVWriterGetDataString(
 481  //-----------------------------------------------------------------------------
 482  template <>
 483  void vtkCSVWriterGetDataString(vtkArrayIteratorTemplate<vtkStdString>* iter, vtkIdType tupleIndex,
 484 -  ofstream& stream, vtkCSVWriter* writer, bool* first)
 485 +  std::ofstream& stream, vtkCSVWriter* writer, bool* first)
 486  {
 487    int numComps = iter->GetNumberOfComponents();
 488    vtkIdType index = tupleIndex * numComps;
 489 @@ -139,7 +139,7 @@ void vtkCSVWriterGetDataString(vtkArrayIteratorTemplate<vtkStdString>* iter, vtk
 490  //-----------------------------------------------------------------------------
 491  template <>
 492  void vtkCSVWriterGetDataString(vtkArrayIteratorTemplate<char>* iter, vtkIdType tupleIndex,
 493 -  ofstream& stream, vtkCSVWriter* writer, bool* first)
 494 +  std::ofstream& stream, vtkCSVWriter* writer, bool* first)
 495  {
 496    int numComps = iter->GetNumberOfComponents();
 497    vtkIdType index = tupleIndex * numComps;
 498 @@ -160,7 +160,7 @@ void vtkCSVWriterGetDataString(vtkArrayIteratorTemplate<char>* iter, vtkIdType t
 499  //-----------------------------------------------------------------------------
 500  template <>
 501  void vtkCSVWriterGetDataString(vtkArrayIteratorTemplate<unsigned char>* iter, vtkIdType tupleIndex,
 502 -  ofstream& stream, vtkCSVWriter* writer, bool* first)
 503 +  std::ofstream& stream, vtkCSVWriter* writer, bool* first)
 504  {
 505    int numComps = iter->GetNumberOfComponents();
 506    vtkIdType index = tupleIndex * numComps;
 507 @@ -190,7 +190,7 @@ void vtkCSVWriterGetDataString(vtkArrayIteratorTemplate<unsigned char>* iter, vt
 508
 509  class vtkCSVWriter::CSVFile
 510  {
 511 -  ofstream Stream;
 512 +  std::ofstream Stream;
 513    std::vector<std::pair<std::string, int> > ColumnInfo;
 514    double Time = vtkMath::Nan();
 515
 516 diff --git a/VTKExtensions/IOCore/vtkFileSeriesReader.cxx b/VTKExtensions/IOCore/vtkFileSeriesReader.cxx
 517 index f2448f2b8..7d84bc1ab 100644
 518 --- a/VTKExtensions/IOCore/vtkFileSeriesReader.cxx
 519 +++ b/VTKExtensions/IOCore/vtkFileSeriesReader.cxx
 520 @@ -783,7 +783,7 @@ int vtkFileSeriesReader::ReadMetaDataFile(const char* metafilename, vtkStringArr
 521    std::vector<double>& timeValues, int maxFilesToRead /*= VTK_INT_MAX*/)
 522  {
 523    // Open the metafile.
 524 -  ifstream metafile(metafilename);
 525 +  std::ifstream metafile(metafilename);
 526    if (metafile.bad())
 527    {
 528      return 0;
 529 diff --git a/VTKExtensions/IOEnSight/vtkPEnSightGoldBinaryReader.cxx b/VTKExtensions/IOEnSight/vtkPEnSightGoldBinaryReader.cxx
 530 index 8370e21e3..ff90a0421 100644
 531 --- a/VTKExtensions/IOEnSight/vtkPEnSightGoldBinaryReader.cxx
 532 +++ b/VTKExtensions/IOEnSight/vtkPEnSightGoldBinaryReader.cxx
 533 @@ -50,7 +50,6 @@ vtkPEnSightGoldBinaryReader::~vtkPEnSightGoldBinaryReader()
 534  {
 535    if (this->IFile)
 536    {
 537 -    this->IFile->close();
 538      delete this->IFile;
 539      this->IFile = NULL;
 540    }
 541 @@ -72,7 +71,6 @@ int vtkPEnSightGoldBinaryReader::OpenFile(const char* filename)
 542    // Close file from any previous image
 543    if (this->IFile)
 544    {
 545 -    this->IFile->close();
 546      delete this->IFile;
 547      this->IFile = NULL;
 548    }
 549 @@ -86,9 +84,9 @@ int vtkPEnSightGoldBinaryReader::OpenFile(const char* filename)
 550      this->FileSize = (long)(fs.st_size);
 551
 552  #ifdef _WIN32
 553 -    this->IFile = new ifstream(filename, ios::in | ios::binary);
 554 +    this->IFile = new std::ifstream(filename, std::ios::in | std::ios::binary);
 555  #else
 556 -    this->IFile = new ifstream(filename, ios::in);
 557 +    this->IFile = new std::ifstream(filename, std::ios::in);
 558  #endif
 559    }
 560    else
 561 diff --git a/VTKExtensions/IOEnSight/vtkPEnSightGoldBinaryReader.h b/VTKExtensions/IOEnSight/vtkPEnSightGoldBinaryReader.h
 562 index c5a5551d5..9c871e4a1 100644
 563 --- a/VTKExtensions/IOEnSight/vtkPEnSightGoldBinaryReader.h
 564 +++ b/VTKExtensions/IOEnSight/vtkPEnSightGoldBinaryReader.h
 565 @@ -204,7 +204,7 @@ protected:
 566    int ElementIdsListed;
 567    int Fortran;
 568
 569 -  ifstream* IFile;
 570 +  std::ifstream* IFile;
 571    // The size of the file could be used to choose byte order.
 572    long FileSize;
 573
 574 diff --git a/VTKExtensions/IOEnSight/vtkPEnSightGoldReader.cxx b/VTKExtensions/IOEnSight/vtkPEnSightGoldReader.cxx
 575 index b433bc57a..b5cdc2672 100644
 576 --- a/VTKExtensions/IOEnSight/vtkPEnSightGoldReader.cxx
 577 +++ b/VTKExtensions/IOEnSight/vtkPEnSightGoldReader.cxx
 578 @@ -91,7 +91,7 @@ int vtkPEnSightGoldReader::ReadGeometryFile(
 579
 580    // Opening the text file as binary. If not, the reader fails to read
 581    // files with Unix line endings on Windows machines.
 582 -  this->IS = new ifstream(sfilename.c_str(), ios::in | ios::binary);
 583 +  this->IS = new std::ifstream(sfilename.c_str(), std::ios::in | std::ios::binary);
 584    if (this->IS->fail())
 585    {
 586      vtkErrorMacro("Unable to open file: " << sfilename.c_str());
 587 @@ -291,7 +291,7 @@ int vtkPEnSightGoldReader::ReadMeasuredGeometryFile(
 588      sfilename = fileName;
 589    }
 590
 591 -  this->IS = new ifstream(sfilename.c_str(), ios::in | ios::binary);
 592 +  this->IS = new std::ifstream(sfilename.c_str(), std::ios::in | std::ios::binary);
 593    if (this->IS->fail())
 594    {
 595      vtkErrorMacro("Unable to open file: " << sfilename.c_str());
 596 @@ -455,7 +455,7 @@ int vtkPEnSightGoldReader::ReadScalarsPerNode(const char* fileName, const char*
 597      sfilename = fileName;
 598    }
 599
 600 -  this->IS = new ifstream(sfilename.c_str(), ios::in | ios::binary);
 601 +  this->IS = new std::ifstream(sfilename.c_str(), std::ios::in | std::ios::binary);
 602    if (this->IS->fail())
 603    {
 604      vtkErrorMacro("Unable to open file: " << sfilename.c_str());
 605 @@ -675,7 +675,7 @@ int vtkPEnSightGoldReader::ReadVectorsPerNode(const char* fileName, const char*
 606      sfilename = fileName;
 607    }
 608
 609 -  this->IS = new ifstream(sfilename.c_str(), ios::in | ios::binary);
 610 +  this->IS = new std::ifstream(sfilename.c_str(), std::ios::in | std::ios::binary);
 611    if (this->IS->fail())
 612    {
 613      vtkErrorMacro("Unable to open file: " << sfilename.c_str());
 614 @@ -854,7 +854,7 @@ int vtkPEnSightGoldReader::ReadTensorsPerNode(const char* fileName, const char*
 615      sfilename = fileName;
 616    }
 617
 618 -  this->IS = new ifstream(sfilename.c_str(), ios::in | ios::binary);
 619 +  this->IS = new std::ifstream(sfilename.c_str(), std::ios::in | std::ios::binary);
 620    if (this->IS->fail())
 621    {
 622      vtkErrorMacro("Unable to open file: " << sfilename.c_str());
 623 @@ -980,7 +980,7 @@ int vtkPEnSightGoldReader::ReadScalarsPerElement(const char* fileName, const cha
 624      sfilename = fileName;
 625    }
 626
 627 -  this->IS = new ifstream(sfilename.c_str(), ios::in | ios::binary);
 628 +  this->IS = new std::ifstream(sfilename.c_str(), std::ios::in | std::ios::binary);
 629    if (this->IS->fail())
 630    {
 631      vtkErrorMacro("Unable to open file: " << sfilename.c_str());
 632 @@ -1187,7 +1187,7 @@ int vtkPEnSightGoldReader::ReadVectorsPerElement(const char* fileName, const cha
 633      sfilename = fileName;
 634    }
 635
 636 -  this->IS = new ifstream(sfilename.c_str(), ios::in | ios::binary);
 637 +  this->IS = new std::ifstream(sfilename.c_str(), std::ios::in | std::ios::binary);
 638    if (this->IS->fail())
 639    {
 640      vtkErrorMacro("Unable to open file: " << sfilename.c_str());
 641 @@ -1356,7 +1356,7 @@ int vtkPEnSightGoldReader::ReadTensorsPerElement(const char* fileName, const cha
 642      sfilename = fileName;
 643    }
 644
 645 -  this->IS = new ifstream(sfilename.c_str(), ios::in | ios::binary);
 646 +  this->IS = new std::ifstream(sfilename.c_str(), std::ios::in | ios::binary);
 647    if (this->IS->fail())
 648    {
 649      vtkErrorMacro("Unable to open file: " << sfilename.c_str());
 650 diff --git a/VTKExtensions/IOEnSight/vtkPEnSightReader.cxx b/VTKExtensions/IOEnSight/vtkPEnSightReader.cxx
 651 index 4f4840f5c..dd515e5ca 100644
 652 --- a/VTKExtensions/IOEnSight/vtkPEnSightReader.cxx
 653 +++ b/VTKExtensions/IOEnSight/vtkPEnSightReader.cxx
 654 @@ -1319,7 +1319,7 @@ int vtkPEnSightReader::ReadCaseFile()
 655      sfilename = this->CaseFileName;
 656    }
 657
 658 -  this->IS = new ifstream(sfilename.c_str(), ios::in);
 659 +  this->IS = new std::ifstream(sfilename.c_str(), ios::in);
 660    if (this->IS->fail())
 661    {
 662      vtkErrorMacro("Unable to open file: " << sfilename.c_str());
 663 diff --git a/VTKExtensions/IOEnSight/vtkPVEnSightMasterServerReader.cxx b/VTKExtensions/IOEnSight/vtkPVEnSightMasterServerReader.cxx
 664 index 5768eb32f..8bbc582ae 100644
 665 --- a/VTKExtensions/IOEnSight/vtkPVEnSightMasterServerReader.cxx
 666 +++ b/VTKExtensions/IOEnSight/vtkPVEnSightMasterServerReader.cxx
 667 @@ -429,7 +429,7 @@ int vtkPVEnSightMasterServerReader::ParseMasterServerFile()
 668    }
 669
 670    // Open the file for reading.
 671 -  ifstream fin(sfilename.c_str(), ios::in);
 672 +  std::ifstream fin(sfilename.c_str(), std::ios::in);
 673    if (!fin)
 674    {
 675      vtkErrorMacro("Unable to open file: " << sfilename.c_str());
 676 diff --git a/VTKExtensions/IOEnSight/vtkPVEnSightMasterServerReader2.cxx b/VTKExtensions/IOEnSight/vtkPVEnSightMasterServerReader2.cxx
 677 index e7701d458..a358b9df0 100644
 678 --- a/VTKExtensions/IOEnSight/vtkPVEnSightMasterServerReader2.cxx
 679 +++ b/VTKExtensions/IOEnSight/vtkPVEnSightMasterServerReader2.cxx
 680 @@ -512,7 +512,7 @@ int vtkPVEnSightMasterServerReader2::ParseMasterServerFile()
 681    }
 682
 683    // Open the file for reading.
 684 -  ifstream fin(sfilename.c_str(), ios::in);
 685 +  std::ifstream fin(sfilename.c_str(), std::ios::in);
 686    if (!fin)
 687    {
 688      vtkErrorMacro("Unable to open file: " << sfilename.c_str());
 689 diff --git a/VTKExtensions/IOSPCTH/vtkSpyPlotReader.cxx b/VTKExtensions/IOSPCTH/vtkSpyPlotReader.cxx
 690 index 1af09a68e..4aba88655 100644
 691 --- a/VTKExtensions/IOSPCTH/vtkSpyPlotReader.cxx
 692 +++ b/VTKExtensions/IOSPCTH/vtkSpyPlotReader.cxx
 693 @@ -1289,7 +1289,7 @@ int vtkSpyPlotReader::MergeVectors(vtkDataSetAttributes* da, vtkDataArray* a1, v
 694  //-----------------------------------------------------------------------------
 695  int vtkSpyPlotReader::CanReadFile(const char* fname)
 696  {
 697 -  ifstream ifs(fname, ios::binary | ios::in);
 698 +  std::ifstream ifs(fname, std::ios::binary | std::ios::in);
 699    if (!ifs)
 700    {
 701      return 0;
 702 diff --git a/VTKExtensions/IOSPCTH/vtkSpyPlotReaderMap.cxx b/VTKExtensions/IOSPCTH/vtkSpyPlotReaderMap.cxx
 703 index c7e1bac87..157768255 100644
 704 --- a/VTKExtensions/IOSPCTH/vtkSpyPlotReaderMap.cxx
 705 +++ b/VTKExtensions/IOSPCTH/vtkSpyPlotReaderMap.cxx
 706 @@ -83,7 +83,7 @@ bool vtkSpyPlotReaderMap::Initialize(const char* filename)
 707  {
 708    this->Clean(NULL);
 709
 710 -  ifstream ifs(filename);
 711 +  std::ifstream ifs(filename);
 712    if (!ifs)
 713    {
 714      vtkGenericWarningMacro("Error opening file " << filename);
 715 @@ -238,7 +238,7 @@ bool vtkSpyPlotReaderMap::InitializeFromSpyFile(const char* filename)
 716  bool vtkSpyPlotReaderMap::InitializeFromCaseFile(const char* filename)
 717  {
 718    // Setup the filemap and spcth structures
 719 -  ifstream ifs(filename);
 720 +  std::ifstream ifs(filename);
 721    if (!ifs)
 722    {
 723      vtkGenericWarningMacro("Error opening file " << filename);
 724 diff --git a/VTKExtensions/IOSPCTH/vtkSpyPlotUniReader.cxx b/VTKExtensions/IOSPCTH/vtkSpyPlotUniReader.cxx
 725 index 7dfe451c9..f4ea91928 100644
 726 --- a/VTKExtensions/IOSPCTH/vtkSpyPlotUniReader.cxx
 727 +++ b/VTKExtensions/IOSPCTH/vtkSpyPlotUniReader.cxx
 728 @@ -212,7 +212,7 @@ int vtkSpyPlotUniReader::MakeCurrent()
 729    }
 730
 731    std::vector<unsigned char> arrayBuffer;
 732 -  ifstream ifs(this->FileName, ios::binary | ios::in);
 733 +  std::ifstream ifs(this->FileName, std::ios::binary | std::ios::in);
 734    vtkSpyPlotIStream spis;
 735    spis.SetStream(&ifs);
 736    int dump;
 737 @@ -1358,7 +1358,7 @@ int vtkSpyPlotUniReader::ReadInformation()
 738      vtkErrorMacro("FileName not specified");
 739      return 0;
 740    }
 741 -  ifstream ifs(this->FileName, ios::binary | ios::in);
 742 +  std::ifstream ifs(this->FileName, std::ios::binary | std::ios::in);
 743    if (!ifs)
 744    {
 745      vtkErrorMacro("Cannot open file: " << this->FileName);