--- OpenFOAM-7/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/CMakeLists.txt.pvreader	2019-07-05 15:06:58.000000000 +0200
+++ OpenFOAM-7/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/CMakeLists.txt	2020-03-24 00:59:38.331976129 +0100
@@ -2,7 +2,6 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
 
 FIND_PACKAGE(ParaView REQUIRED)
-INCLUDE(${PARAVIEW_USE_FILE})
 
 LINK_DIRECTORIES(
     $ENV{FOAM_LIBBIN}
@@ -24,6 +23,8 @@
 # Set the output library destination to the plugin directory
 SET(
     LIBRARY_OUTPUT_PATH $ENV{PV_PLUGIN_PATH}
+    CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} "-pthread"
+    CMAKE_C_FLAGS ${CMAKE_C_FLAGS} "-pthread"
     CACHE INTERNAL
     "Single output directory for building all libraries."
 )
@@ -31,19 +32,19 @@
 # Add the plugin. ParaView-4.0.? requires a GUI_RESOURCE_FILES XML file. As of
 # version 4.1.? this is no longer needed.
 IF(${PARAVIEW_VERSION_MAJOR}.${PARAVIEW_VERSION_MINOR} VERSION_LESS 4.1)
-    ADD_PARAVIEW_PLUGIN(
+    PARAVIEW_ADD_PLUGIN(
         PVblockMeshReader_SM
-        "1.0"
+        VERSION "1.0"
         SERVER_MANAGER_XML PVblockMeshReader_SM.xml
-        SERVER_MANAGER_SOURCES vtkPVblockMeshReader.cxx
-        GUI_RESOURCE_FILES PVblockMeshReader.xml
+        SOURCES vtkPVblockMeshReader.cxx
+        UI_RESOURCES PVblockMeshReader.xml
         )
 ELSE()
-    ADD_PARAVIEW_PLUGIN(
+    PARAVIEW_ADD_PLUGIN(
         PVblockMeshReader_SM
-        "1.0"
+        VERSION "1.0"
         SERVER_MANAGER_XML PVblockMeshReader_SM.xml
-        SERVER_MANAGER_SOURCES vtkPVblockMeshReader.cxx
+        SOURCES vtkPVblockMeshReader.cxx
     )
 ENDIF()
 
--- OpenFOAM-7/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/CMakeLists.txt.pvreader	2019-07-05 15:06:58.000000000 +0200
+++ OpenFOAM-7/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/CMakeLists.txt	2020-03-24 00:59:31.581739542 +0100
@@ -2,7 +2,7 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
 
 FIND_PACKAGE(ParaView REQUIRED)
-INCLUDE(${PARAVIEW_USE_FILE})
+
 
 LINK_DIRECTORIES(
     $ENV{FOAM_LIBBIN}
@@ -25,6 +25,8 @@
 # Set the output library destination to the plugin directory
 SET(
     LIBRARY_OUTPUT_PATH $ENV{PV_PLUGIN_PATH}
+    CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} "-pthread"
+    CMAKE_C_FLAGS ${CMAKE_C_FLAGS} "-pthread"
     CACHE INTERNAL
     "Single output directory for building all libraries."
 )
@@ -32,19 +34,19 @@
 # Add the plugin. ParaView-4.0.? requires a GUI_RESOURCE_FILES XML file. As of
 # version 4.1.? this is no longer needed.
 IF(${PARAVIEW_VERSION_MAJOR}.${PARAVIEW_VERSION_MINOR} VERSION_LESS 4.1)
-    ADD_PARAVIEW_PLUGIN(
+    PARAVIEW_ADD_PLUGIN(
         PVFoamReader_SM
-        "1.0"
+        VERSION "1.0"
         SERVER_MANAGER_XML PVFoamReader_SM.xml
-        SERVER_MANAGER_SOURCES vtkPVFoamReader.cxx
-        GUI_RESOURCE_FILES PVFoamReader.xml
+        SOURCES vtkPVFoamReader.cxx
+        UI_RESOURCES PVFoamReader.xml
     )
 ELSE()
-    ADD_PARAVIEW_PLUGIN(
+    PARAVIEW_ADD_PLUGIN(
         PVFoamReader_SM
-        "1.0"
+        VERSION "1.0"
         SERVER_MANAGER_XML PVFoamReader_SM.xml
-        SERVER_MANAGER_SOURCES vtkPVFoamReader.cxx
+        SOURCES vtkPVFoamReader.cxx
     )
 ENDIF()